summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-07-12 14:12:58 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-07-12 14:12:58 -0700
commit90fdf60d697f5c1e451a41eff0c6856e36cf1b64 (patch)
tree5a371aacf333e1a6546913af4d5c712acd160a92 /indra/newview/llselectmgr.cpp
parenta34c1e9a0c3f4cc675fd5edd59da35309b91aae8 (diff)
PATH-807: Adding an additional check for if the object is marked as volume-detect. Note that this will require Andrew's corresponding server-side change to take effect. However, the viewer change alone should have no neative effect prior to the server being updated.
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r--indra/newview/llselectmgr.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index b9449e806f..a5d9db4a00 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -2804,6 +2804,7 @@ BOOL LLSelectMgr::selectGetEditableLinksets()
if (object->flagUsePhysics() ||
object->flagTemporaryOnRez() ||
object->flagCharacter() ||
+ object->flagVolumeDetect() ||
object->flagAnimSource() ||
(!gAgent.isGodlike() &&
!gAgent.canManageEstate() &&