Updated to SL source 1.21.2.

Conflicts:
	linden/indra/SConstruct
	linden/indra/newview/files.lst
	linden/indra/newview/llfloatertools.cpp
	linden/indra/newview/llfloatertools.h
	linden/indra/newview/lloverlaybar.cpp
	linden/indra/newview/lloverlaybar.h
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
	linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
	linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
	linden/indra/newview/viewer_manifest.py

1 files changed, 25 insertions, 1 deletions

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 9022c14..cc9d969 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -830,7 +830,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;
@@ -841,6 +841,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
@@ -854,6 +855,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;
@@ -867,6 +869,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;
@@ -894,8 +897,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;
         }
@@ -987,6 +1002,8 @@ void LLPanelObject::getState( )
 
         childSetVisible("advanced_cut", FALSE);
         childSetVisible("advanced_dimple", FALSE);
+        childSetVisible("advanced_slice", FALSE);
+
         if (advanced_cut_visible)
         {
                 if (advanced_is_dimple)
@@ -994,6 +1011,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);
@@ -1889,6 +1912,7 @@ void LLPanelObject::clearCtrls()
         childSetEnabled("scale_taper", FALSE);
         childSetEnabled( "advanced_cut", FALSE );
         childSetEnabled( "advanced_dimple", FALSE );
+        childSetVisible("advanced_slice", FALSE);
 }
 
 //