diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-07-13 15:26:02 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-07-13 15:26:02 -0700 |
| commit | 91281917137b15bec6b18af93f4efdcfadcc5cb9 (patch) | |
| tree | 9b710a289b1cec25f83334fe9b93daef3ac375ab /indra | |
| parent | 5cc36ff2285aeed2617e71c7cb7060c825dbd203 (diff) | |
Disabling the phantom toggle when the object is volume-detect.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 068ccf23b5..0bb430e62e 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -515,9 +515,10 @@ void LLPanelObject::getState( ) mCheckTemporary->setEnabled( roots_selected>0 && editable && !is_permanent); mIsPhantom = root_objectp->flagPhantom(); + BOOL is_volume_detect = root_objectp->flagVolumeDetect(); llassert(!is_character || !mIsPhantom); // should never have a character that is also a phantom mCheckPhantom->set( mIsPhantom ); - mCheckPhantom->setEnabled( roots_selected>0 && editable && !is_flexible && !is_permanent_enforced && !is_character); + mCheckPhantom->setEnabled( roots_selected>0 && editable && !is_flexible && !is_permanent_enforced && !is_character && !is_volume_detect); //---------------------------------------------------------------------------- |