From 37ef2c4f0f7958106ea09abcd486cb9c305316e4 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 27 Apr 2011 16:45:33 -0700
Subject: EXP-670 Voice for basic mode reviewed by Merov
 http://codereview.lindenlab.com/6231263/

---
 indra/newview/skins/minimal/textures/textures.xml  |   4 +-
 .../skins/minimal/xui/en/panel_bottomtray.xml      | 220 ++++++++++++---------
 2 files changed, 130 insertions(+), 94 deletions(-)

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

diff --git a/indra/newview/skins/minimal/textures/textures.xml b/indra/newview/skins/minimal/textures/textures.xml
index b4848a0619..e3ed01721a 100644
--- a/indra/newview/skins/minimal/textures/textures.xml
+++ b/indra/newview/skins/minimal/textures/textures.xml
@@ -6,4 +6,6 @@
   <texture name="bottomtray_close_off" file_name="bottomtray/close_off.png" preload="true" />
   <texture name="bottomtray_close_over" file_name="bottomtray/close_over.png" preload="true" />
   <texture name="bottomtray_close_press" file_name="bottomtray/close_press.png" preload="true" />
-</textures>
+  <texture name="Speak_Btn_Off" file_name="bottomtray/Speak_Btn_Off.png" preload="true" scale.left="4" scale.top="16" scale.right="8" scale.bottom="4" />
+  <texture name="Speak_Btn_Selected_Press" file_name="bottomtray/Speak_Btn_Selected_Press.png" preload="true" scale.left="4" scale.top="16" scale.right="8" scale.bottom="4" />
+ </textures>
diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index 95f2010e44..70a59cea43 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -12,16 +12,16 @@
  focus_root="true"
  top="28"
  width="1310">
-	<string
+  <string
      name="DragIndicationImageName"
      value="Accordion_ArrowOpened_Off" />
-	<string
+  <string
      name="SpeakBtnToolTip"
      value="Turns microphone on/off" />
-	<string
+  <string
      name="VoiceControlBtnToolTip"
      value="Shows/hides voice control panel" />
-	<layout_stack
+  <layout_stack
      border_size="0"
      clip="false"
      follows="all"
@@ -33,12 +33,12 @@
      orientation="horizontal"
      top="0"
      width="1310">
-		<layout_panel
+    <layout_panel
          auto_resize="false"
          user_resize="false"
          min_width="2"
          width="2" />
-		<layout_panel
+    <layout_panel
          auto_resize="false"
          layout="topleft"
          max_width="320"
@@ -48,7 +48,7 @@
 		 name="chat_bar_layout_panel"
          user_resize="true"
          width="308" >
-			<panel
+      <panel
 		   name="chat_bar"
 			  filename="panel_nearby_chat_bar.xml"
 			  left="0"
@@ -65,39 +65,73 @@
         height="28"
         layout="topleft"
         min_height="28"
-        min_width="59"
+        min_width="35"
         mouse_opaque="false"
         name="speak_panel"
         top_delta="0"
         user_resize="false"
-        width="108">
-      <talk_button
+        width="85">
+      <button
        follows="left|right"
        height="23"
        layout="topleft"
+       label="Speak"
        left="0"
-       name="talk"
+       name="speak_btn"
+       
+       pad_right="30"
+       halign="center"
+       use_ellipses="true"
+       tab_stop="true"
+    is_toggle="true"
+    image_selected="Speak_Btn_Selected_Press"
+    image_unselected="Speak_Btn_Off"
+		 image_pressed="Speak_Btn_Selected_Press"
+		 image_pressed_selected="Speak_Btn_Selected_Press"
        top="5"
-       width="105">
-        <show_button
-         tab_stop="true">
-          <init_callback
-           function="Button.SetDockableFloaterToggle"
-           parameter="voice_controls" />
-        </show_button>
-        <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
-                 & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
-        <speak_button
-         halign="center"
-         label="Speak"
-         label_selected="Speak"
-         name="speak_btn"
-         pad_right="20"
-         tab_stop="true"
-         use_ellipses="true" />
-      </talk_button>
+       width="85">
+
+        <commit_callback
+				  function="ToggleSpeak"
+				  parameter="f1_help" />
+      </button>
     </layout_panel>
