From 09c890db98bb0996058e9faf1f867650707e3e31 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Fri, 10 Aug 2012 19:03:37 +0300 Subject: fixed merge issue. Done. --- indra/newview/llimfloatercontainer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index ad3b0279e5..38b5768a60 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -317,7 +317,7 @@ void LLIMFloaterContainer::setVisible(BOOL visible) if (visible) { // Make sure we have the Nearby Chat present when showing the conversation container - LLIMConversation* nearby_chat = LLIMConversation::getConversation(LLUUID::null); + LLIMConversation* nearby_chat = LLIMConversation::findConversation(LLUUID::null); if (nearby_chat == NULL) { // If not found, force the creation of the nearby chat conversation panel -- cgit v1.2.3