Merge branch 'build-tools' into next-merge

2 files changed, 37 insertions, 7 deletions

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 7024691..9732dac 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -827,7 +827,7 @@ void LLPanelObject::getState( )
         BOOL top_shear_x_visible                = TRUE;
         BOOL top_shear_y_visible                = TRUE;
         BOOL twist_visible                              = TRUE;
-        BOOL advanced_cut_visible               = FALSE;
+        BOOL advanced_cut_visible               = TRUE;
         BOOL taper_visible                              = FALSE;
         BOOL skew_visible                               = FALSE;
         BOOL radius_offset_visible              = FALSE;
@@ -838,6 +838,7 @@ void LLPanelObject::getState( )
         F32      twist_inc                                      = OBJECT_TWIST_LINEAR_INC;
 
         BOOL advanced_is_dimple = FALSE;
+        BOOL advanced_is_slice = FALSE;
         BOOL size_is_hole = FALSE;
 
         // Tune based on overall volume type
@@ -851,6 +852,7 @@ void LLPanelObject::getState( )
                 //twist_visible                 = FALSE;
                 advanced_cut_visible    = TRUE;
                 advanced_is_dimple              = TRUE;
+                advanced_is_slice               = FALSE;
                 twist_min                               = OBJECT_TWIST_MIN;
                 twist_max                               = OBJECT_TWIST_MAX;
                 twist_inc                               = OBJECT_TWIST_INC;
@@ -864,6 +866,7 @@ void LLPanelObject::getState( )
                 size_is_hole                    = TRUE;
                 skew_visible                    = TRUE;
                 advanced_cut_visible    = TRUE;
+                advanced_is_slice               = FALSE;
                 taper_visible                   = TRUE;
                 radius_offset_visible   = TRUE;
                 revolutions_visible             = TRUE;
@@ -891,8 +894,20 @@ void LLPanelObject::getState( )
                 break;
                 
         case MI_BOX:
+                advanced_cut_visible    = TRUE;
+                advanced_is_slice               = TRUE;
+                break;
+
         case MI_CYLINDER:
+                advanced_cut_visible    = TRUE;
+                advanced_is_slice               = TRUE;
+                break;
+
         case MI_PRISM:
+                advanced_cut_visible    = TRUE;
+                advanced_is_slice               = TRUE;
+                break;
+
         default:
                 break;
         }
@@ -984,6 +999,8 @@ void LLPanelObject::getState( )
 
         childSetVisible("advanced_cut", FALSE);
         childSetVisible("advanced_dimple", FALSE);
+        childSetVisible("advanced_slice", FALSE);
+
         if (advanced_cut_visible)
         {
                 if (advanced_is_dimple)
@@ -991,6 +1008,12 @@ void LLPanelObject::getState( )
                         childSetVisible("advanced_dimple", TRUE);
                         childSetEnabled("advanced_dimple", enabled);
                 }
+
+                else if (advanced_is_slice)
+                {
+                        childSetVisible("advanced_slice", TRUE);
+                        childSetEnabled("advanced_slice", enabled);
+                }
                 else
                 {
                         childSetVisible("advanced_cut", TRUE);
@@ -1823,6 +1846,7 @@ void LLPanelObject::clearCtrls()
         childSetEnabled("scale_taper", FALSE);
         childSetEnabled( "advanced_cut", FALSE );
         childSetEnabled( "advanced_dimple", FALSE );
+        childSetVisible("advanced_slice", FALSE);
 }
 
 //
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..c98c2ac 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
@@ -77,7 +77,7 @@
              initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
              mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
+             initial_value="false" label="Select Faces to Texture" left="4" mouse_opaque="true"
              name="radio select face" radio_style="true" width="114" />
         <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
@@ -698,10 +698,10 @@
                                 Path Cut Begin and End
                         </text>
                         <spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"
+                             increment="0.025" initial_val="0" label="B" label_width="10" left="121"
                              max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />
                         <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
+                             increment="0.025" initial_val="1" label="E" label_width="10" left_delta="73"
                              max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
@@ -800,12 +800,18 @@
                              mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">
                                 Dimple Begin and End
                         </text>
+                        <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="10" left_delta="0"
+                             mouse_opaque="true" name="advanced_slice" v_pad="0" width="141">
+                                Slice Begin and End
+                        </text>
                         <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"
+                             increment="0.025" initial_val="0" label="B" label_width="10" left="121"
                              max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
                              width="68" />
                         <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
+                             increment="0.025" initial_val="1" label="E" label_width="10" left_delta="73"
                              max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
                              width="68" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -969,7 +975,7 @@
                                 Transparency %
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
-                             increment="2" initial_val="0" left="180" max_val="90" min_val="0"
+                             increment="2" initial_val="0" left="180" max_val="100" min_val="0"
                              mouse_opaque="true" name="ColorTrans" width="80" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-12" drop_shadow_visible="true" follows="left|top"