-		<layout_panel
+
+    <layout_panel
+          auto_resize="false"
+          follows="left|right"
+          height="28"
+          layout="topleft"
+          min_height="28"
+          min_width="20"
+          mouse_opaque="false"
+          name="flyout_panel"
+          top_delta="0"
+          user_resize="false"
+          width="20">
+      <button
+     follows="left|right"
+     width="20"
+        top="5"
+     left="0"
+     height="23"
+     name="speak_flyout_btn"
+     label=""
+     tab_stop="false"
+     is_toggle="true"
+     image_disabled="ComboButton_UpOff"
+     image_unselected="ComboButton_UpOff"
+     image_selected="ComboButton_On"
+     image_pressed="ComboButton_UpSelected"
+     image_pressed_selected="ComboButton_Selected">
+        <init_callback
+         function="Button.SetDockableFloaterToggle"
+         parameter="sound_devices" />
+      </button>
+
+    </layout_panel>
+
+    <layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -108,7 +142,7 @@
          name="gesture_panel"
          top_delta="0"
          user_resize="false"
-         width="85">
+         width="88">
 			<gesture_combo_list
              follows="left|right"
              height="23"
@@ -116,20 +150,20 @@
              layout="topleft"
              get_more="false"
              view_all="false"
-             left="0"
+             left="3"
              name="Gesture"
              tool_tip="Shows/hides gestures"
              top="5"
              width="82">
-				<combo_button
+        <combo_button
                  pad_right="10"
                  can_drag="false"
                  use_ellipses="true" />
-				<combo_list
+        <combo_list
                  page_lines="17" />
-			</gesture_combo_list>
-		</layout_panel>
-		<layout_panel
+      </gesture_combo_list>
+    </layout_panel>
+    <layout_panel
          auto_resize="false"
          follows="left|right"
          height="28"
@@ -140,7 +174,7 @@
          name="cam_panel"
          user_resize="false"
          width="83">
-			<bottomtray_button
+      <bottomtray_button
               can_drag="false"
              follows="left|right"
              height="23"
@@ -156,12 +190,12 @@
              top="5"
              use_ellipses="true"
              width="80">
-				<init_callback
+        <init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="camera" />
-			</bottomtray_button>
-		</layout_panel>
-		<layout_panel
+      </bottomtray_button>
+    </layout_panel>
+    <layout_panel
          auto_resize="false"
          follows="left|right"
          height="28"
@@ -170,7 +204,7 @@
          name="splitter_panel"
          user_resize="false"
          width="17">
-			<icon
+      <icon
              follows="left|bottom"
              height="18"
              width="2"
@@ -178,8 +212,8 @@
              image_name="Button_Separator"
              name="separator"
              top="7"/>
-		</layout_panel>
-		<layout_panel
+    </layout_panel>
+    <layout_panel
 		  auto_resize="false"
 		  follows="left|right"
 		  height="28"
@@ -190,7 +224,7 @@
 		  name="avatar_and_destinations_panel"
 		  user_resize="false"
 		  width="103">
-			<bottomtray_button
+      <bottomtray_button
 			 can_drag="false"
 			follows="left|right"
 			height="23"
@@ -206,11 +240,11 @@
 			is_toggle="true"
 			use_ellipses="true"
 			width="100">
-				<bottomtray_button.commit_callback
+        <bottomtray_button.commit_callback
 				  function="Destination.show" />
-			</bottomtray_button>
-		</layout_panel>
-		<layout_panel
+      </bottomtray_button>
+    </layout_panel>
+    <layout_panel
 		  auto_resize="false"
 		  follows="left|right"
 		  height="28"
@@ -221,7 +255,7 @@
 		  name="avatar_and_destinations_panel"
 		  user_resize="false"
 		  width="103">
-			<bottomtray_button
+      <bottomtray_button
 			 can_drag="false"
 			follows="left|right"
 			height="23"
@@ -236,11 +270,11 @@
 			is_toggle="true"
 			use_ellipses="true"
 			width="100">
-				<bottomtray_button.commit_callback
+        <bottomtray_button.commit_callback
 				  function="Avatar.show" />
-			</bottomtray_button>
-		</layout_panel>
-		<layout_panel
+      </bottomtray_button>
+    </layout_panel>
+    <layout_panel
 		  auto_resize="false"
 		  follows="left|right"
 		  height="28"
@@ -249,7 +283,7 @@
 		  name="splitter_panel"
 		  user_resize="false"
 		  width="17">
-			<icon
+      <icon
              follows="left|bottom"
              height="18"
              width="2"
@@ -257,8 +291,8 @@
              image_name="Button_Separator"
              name="separator"
              top="7"/>
