From b220d5908f59b46c7583ec6f216b3696c4e5d27f Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Sun, 28 Jul 2013 08:43:35 -0600
Subject: [PATCH] Update chat history and muted chat icons, add Conversation
 Log floater to toolbox

---
 indra/newview/app_settings/commands.xml        |  10 ++++++++++
 .../default/textures/icons/Chat_History.png    | Bin 0 -> 4103 bytes
 .../default/textures/icons/Muted_Chat.png      | Bin 422 -> 4103 bytes
 .../skins/default/textures/textures.xml        |   5 +++--
 .../default/xui/en/floater_fs_im_session.xml   |   2 +-
 .../default/xui/en/floater_fs_nearby_chat.xml  |   2 +-
 .../default/xui/en/floater_nearby_chat-cb.xml  |   2 +-
 indra/newview/skins/default/xui/en/strings.xml |   2 ++
 .../metaharper/xui/en/floater_nearby_chat.xml  |   2 +-
 9 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Chat_History.png

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 1c93973f83..390803d6b7 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -476,4 +476,14 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="fs_radar"
            />
+  <command name="conversation_log"
+           available_in_toybox="true"
+           icon="Chat_History"
+           label_ref="Command_Conversation_Log_Label"
+           tooltip_ref="Command_Conversation_Log_Tooltip"
+           execute_function="Floater.Toggle"
+           execute_parameters="conversation"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="conversation"
+           />
 </commands>
diff --git a/indra/newview/skins/default/textures/icons/Chat_History.png b/indra/newview/skins/default/textures/icons/Chat_History.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fc1cc830eed90ba8a9c45396a31b268b6123eee
GIT binary patch
literal 4103
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

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/icons/Muted_Chat.png b/indra/newview/skins/default/textures/icons/Muted_Chat.png
index 4b47a74426a0344e94b92e4dfc52b1a52c4dfcb7..f946cba59364a691e3073cefcf24261395edb241 100644
GIT binary patch
literal 4103
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

delta 376
zcmV-;0f+vFAf^M5BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%j<02*{fSaefw
zW^{L9a%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003MNkl<ZI8VKlArFE;6vr<TNo1lU
z`5_2&zJT8Znnp)<v)BkSiVQZe8I4AxO`-v}^S#?Wh6gBYjBtC3?|%F7zk4#yIh$e$
zNKq6{p63^+`WPtm`>^kS1XV+b248MaIn?V=7(#H5Tn-tT0J#r^DUcPuMV$})h%hwb
zVHiFP!`Lv!e06!AcW#&n$QMXvr8k;LySFy;Y@HaIpb-M&I4&*A+M-nu1j07UvdVSc
z13vo+n#_nYX_`rsH<?h+yhfBsnx<70MNc)e`7$DtBuQSjZST5MGNaS%%?K{!e$1&s
z@1k`f2?Di*hGpOI%Gtz0#o4TT#f2OSA$SMOB+&YwiE2nN*mrCV?U?@}Ihz^+@$(0s
We~MrVs_Yd20000<MNUMnLSTZp&Yd{`

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index abb67f3d09..373a9cbc79 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -905,8 +905,9 @@ with the same filename but different name
 <texture name="icon_avatar_online"			file_name="legacy/icon_avatar_online.tga"		preload="false" />
 <texture name="slim_icon_16_viewer"				file_name="slim_icon_16_viewer.tga"					preload="false" />
 
-  <texture name="Console_Background" file_name="Console_Background.png"/>
-  <texture name="Muted_Chat" file_name="icons/Muted_Chat.png" preload="false" />
+<texture name="Console_Background" file_name="Console_Background.png"/>
+<texture name="Muted_Chat" file_name="icons/Muted_Chat.png" preload="false" />
+<texture name="Chat_History" file_name="icons/Chat_History.png" preload="false" />
 
 <texture name="Icon_Place" file_name="icon_place.tga" preload="false" />
 <texture name="Icon_Auction" file_name="icon_auction.tga" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
index 0ac34df4d6..f676ef7049 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
@@ -310,7 +310,7 @@
       image_pressed_selected="PushButton_Selected_Press"
       image_selected="PushButton_Selected_Press"
       tool_tip="Open this Instant Message's past history."
-      image_overlay="List_View_On"
+      image_overlay="Chat_History"
       name="im_history_btn"
       top="0"
       width="25" />
diff --git a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
index d230a16bd8..216714e0c6 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
@@ -73,7 +73,7 @@
        top="2"
        width="24"
        height="24"
-       image_overlay="List_View_On"
+       image_overlay="Chat_History"
        image_pressed="PushButton_Press"
        image_pressed_selected="PushButton_Selected_Press"
        image_selected="PushButton_Selected_Press"
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat-cb.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat-cb.xml
index fdfd025cc2..2334e11aa5 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat-cb.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat-cb.xml
@@ -78,7 +78,7 @@
           height="20"
           follows="left|top"
           left_pad="2"
-          image_overlay="List_View_On"
+          image_overlay="Chat_History"
           width="25"
           image_pressed="PushButton_Press"
           image_pressed_selected="PushButton_Selected_Press"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 037c1a7051..adf9717cf2 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2328,6 +2328,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Pose_Stand_Label">Pose Stand</string>
   <string name="Command_Snapshot_To_Disk_Label">Snapshot to Disk</string>
   <string name="Command_Radar_Label">Radar</string>
+  <string name="Command_Conversation_Log_Label">Conversation Log</string>
   
 
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
@@ -2377,6 +2378,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Pose_Stand_Tooltip">Avatar pose stand for adjusting attachments</string>
   <string name="Command_Snapshot_To_Disk_Tooltip">Takes a quick snapshot and saves it to harddisk</string>
   <string name="Command_Radar_Tooltip">Opens the radar for nearby avatars</string>
+  <string name="Command_Conversation_Log_Tooltip">Opens the conversation log to view past chat transcripts</string>
 
   <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string>
   <string name="Toolbar_Left_Tooltip"  >currently in your left toolbar</string>
diff --git a/indra/newview/skins/metaharper/xui/en/floater_nearby_chat.xml b/indra/newview/skins/metaharper/xui/en/floater_nearby_chat.xml
index 9863069273..9bcdc9e4ee 100644
--- a/indra/newview/skins/metaharper/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/metaharper/xui/en/floater_nearby_chat.xml
@@ -81,7 +81,7 @@
           height="20"
           follows="left|top"
           left_pad="2"
-          image_overlay="List_View_On"
+          image_overlay="Chat_History"
           layout="topleft"
           width="25"
           image_pressed="PushButton_Press"