Merge

indra/newview/lggcontactsets.h

@@ -16,10 +16,11 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
-#include "v4color.h"
-
 #ifndef LGG_FRIENDS_GROUPS_H
 #define LGG_FRIENDS_GROUPS_H
+
+#include "v4color.h"
+
 class LGGContactSets
 {
 	LGGContactSets();
@@ -87,6 +88,4 @@ private:
 
 };
 
-
-
 #endif 

indra/newview/llfloaterpreference.cpp

@@ -413,8 +413,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mLanguageChanged(false),
 	mAvatarDataInitialized(false),
 	mClickActionDirty(false)
-	// <FS:Ansariel> Fix for FIRE-8245: Only cancel if the floater is really open
-	,mIsOpen(false)
 {
 	
 	//Build Floater is now Called from 	LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
@@ -840,9 +838,6 @@ void LLFloaterPreference::cancel()
 
 void LLFloaterPreference::onOpen(const LLSD& key)
 {
-	// <FS:Ansariel> Fix for FIRE-8245: Only cancel if the floater is really open
-	mIsOpen = true;
-
 	// this variable and if that follows it are used to properly handle busy mode response message
 	static bool initialized = FALSE;
 	// if user is logged in and we haven't initialized busy_response yet, do it

indra/newview/llfloaterpreference.h

@@ -208,9 +208,6 @@ private:
 	std::string mDirectoryVisibility;
 	
 	LLAvatarData mAvatarProperties;
-
-	// <FS:Ansariel> Fix for FIRE-8245: Only cancel if the floater is really open
-	bool mIsOpen;
 };
 
 class LLPanelPreference : public LLPanel

indra/newview/llmeshrepository.cpp

@@ -2180,6 +2180,7 @@ void LLMeshHeaderResponder::completedRaw(U32 status, const std::string& reason,
 		return;
 	}
 
+	// <FS:Ansariel> Mesh header/LOD retry functionality
 	{
 		LLMutexLock lock(gMeshRepo.mThread->mMutex);
 		LLMeshRepoThread::ActiveHeaderRequest Req(mMeshParams);