From f49d47b3041c6b36b36a23b67eec609e95494acc Mon Sep 17 00:00:00 2001
From: MaximB ProductEngine <mberezhnoy@productengine.com>
Date: Mon, 10 Dec 2012 17:22:56 +0200
Subject: CHUI-394 (Group moderation tools missing in right click menus)

---
 indra/newview/skins/default/xui/en/menu_conversation.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
index 01ef8ebdb5..e0edf384d6 100644
--- a/indra/newview/skins/default/xui/en/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -156,18 +156,11 @@
 		</menu_item_check>
 		<menu_item_separator layout="topleft" name="moderate_voice_separator" />
 		<menu_item_call
-		 label="Mute this participant"
+		 label="Toggle mute this participant"
 		 layout="topleft"
-		 name="ModerateVoiceMuteSelected">
+		 name="ModerateVoiceToggleMuteSelected">
 			<on_click function="Avatar.DoToSelected" parameter="selected" />
-			<on_enable function="Avatar.EnableItem" parameter="can_mute" />
-		</menu_item_call>
-		<menu_item_call
-		 label="Unmute this participant"
-		 layout="topleft"
-		 name="ModerateVoiceUnMuteSelected">
-			<on_click function="Avatar.DoToSelected" parameter="selected" />
-			<on_enable function="Avatar.EnableItem" parameter="can_unmute" />
+			<on_enable function="Avatar.EnableItem" parameter="can_mute_unmute" />
 		</menu_item_call>
 		<menu_item_call
 		 label="Mute everyone"
-- 
cgit v1.2.3


From 6b1ab1b81c6b23a1947d0038686e294b6344eddb Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Tue, 11 Dec 2012 15:20:46 +0200
Subject: CHUI-587 FIXED Disable menu item if "KeepConversationLogTranscripts"
 is false.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b1e3a2d41f..3e7329c0b5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -261,6 +261,8 @@
             <menu_item_check.on_check
              function="Floater.Visible"
              parameter="conversation" />
+            <menu_item_check.on_enable
+             function="Conversation.IsConversationLoggingAllowed" />
             <menu_item_check.on_click
              function="Floater.Toggle"
              parameter="conversation" />
-- 
cgit v1.2.3


From 13956ab25d76ef3373d2a06795b92b24364f63cf Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Tue, 11 Dec 2012 17:16:32 +0200
Subject: CHUI-572 FIXED Changed initial position for floaters according to
 screenshot.

---
 indra/newview/skins/default/xui/en/floater_camera.xml       | 4 ++--
 indra/newview/skins/default/xui/en/floater_destinations.xml | 3 +--
 indra/newview/skins/default/xui/en/floater_im_container.xml | 3 ++-
 indra/newview/skins/default/xui/en/floater_moveview.xml     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 4b4821a383..521389d7b3 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="specified"
- left="643"
- bottom="-80"
+ right="-460"
+ bottom="-50"
  follows="left|bottom"
  legacy_header_height="18"
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 41b57530fc..94ebaa9cb2 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ positioning="cascading"	
  ignore_ui_scale="false"
  legacy_header_height="225"
  can_minimize="true"
@@ -11,8 +12,6 @@
  height="230"
  layout="topleft"
  name="Destinations"
- right="-10"
- bottom="-80"
  single_instance="true"
  help_topic="destinations"
  save_rect="true"
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 9f6503d799..1128b8fef6 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -13,7 +13,8 @@
  single_instance="true"
  reuse_instance="true"
  title="CONVERSATIONS"
- bottom="-80"
+ bottom="-50"
+ right="-5"
  width="450">
     <string
      name="collapse_icon"
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 02d9805ddf..5e84283ab0 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="specified"
- left="505"
- bottom="-80"
+ right="-693"
+ bottom="-50"
  legacy_header_height="18"
  can_dock="false"
  can_minimize="true"
-- 
cgit v1.2.3