2 files changed, 39 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml
index f377386679..a73db3af32 100644
--- a/indra/newview/skins/default/xui/en/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml
@@ -222,6 +222,14 @@
      top_pad="3"
      value="--"
      width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="selected_loading_indicator"
+     top_delta="0"
+     width="16" />
     <text
      follows="left|top"
      height="16"
@@ -241,6 +249,14 @@
      top_pad="3"
      value="--"
      width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="rezzed_on_land_loading_indicator"
+     top_delta="0"
+     width="16" />
     <text
      follows="left|top"
      height="16"
@@ -260,12 +276,20 @@
      top_pad="3"
      value="--"
      width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="remaining_capacity_loading_indicator"
+     top_delta="0"
+     width="16" />
     <text
      follows="left|top"
      height="16"
      layout="topleft"
      left_pad="10"
-     name="remaining_capacity"
+     name="remaining_capacity_label"
      top_delta="0"
      value="Remaining capacity"
      width="130" />
@@ -279,12 +303,20 @@
      top_pad="3"
      value="--"
      width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="total_capacity_loading_indicator"
+     top_delta="0"
+     width="16" />
     <text
      follows="left|top"
      height="16"
      layout="topleft"
      left_pad="10"
-     name="total_capacity"
+     name="total_capacity_label"
      top_delta="0"
      value="Total capacity"
      width="130" />
@@ -303,7 +335,7 @@
      height="16"
      layout="topleft"
      left="10"
-     name="total_capacity"
+     name="help_SLURL"
      top_pad="10"
      value="[secondlife:///www.secondlife.com What is all this?...]"
      width="180" />
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index e794a7067d..03d6c84266 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2000,25 +2000,21 @@ even though the user gets a free copy.
              visible="false"
              width="150">
                 <combo_box.item
-                 label="(none)"
-                 name="None"
-                 value="None" />
-                <combo_box.item
                  label="Sphere"
                  name="Sphere"
-                 value="Sphere" />
+                 value="1" />
                 <combo_box.item
                  label="Torus"
                  name="Torus"
-                 value="Torus" />
+                 value="2" />
                 <combo_box.item
                  label="Plane"
                  name="Plane"
-                 value="Plane" />
+                 value="3" />
                 <combo_box.item
                  label="Cylinder"
                  name="Cylinder"
-                 value="Cylinder" />
+                 value="4" />
               </combo_box>
         </panel>
         <panel