diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 15:33:15 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 15:33:15 -0700 |
| commit | 378ae8ce6588ce921b2aa960c08d4293c6b419e5 (patch) | |
| tree | 60430a40b06753c6aa4571cb7b2ee366e711a5f1 /indra/newview/llmaniptranslate.cpp | |
| parent | 629ec1d54d16549d42198a9ac83a33bb9b51ab22 (diff) | |
PATH-199: Enforcing permanent objects in frozen state to not move.
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
| -rw-r--r-- | indra/newview/llmaniptranslate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index 3a88fbd96d..e6ccfc0af5 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -687,7 +687,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask) } } - if (object->permMove()) + if (object->permMove() && !object->isPermanentEnforced()) { // handle attachments in local space if (object->isAttachment() && object->mDrawable.notNull()) @@ -2281,7 +2281,7 @@ BOOL LLManipTranslate::canAffectSelection() { virtual bool apply(LLViewerObject* objectp) { - return objectp->permMove() && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts")); + return objectp->permMove() && !objectp->isPermanentEnforced() && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts")); } } func; can_move = mObjectSelection->applyToObjects(&func); |