From 976a2f5a442150ef89cff6b39450eabbca956d0f Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Wed, 26 Sep 2012 20:45:18 +0300
Subject: CHUI-344 FIXED (LLConversationViewSession: enable icon update)

- This commit also fixes CHUI-345 CHUI-346
---
 .../default/textures/icons/nearby_chat_icon.png    | Bin 0 -> 793 bytes
 indra/newview/skins/default/textures/textures.xml  |   2 ++
 .../xui/en/panel_conversation_list_item.xml        |  26 ++++++++++++++++++---
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/nearby_chat_icon.png

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/textures/icons/nearby_chat_icon.png b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png
new file mode 100644
index 0000000000..7c3ad40381
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 47b0c12fa0..a124041565 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -363,6 +363,8 @@ with the same filename but different name
   <texture name="NavBar_BG_NoFav_Bevel" file_name="navbar/NavBar_BG_NoFav_Bevel.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
   <texture name="NavBar_BG_NoNav_Bevel" file_name="navbar/NavBar_BG_NoNav_Bevel.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
 
+  <texture name="Nearby_chat_icon" file_name="icons/nearby_chat_icon.png" preload="false" />
+
   <texture name="Notices_Unread" file_name="bottomtray/Notices_Unread.png" preload="true" />
 
   <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index 375ea79ebe..56056ed560 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -13,13 +13,33 @@
      layout="topleft"
      left="5"
      top="2"
+     visible="false"
      width="20" />
+    <group_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Group"
+     layout="topleft"
+     left="5"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="20"
+     image_name="Nearby_chat_icon"
+     layout="topleft"
+     left="5"
+     name="nearby_chat_icon"
+     top="2"
+     visible="false"
+     width="20"/>
     <layout_stack
      animate="false"
      follows="all"
      height="24"
      layout="topleft"
-     left_pad="5"
+     left="30"
      mouse_opaque="false"
      name="conversation_item_stack"
      orientation="horizontal"
@@ -36,7 +56,7 @@
             <icon
              height="20"
              follows="top|right|left"
-             image_name="Conv_toolbar_hang_up"
+             image_name="Conv_toolbar_open_call"
              layout="topleft"
              left="0"
              name="selected_icon"
@@ -70,7 +90,7 @@
 		     layout="topleft"
 		     left_pad="5"
  		     mouse_opaque="true"
- 		     name="speaking_indicator"
+ 		     name="speaking_indicatorn"
  		     visible="false"
  		     width="20" />
         </layout_panel>
-- 
cgit v1.2.3


From 483cbd74d78b8fa7ce94e3d3c7d264bcdaa331b5 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 27 Sep 2012 20:09:22 +0300
Subject: CHUI-165 FIXED Add access to Conversation Log and Chat History from
 the People floater.

---
 .../newview/skins/default/xui/en/menu_people_friends_view.xml  |  8 ++++++++
 indra/newview/skins/default/xui/en/menu_people_nearby.xml      | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
index eab7b8c085..dde9432867 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
@@ -40,4 +40,12 @@
      function="CheckControl"
      parameter="FriendsListShowPermissions" />
   </menu_item_check>
+  <menu_item_check name="view_conversation" label="View Conversation Log...">
+    <menu_item_check.on_check
+     function="Floater.Visible"
+     parameter="conversation" />
+    <menu_item_check.on_click
+     function="Floater.Toggle"
+     parameter="conversation" />
+  </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index b7c9ab1fe3..8014e81469 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -36,6 +36,14 @@
          parameter="can_call" />
     </menu_item_call>
     <menu_item_separator />
+    <menu_item_call
+     label="View chat history..."
+     layout="topleft"
+     name="Chat history">
+        <menu_item_call.on_click
+         function="Avatar.Calllog" />
+    </menu_item_call>
+    <menu_item_separator />
     <menu_item_call
      label="Add Friend"
      layout="topleft"
@@ -101,5 +109,5 @@
          function="Avatar.EnableItem"
          parameter="can_block" />
     </menu_item_check>
-
+    <menu_item_separator />
 </context_menu>
-- 
cgit v1.2.3


From 3e3735c16b47402d8fc2da8afa6086638fb5b948 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 28 Sep 2012 15:02:31 +0300
Subject: CHUI-345 ADDITIONAL FIX (LLConversationViewSession: enable speaking
 indicator)

- Clicking on the conversation speaking icon brings up the volume floater for voice conversations
---
 .../default/xui/en/floater_voice_chat_volume.xml   | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..5c71fd3bc6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="90"
+ layout="topleft"
+ name="floater_voice_volume"
+ single_instance="true"
+ sound_flags="0"
+ title="VOICE CHAT VOLUME"
+ visible="true"
+ width="245">
+	<slider
+		control_name="AudioLevelVoice"
+		disabled_control="MuteAudio"
+		follows="left|top"
+		height="16"
+		increment="0.025"
+		initial_value="0.5"
+		label="Voice Chat"
+		label_width="50"
+		layout="topleft"
+		left="15"
+		top="50"
+		name="chat_voice_volume"
+		show_text="false"
+		slider_label.halign="right"
+		volume="true"
+		width="200">
+	</slider>
+	<button
+		control_name="MuteVoice"
+		disabled_control="MuteAudio"
+		follows="top|left"
+		height="16"
+		image_selected="AudioMute_Off"
+		image_unselected="Audio_Off"
+		is_toggle="true"
+		layout="topleft"
+		left_pad="5"
+		name="mute_audio"
+		tab_stop="false"
+		width="16" />
+</floater>
\ No newline at end of file
-- 
cgit v1.2.3


From 14307b099bdb0e7c5b56d052a55e010ecd69b5c3 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 28 Sep 2012 19:06:36 +0300
Subject: CHUI-361 FIXED (Viewer crash when selecting to start IM with user
 from right click menu in people floater ): prevent destruction of
 im_container; suppress warning for the nearby_chat

---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index d23ff28fd0..590ce45c33 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -11,6 +11,7 @@
  save_rect="true"
  save_visibility="true"
  single_instance="true"
+ reuse_instance="true"
  title="CONVERSATIONS"
  width="680">
     <string
-- 
cgit v1.2.3