Merge latest from lindenlab/viewer-development/

22 files changed, 270 insertions, 188 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 9f6eac198b..49ca6cc8ba 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -247,10 +247,10 @@ Re-enter amount to see the latest exchange rate.
      follows="top|left"
      layout="topleft"
      halign="right"
-     top="213"
+     top="208"
      left="10"
      width="310"
-     height="30"
+     height="35"
      name="purchase_warning_repurchase">
         Confirming this purchase only buys L$, not the object.
     </text>
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index d5d4565ca1..ab81a86720 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -204,7 +204,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="region_name_text"
      top_delta="0"
      use_ellipses="true"
@@ -237,7 +237,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="region_type_text"
      top_delta="0"
      width="175">
@@ -262,7 +262,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="14"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="estate_name_text"
      top_delta="0"
      width="175">
@@ -276,8 +276,8 @@ supports [AMOUNT2] objects
      layout="topleft"
      left="440"
      name="estate_owner_label"
-     right="550"
-     width="100"
+     right="565"
+     width="120"
      word_wrap="true">
         Estate Owner:
     </text>
@@ -287,7 +287,7 @@ supports [AMOUNT2] objects
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="110"
+     left_delta="125"
      name="estate_owner_text"
      top_delta="0"
      width="175">
diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index a97c697b24..05f4c52b95 100644
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -80,7 +80,7 @@
      left_pad="10"
      name="antialiasing restart"
      top_delta="0"
-     width="188">
+     width="230">
       (requires viewer restart)
     </text>
     <spinner
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index d08c3e7078..dce55dae12 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -26,7 +26,7 @@
   <text left="15" bottom="25" follows="top|left" height="15" name="name_label">
     Name:
   </text>
-  <line_editor bottom_delta="20" follows="top|left|right" height="19" 
+  <line_editor bottom_delta="20" follows="top|left|right" height="19" max_length_bytes="64" 
 	     name="description_form" prevalidate_callback="ascii" width="290" />
   
   <text bottom_delta="20" left="15" follows="left|top" height="15" name="lod_label">
@@ -219,7 +219,7 @@
       <text left="10" top_pad="35" follows="top|left" width="240" height="15">
         Generate Normals
       </text>
-      <text left="35" top_pad="5" follows="top|left" width="100" height="15">
+      <text left="35" top_pad="5" follows="top|left" width="100" height="15" name="crease_label">
         Crease Angle:
       </text>
       <spinner follows="top|left" left_pad="5" min_val="0" max_val="180" value="75" width="60" height="20" name="crease_angle"/>  
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 92d57b20be..47b2e5fd79 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -572,9 +572,9 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
 		 background_opaque="true">
-      <text top="25" left="30" text_color="White" font="SansSerifSmallBold" width="300" height="4">Performance</text>
+      <text top="15" left="20" text_color="White" font="SansSerifSmallBold" width="110" height="30" wrap="true" halign="center">Higher Performance</text>
       <text top="45" left="10" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">Faster rendering but less detailed; lowers Resource (prim) cost.</text>
-      <text top="25" left="390" text_color="White" font="SansSerifSmallBold" width="300" height="4">Accuracy</text>
+      <text top="15" left="372" text_color="White" font="SansSerifSmallBold" width="90" height="30" wrap="true" halign="center">Higher Accuracy</text>
       <text top="45" left="360" halign="center" width="130" word_wrap="true"   font="SansSerifSmall" height="80">More detailed model but slower; increases Resource (prim) cost.</text>
 
       <slider
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 619669d28a..38b305db7e 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -41,14 +41,14 @@
      follows="top|left"
      left="16"
      name="info_parcel_label"
-     width="48">
+     width="70">
         Parcel:
     </text>
     <text
      top_delta="0"
      follows="top|left"
      height="16"
-     left="56"
+     left="78"
      name="info_parcel"
      right="-20">
         PARCEL NAME
@@ -57,14 +57,14 @@
      follows="top|left"
      left="16"
      name="info_size_label"
-     width="48">
+     width="70">
         Size:
     </text>
     <text
      follows="top|left"
      top_delta="0"
      height="32"
-     left="56"
+     left="78"
      name="info_size"
      right="-20">
         [AREA] m²
