summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-08-29 19:19:42 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-08-29 19:19:42 -0700
commit73eec0321f79bb7ceeb2b2027e63660158413e5e (patch)
treee264a8962c34f0768bed34500d4af1af8a0eba27 /indra/newview/llviewermessage.cpp
parentbe61b5be2f4089e12ca25ca1ece13bd0fdaea543 (diff)
parent01a154809d650f7905aaa208150a1070b19e5c2b (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-xindra/newview/llviewermessage.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b20b86a582..9abd269f0f 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2297,12 +2297,10 @@ void god_message_name_cb(const LLAvatarName& av_name, LLChat chat, std::string m
// Treat like a system message and put in chat history.
chat.mText = av_name.getCompleteName() + ": " + message;
- LLNearbyChat* nearby_chat = LLNearbyChat::getInstance();
- if(nearby_chat)
+ if (LLNearbyChat::instanceExists())
{
- nearby_chat->addMessage(chat);
+ LLNearbyChat::instance().addMessage(chat);
}
-
}
void process_improved_im(LLMessageSystem *msg, void **user_data)
@@ -2897,8 +2895,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// Note: lie to Nearby Chat, pretending that this is NOT an IM, because
// IMs from obejcts don't open IM sessions.
- LLNearbyChat* nearby_chat = LLNearbyChat::getInstance();
- if(!chat_from_system && nearby_chat)
+ if(!chat_from_system && LLNearbyChat::instanceExists())
{
chat.mOwnerID = from_id;
LLSD args;