Commits

BaoLinden committed 14b47f7 Merge
  • Participants
  • Parent commits 5e554e5, c512658

Comments (0)

Files changed (2)

indra/newview/llface.cpp

 	
 	F32 dist = lookAt.getLength3().getF32();
 	dist = llmax(dist-size.getLength3().getF32(), 0.001f);
-	//ramp down distance for nearby objects
-	if (dist < 16.f)
-	{
-		dist /= 16.f;
-		dist *= dist;
-		dist *= 16.f;
+	//ramp down distance for nearby objects
+	if (dist < 16.f)
+	{
+		dist /= 16.f;
+		dist *= dist;
+		dist *= 16.f;
 	}
 
 	lookAt.normalize3fast() ;	

indra/newview/lltexturefetch.cpp

 	// Clear the url since we're done with the fetch
 	// Note: mUrl is used to check is fetching is required so failure to clear it will force an http fetch
 	// next time the texture is requested, even if the data have already been fetched.
-	mUrl.clear();
+	if(mWriteToCacheState != NOT_WRITE)
+	{
+		mUrl.clear();
+	}
 	mLoaded = TRUE;
 	setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);