From 8048f6322d887f5aa636ea6a7890eec2186bbc9b Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 7 Sep 2008 18:00:32 -0500 Subject: VWR-7827: Allow Dimple/Profile Cut for boxes and box-based prims in the UI. --- ChangeLog.txt | 7 ++++++ linden/indra/newview/llpanelobject.cpp | 26 +++++++++++++++++++++- .../skins/default/xui/en-us/floater_tools.xml | 6 +++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index e69de29..dfd6354 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -0,0 +1,7 @@ +2008-09-07 McCabe Maxsted + + * linden/indra/newview/llpanelobject.cpp: + VWR-7827: Allow Dimple/Profile Cut for boxes and box-based prims + in the UI. + * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml: + Ditto. 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..27691c7 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 @@ -800,6 +800,12 @@ mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141"> Dimple Begin and End + + Slice Begin and End + + + * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml: + VWR-7877: Change the default cut increment from 0.05 to 0.025. + 2008-09-19 Jacek Antonelli * linden/indra/SConstruct: 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..b42101d 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 @@ -698,10 +698,10 @@ Path Cut Begin and End + + * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml: + Changed "Select Texture" to "Select Faces to Texture". + 2008-09-19 McCabe Maxsted * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml: 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 68ba5e7..1ecfc2f 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" /> * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml: + Increased maximum settable transparency from 90% to 100%. + + * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml: Changed "Select Texture" to "Select Faces to Texture". 2008-09-19 McCabe Maxsted 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 1ecfc2f..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 @@ -975,7 +975,7 @@ Transparency %