@@ -164,14 +164,14 @@
      left_delta="0"
      name="sell_to_agent"
      top_pad="4"
-     width="170" />
+     width="150" />
     <button
      height="20"
      label="Select"
      left_pad="5"
      name="sell_to_select_agent"
      top_delta="0"
-     width="60" />
+     width="90" />
     <text
      follows="top|left"
      font="SansSerif"
@@ -199,20 +199,20 @@
         <radio_item
          bottom="40"
          height="0"
-         left="10"
+         left="2"
          name="none"
          visible="false" />
         <radio_item
          top_pad="10"
-         height="16"
+         height="18"
          label="No, keep ownership of objects"
-         left="10"
+         left="2"
          name="no" />
         <radio_item
          top_pad="10"
          height="16"
          label="Yes, sell objects with land"
-         left="10"
+         left="2"
          name="yes" />
     </radio_group>
     <button
@@ -221,7 +221,7 @@
      name="show_objects"
      left="70"
      top_pad="10"
-     width="110" />
+     width="140" />
     <text
      bottom_delta="30"
      follows="top|left"
@@ -229,7 +229,7 @@
      height="16"
      left="16"
      name="nag_message_label"
-     right="-20">
+     right="-5">
         REMEMBER: All sales are final.
     </text>
     <button
@@ -239,15 +239,15 @@
      left_delta="0"
      name="sell_btn"
      top_pad="10"
-     width="130" />
+     width="185" />
     <button
      follows="bottom|left"
      height="20"
      label="Cancel"
-     left_pad="30"
+     left_pad="5"
      name="cancel_btn"
      top_delta="0"
-     width="90" />
+     width="85" />
     </panel>
     </scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index e413228ddc..ec190ab656 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -100,7 +100,7 @@
      right="-5"
      name="upload_btn"
      top_delta="0"
-     width="100" />
+     width="110" />
     <flyout_button
      follows="left|top"
      height="23"
@@ -147,7 +147,7 @@
      right="-5"
      left_pad="5"
      name="discard_btn"
-     width="100" />
+     width="110" />
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 05d47506db..40bf7bfed7 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1608,41 +1608,6 @@ even though the user gets a free copy.
                  name="Sculpted"
                  value="Sculpted" />
             </combo_box>
-            <combo_box
-             height="19"
-             layout="topleft"
-             name="material"
-             top_pad="5"
-             width="150">
-                <combo_box.item
-                 label="Stone"
-                 name="Stone"
-                 value="Stone" />
-                <combo_box.item
-                 label="Metal"
-                 name="Metal"
-                 value="Metal" />
-                <combo_box.item
-                 label="Glass"
-                 name="Glass"
-                 value="Glass" />
-                <combo_box.item
-                 label="Wood"
-                 name="Wood"
-                 value="Wood" />
-                <combo_box.item
-                 label="Flesh"
-                 name="Flesh"
-                 value="Flesh" />
-                <combo_box.item
-                 label="Plastic"
-                 name="Plastic"
-                 value="Plastic" />
-                <combo_box.item
-                 label="Rubber"
-                 name="Rubber"
-                 value="Rubber" />
-            </combo_box>
             <text
              type="string"
              length="1"
@@ -2426,6 +2391,41 @@ even though the user gets a free copy.
 			   name="Physics Shape Type Combo Ctrl"
 			   tool_tip="Choose the physics shape type"
 			   width="108"/>
+            <combo_box
+             height="19"
+             layout="topleft"
+             name="material"
+             top_pad="5"
+             width="150">
+                <combo_box.item
+                 label="Stone"
+                 name="Stone"
+                 value="Stone" />
+                <combo_box.item
+                 label="Metal"
+                 name="Metal"
+                 value="Metal" />
+                <combo_box.item
+                 label="Glass"
+                 name="Glass"
+                 value="Glass" />
+                <combo_box.item
+                 label="Wood"
+                 name="Wood"
+                 value="Wood" />
+                <combo_box.item
+                 label="Flesh"
+                 name="Flesh"
+                 value="Flesh" />
+                <combo_box.item
+                 label="Plastic"
+                 name="Plastic"
+                 value="Plastic" />
+                <combo_box.item
+                 label="Rubber"
+                 name="Rubber"
+                 value="Rubber" />
+            </combo_box>
 
             <spinner
              follows="left|top"
