Skip to content
Snippets Groups Projects
Commit bd124dea authored by Leslie Linden's avatar Leslie Linden
Browse files

Merge

parents b65ad565 54118511
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llnearbychat.cpp
+ 4
− 3
View file @ bd124dea
...@@ -214,9 +214,10 @@ void LLNearbyChat::updateChatHistoryStyle() ...@@ -214,9 +214,10 @@ void LLNearbyChat::updateChatHistoryStyle()
//static //static
void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue) void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue)
{ {
//LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD()); LLFloater* chat_bar = LLFloaterReg::getInstance("chat_bar");
//if(nearby_chat) LLNearbyChat* nearby_chat = chat_bar->findChild<LLNearbyChat>("nearby_chat");
// nearby_chat->updateChatHistoryStyle(); if(nearby_chat)
nearby_chat->updateChatHistoryStyle();
} }
bool isWordsName(const std::string& name) bool isWordsName(const std::string& name)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment