merge

2 files changed, 10 insertions, 7 deletions

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index f4e46ae3ea..ced6f4b1aa 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -2033,12 +2033,12 @@ BOOL LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius)
 	
 	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() ;	
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 42f79eb9fa..09754fc5c0 100755
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1756,7 +1756,10 @@ S32 LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels,
 	// 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);