Merged in lindenlab/viewer-release

.hgtags

@@ -522,3 +522,4 @@ e9d350764dfbf5a46229e627547ef5c1b1eeef00 4.0.2-release
 b280a1c797a3891e68dbc237e73de9cf19f426e9 4.1.1-release
 bfbba2244320dc2ae47758cd7edd8fa3b67dc756 4.1.2-release
 b41e1e7c7876f7656c505f552b5888b4e478f92b 5.0.0-release
+c9ce2295012995e3cf5c57bcffcb4870b94c649f 5.0.1-release

indra/newview/VIEWER_VERSION.txt

-5.0.1
+5.0.2

indra/newview/llviewertexture.cpp

@@ -488,7 +488,7 @@ bool LLViewerTexture::isMemoryForTextureLow()
 
 	LL_RECORD_BLOCK_TIME(FTM_TEXTURE_MEMORY_CHECK);
 
-	const S32Megabytes MIN_FREE_TEXTURE_MEMORY(5); //MB
+	const S32Megabytes MIN_FREE_TEXTURE_MEMORY(20); //MB Changed to 20 MB per MAINT-6882
 	const S32Megabytes MIN_FREE_MAIN_MEMORY(100); //MB	
 
 	bool low_mem = false;
@@ -511,18 +511,17 @@ bool LLViewerTexture::isMemoryForTextureLow()
 			}
 		}
 	}
-#if 0  //ignore nVidia cards
+	//Enabled this branch per MAINT-6882
 	else if (gGLManager.mHasNVXMemInfo)
 	{
 		S32 free_memory;
 		glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX, &free_memory);
 		
-		if(free_memory / 1024 < MIN_FREE_TEXTURE_MEMORY)
+		if ((S32Megabytes)(free_memory / 1024) < MIN_FREE_TEXTURE_MEMORY)
 		{
 			low_mem = true;
 		}
 	}
-#endif	
 
 	return low_mem;
 }