-		</layout_panel>
-		<layout_panel
+    </layout_panel>
+    <layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -270,7 +304,7 @@
          top_delta="0"
          user_resize="false"
          width="105">
-			<bottomtray_button
+      <bottomtray_button
 			   can_drag="false"
 			  follows="left|right"
 			  height="23"
@@ -286,12 +320,12 @@
 			  is_toggle="true"
 			  use_ellipses="true"
 			  width="100">
-				<bottomtray_button.commit_callback
+        <bottomtray_button.commit_callback
 				  function="ShowSidetrayPanel"
 				 parameter="panel_people" />
-			</bottomtray_button>
-		</layout_panel>
-		<layout_panel
+      </bottomtray_button>
+    </layout_panel>
+    <layout_panel
 		   auto_resize="false"
 		   follows="right"
 		   height="28"
@@ -303,7 +337,7 @@
 		   top_delta="0"
 		   user_resize="false"
 		   width="105">
-			<bottomtray_button
+      <bottomtray_button
 			   can_drag="false"
 			  follows="left|right"
 			  height="23"
@@ -319,12 +353,12 @@
 			  top="5"
 			  use_ellipses="true"
 			  width="100">
-				<bottomtray_button.commit_callback
+        <bottomtray_button.commit_callback
 				  function="ToggleAgentProfile"
 				  parameter="agent"/>
-			</bottomtray_button>
-		</layout_panel>
-		<layout_panel
+      </bottomtray_button>
+    </layout_panel>
+    <layout_panel
 		   auto_resize="false"
 		   follows="right"
 		   height="28"
@@ -336,7 +370,7 @@
 		   top_delta="0"
 		   user_resize="false"
 		   width="105">
-			<bottomtray_button
+      <bottomtray_button
 			   can_drag="false"
 			  follows="left|right"
 			  height="23"
@@ -352,12 +386,12 @@
 			  top="5"
 			  use_ellipses="true"
 			  width="100">
-				<bottomtray_button.commit_callback
+        <bottomtray_button.commit_callback
 				  function="ToggleHelp"
 				  parameter="f1_help" />
-			</bottomtray_button>
-		</layout_panel>
-		<layout_panel
+      </bottomtray_button>
+    </layout_panel>
+    <layout_panel
 		   follows="left|right"
 		   height="30"
 		   layout="topleft"
@@ -367,9 +401,9 @@
 		   top="0"
 		   user_resize="false"
 		   width="189">
-			<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
+      <!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
 as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991-->
-			<chiclet_panel
+      <chiclet_panel
              chiclet_padding="4"
              follows="left|right"
              height="24"
@@ -380,7 +414,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              name="chiclet_list"
              top="7"
              width="189">
-				<button
+        <button
                  auto_resize="true"
                  follows="right"
                  height="29"
@@ -397,7 +431,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                  top="-28"
                  visible="false"
                  width="7" />
-				<button
+        <button
                  auto_resize="true"
                  follows="right"
                  height="29"
@@ -414,13 +448,13 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                  top="-28"
                  visible="false"
                  width="7" />
-			</chiclet_panel>
-		</layout_panel>
-		<layout_panel auto_resize="false"
+      </chiclet_panel>
+    </layout_panel>
+    <layout_panel auto_resize="false"
                       user_resize="false"
                       width="4"
                       min_width="4"/>
-		<layout_panel
+    <layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -431,7 +465,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          top="0"
          user_resize="false"
          width="37">
-			<chiclet_im_well
+      <chiclet_im_well
              follows="right"
              height="28"
              layout="topleft"
@@ -440,7 +474,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              name="im_well"
              top="0"
              width="35">
-				<!--
+        <!--
 Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
 xml attribute           Description
 image_unselected        "Unlit" - there are no new messages
@@ -448,7 +482,7 @@ image_selected          "Unlit" + "Selected" - there are no new messages and the
 image_pressed           "Lit" - there are new messages
 image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well is open
              -->
-				<button
+        <button
                  auto_resize="true"
                  follows="right"
                  halign="center"
@@ -463,13 +497,13 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                  name="Unread IM messages"
                  tool_tip="Conversations"
                  width="34">
-					<init_callback
+          <init_callback
                      function="Button.SetDockableFloaterToggle"
                      parameter="im_well_window" />
-				</button>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel
+        </button>
+      </chiclet_im_well>
+    </layout_panel>
+    <layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -480,7 +514,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          top="0"
          user_resize="false"
          width="37">
-			<chiclet_notification
+      <chiclet_notification
              follows="right"
              height="23"
              layout="topleft"