@@ -2441,16 +2441,6 @@ even though the user gets a free copy.
              top_pad="10"
              width="132" />
 
-            <check_box
-             height="19"
-             label="Override material"
-             layout="topleft"
-             left_delta="0"
-             name="Physics Material Override"
-             tool_tip="Override Material"
-             top_pad="10"
-             width="132" />
-
             <spinner
              follows="left|top"
              height="19"
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index b06c6dc215..4dfdcd15c7 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -105,7 +105,7 @@
      left_delta="0"
      name="id_text"
      top_pad="10"
-     width="100">
+     width="107">
         Object ID:
     </text>
     <line_editor
@@ -116,7 +116,7 @@
      left_pad="3"
      name="id_editor"
      top_delta="-3"
-     width="575" />
+     width="568" />
     <button
      follows="bottom|right"
      height="23"
@@ -138,7 +138,7 @@
      left="10"
      top_pad="5"
      name="obj_name_text"
-     width="100">
+     width="107">
         Object name:
     </text>
     <line_editor
@@ -148,7 +148,7 @@
      left_pad="3"
      name="object_name_editor"
      top_delta="-3"
-     width="575" />
+     width="568" />
     <button
      follows="bottom|right"
      height="23"
@@ -170,7 +170,7 @@
      left="10"
      top_pad="5"
      name="owner_name_text"
-     width="100">
+     width="107">
         Owner:
     </text>
     <line_editor
@@ -180,7 +180,7 @@
      left_pad="3"
      name="owner_name_editor"
      top_delta="-3"
-     width="575" />
+     width="568" />
     <button
      follows="bottom|right"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 249ad95c41..7923dd87fa 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -22,13 +22,13 @@
      left="10"
      name="KeyFramePresetsText"
      top="34"
-     width="85">
+     width="135">
         Sky Presets:
     </text>
     <combo_box
      height="23"
      layout="topleft"
-     left_delta="85"
+     left_delta="135"
      name="WLPresetsCombo"
      top_delta="-4"
      width="150" />
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
index c8a06fe401..51779e4bfd 100644
--- a/indra/newview/skins/default/xui/en/language_settings.xml
+++ b/indra/newview/skins/default/xui/en/language_settings.xml
@@ -4,6 +4,7 @@
 
 	<!-- Locale Information -->
 	<string name="MicrosoftLocale">english</string>
+	<string name="MacLocale">C</string>
 	<string name="DarwinLocale">C</string>
 	<string name="LinuxLocale">C</string>
   
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 484af63097..b36b82ebd8 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -42,7 +42,7 @@
                     <menu_item_call.on_enable
                      function="File.EnableUpload" />
                 </menu_item_call>
-		            <menu_item_call
+		<menu_item_call
                  label="Model..."
                  layout="topleft"
                  name="Upload Model">
@@ -54,6 +54,18 @@
                 <menu_item_call.on_visible
                 function="File.VisibleUploadModel"/>
                 </menu_item_call>
+              <menu_item_call
+                label="Model Wizard..."
+                layout="topleft"
+                name="Upload Model Wizard">
+                <menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="upload_model_wizard" />
+                <menu_item_call.on_enable
+                 function="File.EnableUploadModel" />
+                <menu_item_call.on_visible
+                function="File.VisibleUploadModel"/>
+	      </menu_item_call>
                 <menu_item_call
                  label="Bulk (L$[COST] per file)..."
                  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 0d4a095e14..4c4ff3e5c4 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -183,11 +183,11 @@
            parameter="http://join.secondlife.com/"/>
         </menu_item_call>
       <menu_item_call
-       label="Web Content Floater Test"
-       name="Web Content Floater Test">
+       label="Web Content Floater Debug Test"
+       name="Web Content Floater Debug Test">
         <menu_item_call.on_click
          function="Advanced.WebContentTest"
