diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-12-11 17:41:41 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-12-11 17:41:41 +0200 |
| commit | aa42870d5ad1edc9ea33c62c5bf66e84375c3b0e (patch) | |
| tree | 5bbd74f0b89fed271fc9ca8eb01ddd5954a26f94 /indra/newview/llselectmgr.cpp | |
| parent | dca797c3db34d119ccdc2d6f24c7742df75ff9c6 (diff) | |
| parent | a53caef1e8314f9cf2af3c0081bf57d5f20db560 (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 { |