@@ -489,7 +523,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
              name="notification_well"
              top="5"
              width="35">
-				<button
+        <button
                  auto_resize="true"
                  bottom_pad="3"
                  follows="right"
@@ -505,7 +539,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                  name="Unread"
                  tool_tip="Notifications"
                  width="34">
-					<init_callback
+          <init_callback
                      function="Button.SetDockableFloaterToggle"
                      parameter="notification_well_window" />
 				</button>
@@ -517,5 +551,5 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
 		   min_width="4"
 		   name="DUMMY2"
 		   width="8" />
-	</layout_stack>
+  </layout_stack>
 </panel>
-- 
cgit v1.2.3


From 892c5109e8679ca28a53799289732efcbebd9d48 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 27 Apr 2011 16:45:57 -0700
Subject: EXP-670 Voice for basic mode new files reviewed by merov

---
 .../skins/minimal/textures/bottomtray/Speak_Btn_Off.png  | Bin 0 -> 993 bytes
 .../textures/bottomtray/Speak_Btn_Selected_Press.png     | Bin 0 -> 1217 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 indra/newview/skins/minimal/textures/bottomtray/Speak_Btn_Off.png
 create mode 100644 indra/newview/skins/minimal/textures/bottomtray/Speak_Btn_Selected_Press.png

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

diff --git a/indra/newview/skins/minimal/textures/bottomtray/Speak_Btn_Off.png b/indra/newview/skins/minimal/textures/bottomtray/Speak_Btn_Off.png
new file mode 100644
index 0000000000..b6e9eef891
Binary files /dev/null and b/indra/newview/skins/minimal/textures/bottomtray/Speak_Btn_Off.png differ
diff --git a/indra/newview/skins/minimal/textures/bottomtray/Speak_Btn_Selected_Press.png b/indra/newview/skins/minimal/textures/bottomtray/Speak_Btn_Selected_Press.png
new file mode 100644
index 0000000000..687cb7fb53
Binary files /dev/null and b/indra/newview/skins/minimal/textures/bottomtray/Speak_Btn_Selected_Press.png differ
-- 
cgit v1.2.3


From a59de335c5bfa7b730977f0061a046654e2b964c Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 27 Apr 2011 17:41:34 -0700
Subject: EXP-626 New bottomtray tooltips for basic mode

---
 indra/newview/skins/minimal/xui/en/panel_bottomtray.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index 70a59cea43..aff22c7e45 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -78,7 +78,7 @@
        label="Speak"
        left="0"
        name="speak_btn"
-       
+       tool_tip="Turn your microphone on and off"
        pad_right="30"
        halign="center"
        use_ellipses="true"
@@ -118,6 +118,7 @@
      name="speak_flyout_btn"
      label=""
      tab_stop="false"
+     tool_tip="Change your sound preferences"
      is_toggle="true"
      image_disabled="ComboButton_UpOff"
      image_unselected="ComboButton_UpOff"
@@ -152,7 +153,7 @@
              view_all="false"
              left="3"
              name="Gesture"
-             tool_tip="Shows/hides gestures"
+             tool_tip="Make your avatar do things"
              top="5"
              width="82">
         <combo_button
@@ -186,7 +187,7 @@
              layout="topleft"
              left="0"
              name="camera_btn"
-             tool_tip="Shows/hides camera controls"
+             tool_tip="Control your camera angle"
              top="5"
              use_ellipses="true"
              width="80">
@@ -235,7 +236,7 @@
 			layout="topleft"
 			left="0"
 			name="destination_btn"
-			tool_tip="Shows destinations window"
+			tool_tip="Travel through Second Life"
 			top="5"
 			is_toggle="true"
 			use_ellipses="true"
@@ -268,6 +269,7 @@
 			name="avatar_btn"
 			top="5"
 			is_toggle="true"
+			tool_tip="Change your appearance"
 			use_ellipses="true"
 			width="100">
         <bottomtray_button.commit_callback
@@ -315,7 +317,7 @@
 			  layout="topleft"
 			  left="0"
 			  name="show_people_button"
-			  tool_tip="Shows people window"
+			  tool_tip="Find people in Second Life"
 			  top="5"
 			  is_toggle="true"
 			  use_ellipses="true"
@@ -348,7 +350,7 @@
 			  layout="topleft"
 			  left="0"
 			  name="show_profile_btn"
-			  tool_tip="Shows profile window"
+			  tool_tip="View and edit your Profile"
 			  is_toggle="true"
 			  top="5"
 			  use_ellipses="true"
