diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-21 18:00:21 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-21 18:00:21 -0700 |
| commit | 22681ddb90b9fcb5eccb4467bb13704075de67d9 (patch) | |
| tree | bb5ea48aeaf386c313518ba9dabff1fa32d2c03a /indra/newview/llpanelvolume.cpp | |
| parent | b7aa6803a1f34de0cce9a88f9ecd9c7827c4bb52 (diff) | |
PATH-199: Disabling more functionality of the build tool floater when permanancy is enforced.
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index 12eea7844d..80dc2c0013 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -495,7 +495,7 @@ void LLPanelVolume::getState( ) mComboPhysicsShapeType->add(getString("Convex Hull"), LLSD(2)); mComboPhysicsShapeType->setValue(LLSD(objectp->getPhysicsShapeType())); - mComboPhysicsShapeType->setEnabled(editable); + mComboPhysicsShapeType->setEnabled(editable && !objectp->isPermanentEnforced()); mObject = objectp; mRootObject = root_objectp; |