- added : single-line chat bar to the nearby chat history floater

--HG--
branch : Chat-NearbyChat

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();
 }

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:

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" >
 				<text_editor
 				 commit_on_return="true"

indra/newview/skins/default/xui/en/floater_nearby_chat_single.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ border_visible="false"
+ border="false"
+ legacy_header_height="18"
+ can_minimize="true"
+ can_tear_off="false"
+ can_resize="true"
+ can_drag_on_left="false"
+ can_close="false"
+ can_dock="true"
+ bevel_style="in"
+ height="380"
+ min_width="235"
+ layout="topleft"
+ name="nearby_chat"
+ help_topic="nearby_chat"
+ save_rect="true"
+ title="NEARBY CHAT"
+ save_dock_state="true"
+ save_visibility="true"
+ single_instance="true"
+ width="320">
+	<layout_stack
+	 animate="false"
+	 follows="all"
+	 height="350"
+	 width="320"
+	 layout="topleft"
+	 orientation="vertical"
+	 name="im_panels"
+	 top="20"
+	 left="0">
+		<layout_panel
+		 height="290"
+		 left="0"
+		 top="0"
+		 width="320"
+		 user_resize="true">
+			<check_box
+			 control_name="TranslateChat"
+			 enabled="true"
+			 height="16"
+			 label="Translate chat (powered by Google)"
+			 layout="topleft"
+			 left="5"
+			 name="translate_chat_checkbox"
+			 width="230" />
+			<chat_history
+			 parse_urls="true"
+			 bg_readonly_color="ChatHistoryBgColor"
+			 bg_writeable_color="ChatHistoryBgColor"
+			 follows="all"
+			 layout="topleft"
+			 left="5"
+			 height="260"
+			 name="chat_history"
+			 parse_highlights="true"
+			 text_color="ChatHistoryTextColor"
+			 text_readonly_color="ChatHistoryTextColor"
+			 right_widget_pad="5"
+			 left_widget_pad="0"
+			 width="315" />
+		</layout_panel>
+
+		<layout_panel
+		 auto_resize="false"
+		 height="28"
+		 layout="topleft"
+		 left="0"
+		 mouse_opaque="false"
+		 width="320"
+		 user_resize="false">
+			<panel
+			 filename="panel_nearby_chat_bar.xml"
+			 follows="left|right|bottom"
+			 height="28"
+			 mouse_opaque="false"
+			 name="panel_chat_bar_single"
+			 layout="topleft"
+			 left="10"
+			 top="0"
+			 width="300" />
+		</layout_panel>
+
+	</layout_stack>
+</floater>