diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-23 17:47:40 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-23 17:47:40 -0700 |
| commit | f0dafcfc7ce0c7c310ccb076b42572e0479754e2 (patch) | |
| tree | 952b0d1990d8b46016355c6ceed80755cae3cba8 /indra/newview/llviewermenu.cpp | |
| parent | b76f036bf6af7ae3e1b8ffb2edeee21911256820 (diff) | |
PATH-199: Disabling the Take and Delete right-click context menu options when object is enforced permanent.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 227f08e26c..b595c03256 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4499,9 +4499,10 @@ BOOL enable_take() return TRUE; } # endif - if((node->mPermissions->allowTransferTo(gAgent.getID()) + if(!object->isPermanentEnforced() && + ((node->mPermissions->allowTransferTo(gAgent.getID()) && object->permModify()) - || (node->mPermissions->getOwner() == gAgent.getID())) + || (node->mPermissions->getOwner() == gAgent.getID()))) { return TRUE; } |