Backed out changeset: 4202e227f8e4

indra/llui/llfloaterreg.cpp

@@ -318,7 +318,7 @@ void LLFloaterReg::showInitialVisibleInstances()
 			BOOL isvis = LLFloater::getControlGroup()->getBOOL(controlname);
 			if (isvis)
 			{
-				showInstance(name, LLSD(LLUUID())); // keyed floaters shouldn't set save_vis to true
+				showInstance(name, LLSD()); // keyed floaters shouldn't set save_vis to true
 			}
 		}
 	}

indra/llui/llfloaterreg.h

@@ -90,23 +90,23 @@ class LLFloaterReg
 	static LLFloater* getLastFloaterCascading();
 	
 	// Find / get (create) / remove / destroy
-	static LLFloater* findInstance(const std::string& name, const LLSD& key = LLSD(LLUUID()));
-	static LLFloater* getInstance(const std::string& name, const LLSD& key = LLSD(LLUUID()));
-	static LLFloater* removeInstance(const std::string& name, const LLSD& key = LLSD(LLUUID()));
-	static bool destroyInstance(const std::string& name, const LLSD& key = LLSD(LLUUID()));
+	static LLFloater* findInstance(const std::string& name, const LLSD& key = LLSD());
+	static LLFloater* getInstance(const std::string& name, const LLSD& key = LLSD());
+	static LLFloater* removeInstance(const std::string& name, const LLSD& key = LLSD());
+	static bool destroyInstance(const std::string& name, const LLSD& key = LLSD());
 	
 	// Iterators
 	static const_instance_list_t& getFloaterList(const std::string& name);
 
 	// Visibility Management
 	// return NULL if instance not found or can't create instance (no builder)
-	static LLFloater* showInstance(const std::string& name, const LLSD& key = LLSD(LLUUID()), BOOL focus = FALSE);
+	static LLFloater* showInstance(const std::string& name, const LLSD& key = LLSD(), BOOL focus = FALSE);
 	// Close a floater (may destroy or set invisible)
 	// return false if can't find instance
-	static bool hideInstance(const std::string& name, const LLSD& key = LLSD(LLUUID()));
+	static bool hideInstance(const std::string& name, const LLSD& key = LLSD());
 	// return true if instance is visible:
-	static bool toggleInstance(const std::string& name, const LLSD& key = LLSD(LLUUID()));
-	static bool instanceVisible(const std::string& name, const LLSD& key = LLSD(LLUUID()));
+	static bool toggleInstance(const std::string& name, const LLSD& key = LLSD());
+	static bool instanceVisible(const std::string& name, const LLSD& key = LLSD());
 
 	static void showInitialVisibleInstances();
 	static void hideVisibleInstances(const std::set<std::string>& exceptions = std::set<std::string>());
@@ -126,23 +126,23 @@ class LLFloaterReg
 	static void registerControlVariables();
 
 	// Callback wrappers
-	static void toggleInstanceOrBringToFront(const LLSD& sdname, const LLSD& key = LLSD(LLUUID()));
+	static void toggleInstanceOrBringToFront(const LLSD& sdname, const LLSD& key = LLSD());
 	
 	// Typed find / get / show
 	template <class T>
-	static T* findTypedInstance(const std::string& name, const LLSD& key = LLSD(LLUUID()))
+	static T* findTypedInstance(const std::string& name, const LLSD& key = LLSD())
 	{
 		return dynamic_cast<T*>(findInstance(name, key));
 	}
 
 	template <class T>
-	static T* getTypedInstance(const std::string& name, const LLSD& key = LLSD(LLUUID()))
+	static T* getTypedInstance(const std::string& name, const LLSD& key = LLSD())
 	{
 		return dynamic_cast<T*>(getInstance(name, key));
 	}
 
 	template <class T>
-	static T* showTypedInstance(const std::string& name, const LLSD& key = LLSD(LLUUID()), BOOL focus = FALSE)
+	static T* showTypedInstance(const std::string& name, const LLSD& key = LLSD(), BOOL focus = FALSE)
 	{
 		return dynamic_cast<T*>(showInstance(name, key, focus));
 	}

indra/newview/llnearbychat.cpp

@@ -287,10 +287,10 @@ void	LLNearbyChat::setVisible(BOOL visible)
 {
 	LLIMConversation::setVisible(visible);
 
-    if(visible)
-    {
-        removeScreenChat();
-    }
+	if(visible)
+	{
+		removeScreenChat();
+	}
     setFocus(visible);
 }
 
@@ -327,7 +327,7 @@ void LLNearbyChat::addToHost()
 
 		mIsHostSet = true;
 	}
-}
+	}
 
 bool LLNearbyChat::isHostSet()
 {
@@ -722,7 +722,7 @@ void LLNearbyChat::sendChatFromViewer(const LLWString &wtext, EChatType type, BO
 	send_chat_from_viewer(utf8_out_text, type, channel);
 }
 
-// static
+// static 
 bool LLNearbyChat::isWordsName(const std::string& name)
 {
 	// checking to see if it's display name plus username in parentheses