-         parameter="http://www.google.com"/>
+         parameter="http://google.com"/>
       </menu_item_call>
       <menu_item_check
         label="Show Grid Picker"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5bfd4f398b..c86251bf28 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4763,6 +4763,18 @@ Are you sure you want to delete your travel, web, and search history?
      notext="Cancel"
      yestext="OK"/>
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmClearCache"
+   type="alertmodal">
+Are you sure you want to clear your viewer cache?
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
@@ -5227,6 +5239,20 @@ Insufficient permissions to rez object.
 
   <notification
    icon="notifytip.tga"
+   name="IMAcrossParentEstates"
+   type="notifytip">
+Unable to send IM across parent estates.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="TransferInventoryAcrossParentEstates"
+   type="notifytip">
+Unable to transfer inventory across parent estates.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
    name="UnableToLoadNotecard"
    type="notifytip">
 Unable to load notecard.
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 600b0e3b71..607e1bb213 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -84,7 +84,7 @@ Maximum 200 per group daily
        name="create_new_notice"
        tool_tip="Create a new notice"
        top_delta="0"
-       width="93" />
+       width="127" />
      <button
      follows="top|left"
      height="23"
@@ -128,7 +128,7 @@ Maximum 200 per group daily
          layout="topleft"
          name="lbl3"
          top_pad="10"
-         width="60">
+         width="62">
             Subject:
         </text>
         <line_editor
@@ -141,7 +141,7 @@ Maximum 200 per group daily
          max_length_bytes="63"
          name="create_subject"
          prevalidate_callback="ascii"
-         width="220" />
+         width="218" />
         <text
          follows="left|top"
          type="string"
@@ -151,7 +151,7 @@ Maximum 200 per group daily
          left="10"
          name="lbl4"
          top_pad="5"
-         width="60">
+         width="62">
             Message:
         </text>
         <text_editor
@@ -162,7 +162,7 @@ Maximum 200 per group daily
          max_length="511"
          name="create_message"
          top_delta="0"
-         width="220"
+         width="218"
          word_wrap="true" />
         <text
          follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 38e8b9844f..cdf14572fe 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -196,7 +196,7 @@
    initial_val="256" 
    label="" 
    label_width="0"
-   left_delta="40" 
+   left_delta="68" 
    max_val="2048" 
    min_val="0" 
    mouse_opaque="true"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 37aab059a9..2cc9d9c1b0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -20,8 +20,112 @@
    height="12"
    layout="topleft"
    left="33"
+   name="Cache:"
+   top_pad="10"
+   width="100">
+    Cache:
+  </text>
+  <spinner
+   control_name="CacheSize"
+   decimal_digits="0"
+   follows="left|top"
+   height="23"
+   increment="64"
+   initial_value="1024"
+   label="Cache size (64 - 9984MB)"
+   label_width="150"
+   layout="topleft"
+   left="80"
+   max_val="9984"
+   min_val="64"
+   top_pad="10"
+   name="cachesizespinner"
+   width="200" />
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="23"
+   layout="topleft"
+   left_pad="5"
+   mouse_opaque="false"
+   name="text_box5"
+   width="20">
+    MB
+  </text>
+  <button
+   follows="left|top"
+   height="23"
+   label="Clear Cache"
+   label_selected="Clear Cache"
+   layout="topleft"
+   left_pad="30"
+   name="clear_cache"
+   top_delta="0"
+   width="100">
+  <button.commit_callback
+   function="Pref.ClearCache" />
+  </button>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="10"
+   layout="topleft"
+   left="80"
+   name="Cache location"
+   top_pad="5"
+   width="300">
+    Cache location:
+  </text>
+  <line_editor
+   control_name="CacheLocationTopFolder"
+   border_style="line"
+   border_thickness="1"
+   follows="left|top"
+   font="SansSerif"
+   height="23"
+   layout="topleft"
+   left="80"
+   max_length="4096"
+   name="cache_location"
+   top_pad="5"
+   width="205" />
+  <button
+   follows="left|top"
+   height="23"
+   label="Browse"
+   label_selected="Browse"
+   layout="topleft"
+   left_pad="5"
+   name="set_cache"
+   top_delta="0"
+   width="100">
+  <button.commit_callback
+   function="Pref.SetCache" />
+  </button>
+  <button
+    follows="left|top"
+    height="23"
+    label="Default Location"
+    label_selected="Default Location"
+    layout="topleft"
+    left_pad="3"
+    name="default_cache_location"
+    top_delta="0"
+    width="100">
+    <button.commit_callback
+     function="Pref.ResetCache" />
+  </button>
+   <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="12"
+   layout="topleft"
+   left="33"
    name="UI Size:"
