viewer2 merge.

7 files changed, 9 insertions, 12 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
index c3e974d978..984c4fcf1d 100644
--- a/indra/newview/skins/default/xui/en/floater_script.xml
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
@@ -12,7 +12,7 @@
  can_minimize="true"
  visible="true" 
  width="520"
- can_resize="true"
+ can_resize="false"
  min_width="350"
  min_height="369">
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 2c9402f6cb..1ab3dda52c 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -354,10 +354,6 @@
          label="Depth"
          name="Depth"
          value="depth" />
-        <combo_box.item
-         label="Object Mattes"
-         name="ObjectMattes"
-         value="objects" />
     </combo_box>
     <check_box
      label="Interface"
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index c605975c8e..1e2e74f882 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -75,6 +75,7 @@
      height="16"
      image_pressed="Info_Press"
      image_unselected="Info_Over"
+     layout="topleft"
      left_pad="3"
      right="-53"
      name="info_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index d8975aadeb..53ca0005a5 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -73,6 +73,11 @@
            name="talk"
            top="5"
           width="100">
+  <speak_button
+    name="speak_btn"
+    label="Speak"
+    label_selected="Speak"
+    />
               <show_button>
                   <show_button.init_callback
                    function="Button.SetDockableFloaterToggle"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 82821a1dfe..f20526b491 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -366,10 +366,7 @@
 		min_val="64"
 		name="DrawDistance"
 		top="3"
-		width="255">
-			<slider.commit_callback
-			function="Pref.UpdateMeterText" />
-		</slider>
+		width="255" />
 		<text
 		type="string"
 		length="1"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c62a36bca3..f610a258ff 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2128,6 +2128,7 @@ Clears (deletes) the media and all params from the given face.
   
   <!-- panel picks -->
   <string name="NoPicksClassifiedsText">You haven't created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.</string>
+  <string name="NoAvatarPicksClassifiedsText">User has no picks or classfields</string>
   <string name="PicksClassifiedsLoadingText">Loading...</string>
 
 	<!-- Multi Preview Floater -->
diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
index 68cf082c35..a7e271a1ff 100644
--- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
@@ -11,9 +11,6 @@
                  image_unselected="SegmentedBtn_Left_Off"
 		 image_pressed="SegmentedBtn_Left_Selected_Press"
 		 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
-    name="speak_btn"
-    label="Speak"
-    label_selected="Speak"
     tab_stop="false"
     />
   <show_button