diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-10 19:03:37 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-10 19:03:37 +0300 |
| commit | 09c890db98bb0996058e9faf1f867650707e3e31 (patch) | |
| tree | c54d4951ac32d52ec9e3a26ce0e3885b07c1fbcd /indra/newview | |
| parent | f4c4df4cdd3dae7ce90efb8fbea8af1ba66410ff (diff) | |
fixed merge issue. Done.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |