diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/llpanelvolume.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index 83a2a5e0bd..a9198cd6b4 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -232,6 +232,10 @@ void LLPanelVolume::getState( ) } else { + ((LLPanel *) getChildByName ("Light Intensity", true))->clear(); + ((LLPanel *) getChildByName ("Light Radius", true))->clear(); + ((LLPanel *) getChildByName ("Light Falloff", true))->clear(); + childSetEnabled("label color",false); LLColorSwatchCtrl* LightColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch"); if(LightColorSwatch) @@ -288,6 +292,15 @@ void LLPanelVolume::getState( ) } else { + ((LLPanel *) getChildByName ("FlexNumSections", true))->clear(); + ((LLPanel *) getChildByName ("FlexGravity", true))->clear(); + ((LLPanel *) getChildByName ("FlexTension", true))->clear(); + ((LLPanel *) getChildByName ("FlexFriction", true))->clear(); + ((LLPanel *) getChildByName ("FlexWind", true))->clear(); + ((LLPanel *) getChildByName ("FlexForceX", true))->clear(); + ((LLPanel *) getChildByName ("FlexForceY", true))->clear(); + ((LLPanel *) getChildByName ("FlexForceZ", true))->clear(); + childSetEnabled("FlexNumSections",false); childSetEnabled("FlexGravity",false); childSetEnabled("FlexTension",false); |