Merge branch 'V2MultiWear' into AltCompilers

indra/llrender/llimagegl.cpp

@@ -352,7 +352,10 @@ void LLImageGL::destroyGL(BOOL save_state)
 					glimage->mSaveData = NULL ;
 				}
 				else
+				{
+					glimage->mSaveDiscardLevel = glimage->mCurrentDiscardLevel;
 					stored_count++;
+				}
 			}
 
 			glimage->destroyGLTexture();
@@ -379,13 +382,14 @@ void LLImageGL::restoreGL()
 		}
 		if (glimage->mSaveData.notNull())
 		{
-			if (glimage->getComponents() && glimage->mSaveData->getComponents())
+			if (glimage->getComponents() && glimage->mSaveData->getComponents() && glimage->mSaveDiscardLevel >= 0)
 			{
-				glimage->createGLTexture(glimage->mCurrentDiscardLevel, glimage->mSaveData, 0, TRUE, glimage->getCategory());
+				glimage->createGLTexture(glimage->mSaveDiscardLevel, glimage->mSaveData, 0, TRUE, glimage->getCategory());
 				stop_glerror();
 				recovered_count++;
 			}
 			glimage->mSaveData = NULL; // deletes data
+			glimage->mSaveDiscardLevel = -1;
 		}
 	}
 	llinfos << "Restored " << recovered_count << " images" << llendl;
@@ -430,7 +434,7 @@ BOOL LLImageGL::create(LLPointer<LLImageGL>& dest, const LLImageRaw* imageraw, B
 //----------------------------------------------------------------------------
 
 LLImageGL::LLImageGL(BOOL usemipmaps)
-	: mSaveData(0)
+	: mSaveData(0), mSaveDiscardLevel(-1)
 {
 	init(usemipmaps);
 	setSize(0, 0, 0);
@@ -439,7 +443,7 @@ LLImageGL::LLImageGL(BOOL usemipmaps)
 }
 
 LLImageGL::LLImageGL(U32 width, U32 height, U8 components, BOOL usemipmaps)
-	: mSaveData(0)
+	: mSaveData(0), mSaveDiscardLevel(-1)
 {
 	llassert( components <= 4 );
 	init(usemipmaps);
@@ -449,7 +453,7 @@ LLImageGL::LLImageGL(U32 width, U32 height, U8 components, BOOL usemipmaps)
 }
 
 LLImageGL::LLImageGL(const LLImageRaw* imageraw, BOOL usemipmaps)
-	: mSaveData(0)
+	: mSaveData(0), mSaveDiscardLevel(-1)
 {
 	init(usemipmaps);
 	setSize(0, 0, 0);
@@ -1415,6 +1419,8 @@ BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre
 	if (discard_level < 0)
 	{
 		discard_level = mCurrentDiscardLevel;
+		if(discard_level < 0)
+			return FALSE;
 	}
 	
 	if (mTexName == 0 || discard_level < mCurrentDiscardLevel || discard_level > mMaxDiscardLevel )

indra/llrender/llimagegl.h

@@ -183,6 +183,7 @@ public:
 	
 private:
 	LLPointer<LLImageRaw> mSaveData; // used for destroyGL/restoreGL
+	S32	mSaveDiscardLevel;
 	U8* mPickMask;  //downsampled bitmap approximation of alpha channel.  NULL if no alpha channel
 	U16 mPickMaskWidth;
 	U16 mPickMaskHeight;

indra/newview/app_settings/settings_per_account.xml

@@ -314,14 +314,6 @@
 			<key>Value</key>
 			<integer>0</integer>
 		</map>
-	
-	
-	
-	
-	
-	
-	
-	
     <key>RLVaLoginLastLocation</key>
     <map>
       <key>Comment</key>

indra/newview/installers/windows/installer_template.nsi

@@ -69,7 +69,7 @@ SubCaption 0 $(LicenseSubTitleSetup)	; override "license agreement" text
 
 BrandingText "Prepare to Implode!"						; bottom of window text
 Icon          %%SOURCE%%\installers\windows\install_icon_singularity.ico
-UninstallIcon %%SOURCE%%\installers\windows\install_icon_singularity.ico
+UninstallIcon %%SOURCE%%\installers\windows\uninstall_icon_singularity.ico
 WindowIcon off							; show our icon in left corner
 BGGradient 9090b0 000000 notext
 CRCCheck on								; make sure CRC is OK

indra/newview/skins/default/xui/en-us/floater_critical.xml

@@ -8,8 +8,7 @@
 	<button bottom="15" font="SansSerif" halign="center" height="20" label="Cancel"
 	     label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
 	     width="100" />
-	<!-- No title text here because our "critical message" is usually the
-	community standards. JC -->
+	<!-- No title text here because our "critical message" is usually the community standards. JC -->
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-35" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="20" left="20" mouse_opaque="true" name="tos_heading" v_pad="0" width="552">
 		Please read the following message carefully.
 	</text>

indra/newview/skins/default/xui/en-us/floater_tools.xml

@@ -670,8 +670,6 @@
 			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
 			     height="18" label="p" left_delta="0" mouse_opaque="true" name="pastesizeclip"  enabled="true"
 			     tool_tip="Paste Size from Clipboard"  width="20" />
-				 
-				 
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="7"
@@ -699,9 +697,6 @@
 			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
 			     height="18" label="p" left_delta="0" mouse_opaque="true" name="pasterotclip"  enabled="true"
 			     tool_tip="Paste Rotation from Clipboard"  width="20" />
-							 
-							 
-				 
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -1129,15 +1124,15 @@
 				follows="left|top" 
 				height="16"
 				left_delta="114" 
-			     	ncrement="0.05" 
+			    increment="0.05"
 				initial_val="1" 
 				label="Ambiance" 
 				label_width="55"
-			     	max_val="1" 
-			     	min_val="0" 
-			     	mouse_opaque="true"
-			     	name="Light Ambiance" 
-			     	width="118" />
+			    max_val="1"
+			    min_val="0"
+			    mouse_opaque="true"
+			    name="Light Ambiance"
+			    width="118" />
             <text
              type="string"
              length="1"