diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-12-21 18:21:05 +0200 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-12-21 18:21:05 +0200 |
| commit | 7ce37f9910016f7225621df9e70dd2fd7c41725d (patch) | |
| tree | db09b96def05e74d4b93de43d442618a70a52ef1 /indra/newview/llselectmgr.cpp | |
| parent | cbdf791fb1634c3c42c1e24da4b99dfdc3251f26 (diff) | |
| parent | 5099d01b74cfdd4ba192844b9fb7c5d19c454a54 (diff) | |
Merged lindenlab/viewer-lion into default
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rwxr-xr-x | indra/newview/llselectmgr.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 7620046ee3..4f63df1ea2 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1628,7 +1628,11 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid) f(LLViewerInventoryItem* item, const LLUUID& id) : mItem(item), mImageID(id) {} bool apply(LLViewerObject* objectp, S32 te) { - if (mItem) + if(objectp && !objectp->permModify()) + { + return false; + } + if (mItem) { if (te == -1) // all faces { |