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 | |
| 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')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 9b56a5be35..b0aae89a85 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -6922,9 +6922,10 @@ LLViewerObject* LLObjectSelection::getFirstDeleteableObject() LLViewerObject* obj = node->getObject(); // you can delete an object if you are the owner // or you have permission to modify it. - if( obj && ( (obj->permModify()) || - (obj->permYouOwner()) || - (!obj->permAnyOwner()) )) // public + if( obj && !obj->isPermanentEnforced() && + ( (obj->permModify()) || + (obj->permYouOwner()) || + (!obj->permAnyOwner()) )) // public { if( !obj->isAttachment() ) { 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; } |