Commits

leslie_linden  committed a366069 Merge

Merge

  • Participants
  • Parent commits c891c28, 0b1d423

Comments (0)

Files changed (1)

File indra/newview/llnearbychat.cpp

 //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)