summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterimnearbychathandler.cpp8
-rw-r--r--indra/newview/llimview.cpp8
2 files changed, 2 insertions, 14 deletions
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index 2d8a6d46fe..d9c461e836 100644
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -622,13 +622,7 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
//Will show Conversations floater when chat preference is set
else if(gSavedSettings.getString("NotificationNearbyChatOptions") == "openconversations")
{
- LLFloaterIMContainer * floaterIMContainer = LLFloaterIMContainer::getInstance();
-
- if(floaterIMContainer)
- {
- floaterIMContainer->setVisible(TRUE);
- floaterIMContainer->setFrontmost(TRUE);
- }
+ LLFloaterReg::showInstance("im_container");
}
}
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index fc6be2cd97..581043a3d0 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -191,13 +191,7 @@ void on_new_message(const LLSD& msg)
}
else if("openconversations" == action)
{
- LLFloaterIMContainer * floaterIMContainer = LLFloaterIMContainer::getInstance();
-
- if(floaterIMContainer)
- {
- floaterIMContainer->setVisible(TRUE);
- floaterIMContainer->setFrontmost(TRUE);
- }
+ LLFloaterReg::showInstance("im_container");
}
}