-   top_pad="25"
+   top_pad="20"
    width="100">
     UI size:
   </text>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 7717872a6a..2b22f0d6e3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -208,6 +208,37 @@
   </text>
   <color_swatch
    can_apply_immediately="true"
+   color="LtOrange"
+   follows="left|top"
+   height="24"
+   label_height="0"
+   layout="topleft"
+   left="360"
+   name="direct"
+   top_pad="-15"
+   width="44" >
+    <color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="DirectChatColor" />
+    <color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="DirectChatColor" />
+  </color_swatch>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="10"
+   layout="topleft"
+   left_pad="5"
+   mouse_opaque="false"
+   name="text_box10"
+   top_delta="5"
+   width="95">
+    Direct
+  </text>
+  <color_swatch
+   can_apply_immediately="true"
    color="LtYellow"
    follows="left|top"
    height="24"
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 cefd1a5516..f7666bdc4c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -723,7 +723,7 @@
        follows="left|top"
        height="12"
        layout="topleft"
-       left="388"
+       left="407"
        left_pad="-30"
        name="TerrainDetailText"
         top="250"
@@ -735,7 +735,7 @@
        draw_border="false"
        height="38"
        layout="topleft"
-       left_delta="10"
+       left_delta="5"
        name="TerrainDetailRadio"
        top_pad="5"
        width="70">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 901a1257e0..1c22a5c02e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -93,98 +93,6 @@
    name="connection_port"
    top_delta="3"
    width="170" />
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left="80"
-   mouse_opaque="false"
-   name="cache_size_label_l"
-   top_pad="20"
-   width="200">
-    Cache size
-  </text>
-  <slider
-   can_edit_text="true"
-   control_name="CacheSize"
-   decimal_digits="0"
-   follows="left|top"
-   height="15"
-   increment="16"
-   initial_value="512"
-   layout="topleft"
-   left_delta="150"
-   max_val="1024"
-   min_val="32"
-   name="cache_size"
-   top_delta="-2"
-   width="180" />
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left_pad="6"
-   mouse_opaque="false"
-   name="text_box5"
-   top_delta="1"
-   width="40">
-    MB
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left="80"
-   name="Cache location"
-   top_delta="20"
-   width="300">
-    Cache location:
-  </text>
-  <line_editor
-   control_name="CacheLocationTopFolder"
-   border_style="line"
-   border_thickness="1"
-   follows="left|top"
-   font="SansSerif"
-   height="23"
-   layout="topleft"
-   left="80"
-   max_length="4096"
-   name="cache_location"
-   top_pad="5"
-   width="205" />
-  <button
-   follows="left|top"
-   height="23"
-   label="Browse"
-   label_selected="Browse"
-   layout="topleft"
-   left_pad="5"
-   name="set_cache"
-   top_delta="-1"
-   width="100">
-    <button.commit_callback
-     function="Pref.SetCache" />
-  </button>
-  <button
-    follows="left|top"
-    height="23"
-    label="Reset"
-    label_selected="Reset"
-    layout="topleft"
-    left_pad="3"
-    name="reset_cache"
-    top_delta="0"
-    width="100">
-    <button.commit_callback
-     function="Pref.ResetCache" />
-  </button>
 
   <text
          type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index e0d9f3f714..3f9195d092 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -134,6 +134,7 @@
      top="190"
      width="80" />
 	<check_box
+     visible="FALSE"
      height="20"
      label="Allow Mesh Objects"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2fbd753a7d..38cb547982 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1908,6 +1908,15 @@ Requests single-word username of an avatar.  When data is available the dataserv
 key llRequestDisplayName(key id)
 Requests name of an avatar.  When data is available the dataserver event will be raised.
 </string>
+<string name="LSLTipText_llRegionSayTo" translate="false">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
+</string>
+<string name="LSLTipText_llGetEnv" translate="false">
+llGetEnv(string name)
+Returns a string with the requested data about the region
+</string>
+
 
   <!-- Avatar busy/away mode -->
 	<string name="AvatarSetNotAway">Not Away</string>