Second Life viewer sources 1.21.0-RC

1 files changed, 40 insertions, 6 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index db176b3..7f2ce76 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -3,7 +3,7 @@
      can_resize="false" follows="left|top" height="550" 
      left="308" min_height="100" min_width="100" mouse_opaque="true"
      name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
-     width="272">
+     short_title="Build" width="272">
 
 <!-- Main floater tabs -->
 
@@ -278,7 +278,16 @@
                         Large
                 </combo_item>
         </combo_box>
-        <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
+        <volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"
+         initial_val="0.00" left="176" max_val="2.0" min_val="-1.0"
+             mouse_opaque="true" name="slider force" width="70" />      
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             left="126" mouse_opaque="true" name="Strength:" v_pad="0" width="128">
+                  Strength:
+        </text>    
+        <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
              height="16" label="Apply to selection" label_selected="Apply to selection"
              left="118" mouse_opaque="true" name="button apply to selection"
              scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
@@ -417,13 +426,13 @@
                              name="checkbox for sale" width="78" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="100"
-                             mouse_opaque="true" name="Price:  L$" v_pad="0" width="56">
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="90"
+                             mouse_opaque="true" name="Cost" v_pad="0" width="78">
                                 Price:  L$
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="56"
-                             max_length="25" mouse_opaque="true" name="EdCost" width="84" />
+                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
+                             max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />
                         <radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
                              left="42" mouse_opaque="true" name="sale type" width="218">
                                 <radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
@@ -537,6 +546,21 @@
                         <string name="text modify warning">
                                 Must select entire object to set permissions.
                         </string>
+                        <string name="Cost Default">
+                        Price:           L$
+                        </string>
+                        <string name="Cost Total">
+                        Total Price:  L$
+                        </string>
+                        <string name="Cost Per Unit">
+                        Price Per:     L$
+                        </string>
+                        <string name="Cost Mixed">
+                        Mixed Price
+                        </string>
+                        <string name="Sale Mixed">
+                        Mixed Sale
+                        </string>
                 </panel>
 
 <!-- Object sub-tab -->
@@ -843,6 +867,16 @@
                              label="Sculpt Texture" left="121" mouse_opaque="true"
                              name="sculpt texture control" tool_tip="Click to choose a picture"
                              visible="false" width="141" />
+            <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
+                 initial_value="false" label="Mirror" left="121" mouse_opaque="true"
+                 name="sculpt mirror control" visible="false"
+                 tool_tip="Flips sculpted prim along the X axis."
+                 width="121" />
+            <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+                 initial_value="false" label="Inside-out" left="121" mouse_opaque="true"
+                 name="sculpt invert control" visible="false"
+                 tool_tip="Inverts the sculpted prims normals, making it appear inside-out."
+                 width="121" />
                         <text align="left" bg_visible="false" border_drop_shadow_visible="false"
                              border_visible="false" bottom_delta="-20" drop_shadow_visible="true"
                              follows="left|top" font="SansSerifSmall" h_pad="0" height="10" left="121"