@@ -381,7 +383,7 @@
 			  layout="topleft"
 			  left="0"
 			  name="show_help_btn"
-			  tool_tip="Open Second Life How To topics"
+			  tool_tip="View Second Life help info"
 			  is_toggle="true"
 			  top="5"
 			  use_ellipses="true"
-- 
cgit v1.2.3


From 5fe3675564f1c7d8cf13e94f43d32be5ea45940b Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 29 Apr 2011 15:53:14 -0700
Subject: EXP-761, EXP-758

---
 indra/newview/skins/minimal/xui/en/panel_bottomtray.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index aff22c7e45..49eead5079 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -105,7 +105,7 @@
           min_height="28"
           min_width="20"
           mouse_opaque="false"
-          name="flyout_panel"
+          name="speak_flyout_panel"
           top_delta="0"
           user_resize="false"
           width="20">
-- 
cgit v1.2.3


From 814e540e85d0f8dc3b50ade6b1b3194e7cbb57fb Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 2 May 2011 13:40:41 -0700
Subject: EXP-743 FIX Side bar panel is visible on login screen after getting
 'We're having trouble connecting' message

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 45ba785c1f..ac5bae2f3b 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -8,13 +8,6 @@
  tab_stop="false" 
  name="main_view"
  width="1024">
-  <panel top="0"
-   follows="all"
-   height="768"
-   mouse_opaque="false"
-   name="login_panel_holder"
-   width="1024"/>
- 
   <layout_stack border_size="0"
                 follows="all"
                 mouse_opaque="false"
@@ -96,6 +89,14 @@
                      name="stand_stop_flying_container"
                      visible="false"
                      width="500"/>
+              
+              <panel top="0"
+               follows="all"
+               height="500"
+               mouse_opaque="false"
+               name="login_panel_holder"
+               width="1024"/>
+
               <panel follows="all"
 										 height="500"
 										 left="0"
-- 
cgit v1.2.3


From f085d242dc9c47cfa55cdd3a79413fe6ed84ede5 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 2 May 2011 16:37:10 -0700
Subject: EXP-763 Cannot close IM window using X in upper corner while in a
 voice call

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 616b544847..bdd3c3d4a4 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" ?>
 <notification_visibility>
-  <respond name="VoiceInviteP2P" response="Decline"/>
-  <respond name="VoiceInviteAdHoc" response="Decline"/>
   <respond name="VoiceInviteGroup" response="Decline"/>
 
   <!-- group and voice are disabled features -->
   <hide tag="group"/>
-  <hide tag="voice"/>
 
   <!-- no spammy scripts -->
   <!-- <hide name="ScriptDialog"/> -->
@@ -16,6 +13,7 @@
   <hide name="FirstInventory"/>
   <hide name="HintSidePanel"/>
   <hide name="HintMove"/>
+  <hide name="HintSpeak"/>
   <hide name="HintDisplayName"/>
   <hide name="HintInventory"/>
   <hide name="HintLindenDollar"/>
-- 
cgit v1.2.3


From b0ebba414e2b2924b1fb9e238a000408fd5358f8 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 3 May 2011 10:43:32 -0700
Subject: merge fix for voice

