merging in latest changes

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index bfe4afe80b..fe00f70a28 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -315,13 +315,13 @@ void LLIMFloaterContainer::setVisible(BOOL visible)
 	if (visible)
 	{
 		// Make sure we have the Nearby Chat present when showing the conversation container
-		LLIMConversation* nearby_chat = LLIMConversation::findConversation(LLUUID::null);
+		LLIMConversation* nearby_chat = LLFloaterReg::findTypedInstance<LLIMConversation>("nearby_chat");
 		if (nearby_chat == NULL)
 		{
 			// If not found, force the creation of the nearby chat conversation panel
 			// *TODO: find a way to move this to XML as a default panel or something like that
-			LLSD name("chat_bar");
-			LLFloaterReg::toggleInstanceOrBringToFront(name, LLSD(LLUUID::null));
+			LLSD name("nearby_chat");
+			LLFloaterReg::toggleInstanceOrBringToFront(name);
 		}
 	}