diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-20 15:48:44 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-20 15:48:44 -0700 |
| commit | bd124deab6038797073d307bcc1cc47c8a800e59 (patch) | |
| tree | febcdfbe7bf5ac634f095eaca515cdf5e6cf3577 | |
| parent | b65ad565c9f3a702408e1bd12e7df2ccaf3dd03e (diff) | |
| parent | 54118511c04323c5ae5d43a9d7f7b8639531d541 (diff) | |
Merge
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 67d745248f..3418462192 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -214,9 +214,10 @@ void LLNearbyChat::updateChatHistoryStyle() //static void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue) { - //LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD()); - //if(nearby_chat) - // nearby_chat->updateChatHistoryStyle(); + LLFloater* chat_bar = LLFloaterReg::getInstance("chat_bar"); + LLNearbyChat* nearby_chat = chat_bar->findChild<LLNearbyChat>("nearby_chat"); + if(nearby_chat) + nearby_chat->updateChatHistoryStyle(); } bool isWordsName(const std::string& name) |