diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 13b8781b23..28ebaeb911 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -65,7 +65,8 @@ LLNearbyChat::LLNearbyChat(const LLSD& key) ,mChatHistory(NULL) { // [SL:KB] - Patch: Chat-NearbyChatBar | Checked: 2011-08-20 (Catznip-2.8.0a) | Added: Catznip-2.8.0a - mFactoryMap["panel_chat_editor"] = LLCallbackMap(LLNearbyChat::createChatEditor, NULL); + mFactoryMap["panel_chat_bar_single"] = LLCallbackMap(LLNearbyChat::createChatBarSingle, NULL); + mFactoryMap["panel_chat_bar_multi"] = LLCallbackMap(LLNearbyChat::createChatBarMulti, NULL); // [/SL:KB] } @@ -389,7 +390,12 @@ void LLNearbyChat::draw() } // [SL:KB] - Patch: Chat-NearbyChatBar | Checked: 2011-08-20 (Catznip-2.8.0a) | Added: Catznip-2.8.0a -void* LLNearbyChat::createChatEditor(void*) +void* LLNearbyChat::createChatBarSingle(void*) +{ + return new LLNearbyChatBar(); +} + +void* LLNearbyChat::createChatBarMulti(void*) { return new LLNearbyChatBarMulti(); } diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 568a65aaa0..7344b9265d 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -76,7 +76,8 @@ private: void onNearbySpeakers (); // [SL:KB] - Patch: Chat-NearbyChatBar | Checked: 2011-08-20 (Catznip-2.8.0a) | Added: Catznip-2.8.0a - static void* createChatEditor(void*); + static void* createChatBarSingle(void*); + static void* createChatBarMulti(void*); // [/SL:KB] private: diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat_multi.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat_multi.xml index 68f1e10806..080b98585f 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat_multi.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat_multi.xml @@ -98,7 +98,7 @@ height="60" layout="topleft" left="10" - name="panel_chat_editor" + name="panel_chat_bar_multi" width="300" > + + + + + + + + + + + + +