Merge shyotl, setting include broken (disabled)

2010-11-09 15:14:34 +01:00
parent 8d6ce154fd f357842265
commit 17a0d13b0c
61 changed files with 3320 additions and 2231 deletions
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1564,6 +1564,7 @@ void LLImageGL::setNoDelete()
 void LLImageGL::updatePickMask(S32 width, S32 height, const U8* data_in)
 {
 	delete [] mPickMask; //Always happens regardless.
+
 	mPickMask = NULL;
 	mPickMaskSize = 0;
 	
@@ -1582,7 +1583,6 @@ void LLImageGL::updatePickMask(S32 width, S32 height, const U8* data_in)
 		memset(mPickMask, 0, sizeof(U8) * mPickMaskSize);

 		U32 pick_bit = 0;
-	
 		for (S32 y = 0; y < height; y += 2)
 		{
 			for (S32 x = 0; x < width; x += 2)