---
 .../minimal/xui/en/panel_adhoc_control_panel.xml   | 35 ++++++++++++++++++++++
 .../minimal/xui/en/panel_im_control_panel.xml      | 33 ++++++++++++++++++++
 2 files changed, 68 insertions(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml
index 5730adab8a..39d1a90850 100644
--- a/indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml
@@ -42,5 +42,40 @@
              show_speaking_indicator="false"
              width="147" />
         </layout_panel>
+      <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="130"
+         name="call_btn_panel"
+         user_resize="false"
+         visible="false">
+        <button
+         follows="all"
+         height="20"
+         label="Call"
+         name="call_btn"
+         width="130"
+         top="5" />
+      </layout_panel>
+      <layout_panel
+       auto_resize="false"
+       follows="top|left|right"
+       height="25"
+       layout="topleft"
+       min_height="25"
+       width="130"
+       name="end_call_btn_panel"
+       user_resize="false"
+       visible="false">
+        <button
+         follows="all"
+         height="20"
+         label="Leave Call"
+         name="end_call_btn"
+         top="5"/>
+      </layout_panel>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
index c3f46f11e0..be13bc1bb7 100644
--- a/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
@@ -77,6 +77,39 @@
              tool_tip = "Offer to teleport this person"
              width="140" />
       </layout_panel>
+      <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="140"
+         name="call_btn_panel"
+         user_resize="false">
+        <button
+         follows="left|top|right"
+         height="23"
+         label="Call"
+         name="call_btn"
+         width="140" />
+      </layout_panel>
+      <layout_panel
+       auto_resize="false"
+       follows="top|left|right"
+       height="25"
+       layout="topleft"
+       min_height="25"
+       width="140"
+       name="end_call_btn_panel"
+       user_resize="false"
+       visible="false">
+        <button
+         follows="left|top|right"
+         height="23"
+         label="End Call"
+         name="end_call_btn"
+         width="140" />
+      </layout_panel>
       <layout_panel
        mouse_opaque="false"
        auto_resize="true"
-- 
cgit v1.2.3


From 1b601fbdff008e32a0d9e0a85ad38518e7ab344e Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 3 May 2011 14:35:07 -0700
Subject: EXP-771 Enable call option in Basic Viewer UI

---
 .../skins/minimal/xui/en/menu_attachment_other.xml |  8 ++++++++
 .../skins/minimal/xui/en/menu_avatar_other.xml     |  8 ++++++++
 .../minimal/xui/en/menu_inspect_avatar_gear.xml    |  9 +++++++++
 .../skins/minimal/xui/en/menu_people_nearby.xml    | 10 ++++++++++
 .../newview/skins/minimal/xui/en/panel_people.xml  | 23 +++++++++++++++++++++-
 5 files changed, 57 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml b/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
index b55e677276..80cf365c46 100644
--- a/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
@@ -25,6 +25,14 @@
         <menu_item_call.on_click
          function="Avatar.SendIM" />
     </menu_item_call>
+  <menu_item_call
+     label="Call"
+     name="Call">
+    <menu_item_call.on_click
+     function="Avatar.Call" />
+    <menu_item_call.on_enable
+     function="Avatar.EnableCall" />
+  </menu_item_call>
    <menu_item_separator />
     <menu_item_call
      enabled="false"
diff --git a/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml b/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml
index b76629f401..2c81b5a778 100644
--- a/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml
@@ -25,6 +25,14 @@
         <menu_item_call.on_click
          function="Avatar.SendIM" />
     </menu_item_call>
+  <menu_item_call
+     label="Call"
+     name="Call">
+    <menu_item_call.on_click
+     function="Avatar.Call" />
+    <menu_item_call.on_enable
+     function="Avatar.EnableCall" />
+  </menu_item_call>
    <menu_item_separator />
     <menu_item_call
      enabled="false"
diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml
index 5a4a059781..a11e367d66 100644
--- a/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml
@@ -26,6 +26,15 @@
     <menu_item_call.on_click
      function="InspectAvatar.IM"/>
   </menu_item_call>
+  <menu_item_call
+   label="Call"
+   enabled="true"
+   name="call">
+    <menu_item_call.on_click
+     function="InspectAvatar.Call"/>
+    <menu_item_call.on_enable
+     function="InspectAvatar.Gear.EnableCall"/>
+  </menu_item_call>
   <menu_item_call
    label="Teleport"
    name="teleport">
diff --git a/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml b/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml
index 3d64133f54..1840ebd491 100644
--- a/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml
@@ -36,6 +36,16 @@
 		<menu_item_call.on_click
          function="Avatar.IM" />
 	</menu_item_call>
+  <menu_item_call
+     label="Call"
+     layout="topleft"
+     name="Call">
+    <menu_item_call.on_click
+     function="Avatar.Call" />
+    <menu_item_call.on_enable
+     function="Avatar.EnableItem"
+     parameter="can_call" />
+  </menu_item_call>
 	<menu_item_check
      label="Block/Unblock"
      layout="topleft"
diff --git a/indra/newview/skins/minimal/xui/en/panel_people.xml b/indra/newview/skins/minimal/xui/en/panel_people.xml
index 4a72653d76..68e12cc444 100644
--- a/indra/newview/skins/minimal/xui/en/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_people.xml
@@ -443,7 +443,28 @@ Looking for people to hang out with? Try the Destinations button below.
 		         top="0"
 		         width="40" />			
 			</layout_panel>
-		
+			
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			name="chat_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="52">
+				<button
+		         follows="bottom|left|right"
+		         left="1"
+		         height="23"
+		         label="Call"
+		         layout="topleft"
+		         name="call_btn"
+		         tool_tip="Call this Resident"
+		         top="0"
+		         width="51" />		
+			</layout_panel>
+						
 			<layout_panel
 			follows="bottom|left|right"
 			height="23"
-- 
cgit v1.2.3


From 36938bd6e28b76a845b05d10231b4f9f9f8a1b96 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Wed, 4 May 2011 14:53:22 -0700
Subject: FIX VWR-19022 ES linguistic

---
 indra/newview/skins/minimal/xui/es/menu_favorites.xml             | 2 +-
 indra/newview/skins/minimal/xui/es/menu_inspect_avatar_gear.xml   | 2 +-
 indra/newview/skins/minimal/xui/es/menu_teleport_history_item.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/es/menu_favorites.xml b/indra/newview/skins/minimal/xui/es/menu_favorites.xml
index c8a7858ddb..85210d5c49 100644
--- a/indra/newview/skins/minimal/xui/es/menu_favorites.xml
+++ b/indra/newview/skins/minimal/xui/es/menu_favorites.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Teleportarse" name="Teleport To Landmark"/>
+	<menu_item_call label="Teleportar" name="Teleport To Landmark"/>
 	<menu_item_call label="Ver/Editar el hito" name="Landmark Open"/>
 	<menu_item_call label="Copiar la SLurl" name="Copy slurl"/>
 	<menu_item_call label="Mostrar en el mapa" name="Show On Map"/>
diff --git a/indra/newview/skins/minimal/xui/es/menu_inspect_avatar_gear.xml b/indra/newview/skins/minimal/xui/es/menu_inspect_avatar_gear.xml
index ebe33cea11..b4b964d096 100644
--- a/indra/newview/skins/minimal/xui/es/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/minimal/xui/es/menu_inspect_avatar_gear.xml
@@ -3,7 +3,7 @@
 	<menu_item_call label="Ver el perfil" name="view_profile"/>
 	<menu_item_call label="Añadir como amigo" name="add_friend"/>
 	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Teleportarse" name="teleport"/>
+	<menu_item_call label="Teleportar" name="teleport"/>
 	<menu_item_call label="Ignorar" name="block"/>
 	<menu_item_call label="Designorar" name="unblock"/>
 	<menu_item_call label="Denunciar" name="report"/>
diff --git a/indra/newview/skins/minimal/xui/es/menu_teleport_history_item.xml b/indra/newview/skins/minimal/xui/es/menu_teleport_history_item.xml
index ed33c55aca..c482907812 100644
--- a/indra/newview/skins/minimal/xui/es/menu_teleport_history_item.xml
+++ b/indra/newview/skins/minimal/xui/es/menu_teleport_history_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Teleport History Item Context Menu">
-	<menu_item_call label="Teleportarse" name="Teleport"/>
+	<menu_item_call label="Teleportar" name="Teleport"/>
 	<menu_item_call label="Más información" name="More Information"/>
 	<menu_item_call label="Copiar al portapapeles" name="CopyToClipboard"/>
 </context_menu>
-- 
cgit v1.2.3


From efca808b0c95aa2406960cb60a25ab90b14bde90 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 4 May 2011 18:04:09 -0700
Subject: EXP-584 FIXED View button on bottom bar is hidden when launching
 Basic Viewer with Voice options added back in corrected order in which
 buttons are collapsed so that they collapse right to left

---
 indra/newview/skins/minimal/xui/en/panel_bottomtray.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index a250f95e4f..afd20187c6 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -129,7 +129,7 @@
          height="28"
          layout="topleft"
          min_width="17"
-         name="splitter_panel"
+         name="splitter_panel_1"
          user_resize="false"
          width="17">
 			<icon
@@ -149,7 +149,7 @@
 		  min_height="28"
 		  min_width="83"
 		  mouse_opaque="false"
-		  name="avatar_and_destinations_panel"
+		  name="destinations_panel"
 		  user_resize="false"
 		  width="103">
 			<bottomtray_button
@@ -180,7 +180,7 @@
 		  min_height="28"
 		  min_width="73"
 		  mouse_opaque="false"
-		  name="avatar_and_destinations_panel"
+		  name="avatar_panel"
 		  user_resize="false"
 		  width="103">
 			<bottomtray_button
@@ -208,7 +208,7 @@
 		  height="28"
 		  layout="topleft"
 		  min_width="17"
-		  name="splitter_panel"
+		  name="splitter_panel_2"
 		  user_resize="false"
 		  width="17">
 			<icon
-- 
cgit v1.2.3


From f0d095086ff5bf2c231bee06064a89a8b6ef4a9b Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 5 May 2011 19:09:06 -0700
Subject: EXP-501 FIX View button on bottom bar is hidden when launching Basic
 Viewer... ignore button reordering in basic mode use preferred button
 collapse order

---
 .../skins/minimal/xui/en/panel_bottomtray.xml      | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index 9c14edb306..237af61717 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -47,7 +47,7 @@
          mouse_opaque="false"
 		 name="chat_bar_layout_panel"
          user_resize="true"
-         width="308" >
+         width="312" >
 			<panel
 		   name="chat_bar"
 			  filename="panel_nearby_chat_bar.xml"
@@ -108,7 +108,7 @@
           name="speak_flyout_panel"
           top_delta="0"
           user_resize="false"
-          width="20">
+          width="26">
       <button
      follows="left|right"
      width="20"
@@ -151,7 +151,7 @@
              layout="topleft"
              get_more="false"
              view_all="false"
-             left="3"
+             left="0"
              name="Gesture"
              tool_tip="Make your avatar do things"
              top="5"
@@ -174,7 +174,7 @@
          mouse_opaque="false"
          name="cam_panel"
          user_resize="false"
-         width="83">
+         width="86">
 			<bottomtray_button
               can_drag="false"
              follows="left|right"
@@ -201,15 +201,15 @@
          follows="left|right"
          height="28"
          layout="topleft"
-         min_width="17"
+         min_width="8"
          name="splitter_panel_1"
          user_resize="false"
-         width="17">
+         width="8">
 			<icon
              follows="left|bottom"
              height="18"
              width="2"
-             left="6"
+             left="0"
              image_name="Button_Separator"
              name="separator"
              top="7"/>
@@ -224,7 +224,7 @@
 		  mouse_opaque="false"
 		  name="destinations_panel"
 		  user_resize="false"
-		  width="103">
+		  width="106">
 			<bottomtray_button
 			 can_drag="false"
 			follows="left|right"
@@ -255,7 +255,7 @@
 		  mouse_opaque="false"
 		  name="avatar_panel"
 		  user_resize="false"
-		  width="103">
+		  width="106">
 			<bottomtray_button
 			 can_drag="false"
 			follows="left|right"
@@ -281,15 +281,15 @@
 		  follows="left|right"
 		  height="28"
 		  layout="topleft"
-		  min_width="17"
+		  min_width="8"
 		  name="splitter_panel_2"
 		  user_resize="false"
-		  width="17">
+		  width="8">
 			<icon
              follows="left|bottom"
              height="18"
              width="2"
-             left="6"
+             left="0"
              image_name="Button_Separator"
              name="separator"
              top="7"/>
@@ -305,7 +305,7 @@
          name="people_panel"
          top_delta="0"
          user_resize="false"
-         width="105">
+         width="106">
 			<bottomtray_button
 			   can_drag="false"
 			  follows="left|right"
@@ -338,7 +338,7 @@
 		   name="profile_panel"
 		   top_delta="0"
 		   user_resize="false"
-		   width="105">
+		   width="106">
 			<bottomtray_button
 			   can_drag="false"
 			  follows="left|right"
@@ -371,7 +371,7 @@
 		   name="howto_panel"
 		   top_delta="0"
 		   user_resize="false"
-		   width="105">
+		   width="106">
 			<bottomtray_button
 			   can_drag="false"
 			  follows="left|right"
-- 
cgit v1.2.3


From 604f92fa200a72e291a53f58957792d4b281168e Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 9 May 2011 17:10:26 -0700
Subject: EXP-801 FIX Linden Research Inc text is clipped on login page in
 Basic mode (Reverted change back to original behavior - needs attention
 later)

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index ac5bae2f3b..6e8ad9adaf 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -8,6 +8,13 @@
  tab_stop="false" 
  name="main_view"
  width="1024">
+              <panel top="0"
+               follows="all"
+               height="768"
+               mouse_opaque="false"
+               name="login_panel_holder"
+               width="1024"/>
+
   <layout_stack border_size="0"
                 follows="all"
                 mouse_opaque="false"
@@ -90,13 +97,6 @@
                      visible="false"
                      width="500"/>
               
-              <panel top="0"
-               follows="all"
-               height="500"
-               mouse_opaque="false"
-               name="login_panel_holder"
-               width="1024"/>
-
               <panel follows="all"
 										 height="500"
 										 left="0"
-- 
cgit v1.2.3