diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-06 17:39:32 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-06 17:39:32 -0400 |
| commit | bab80fed2f1404b5b13aed5ac87911f852be3bfb (patch) | |
| tree | 30d79609ef199fc8372c4ba67d3aa99490714838 | |
| parent | 5e5b140ed8a23bc6190ff3614948a62ef49311ad (diff) | |
| parent | 74c5c0a0d7761d0762bb0e7775259e0556fd392a (diff) | |
merge
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index c3a7d345f5..fdf1e4a89b 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -575,7 +575,9 @@ bool LLViewerObject::isReturnable() boxes.clear(); LLViewerRegion* pRegion = (*retCurrentIt).pRegion; boxes.push_back( (*retCurrentIt).box ); - bool retResult = (pRegion && pRegion->childrenObjectReturnable( boxes )) ? 1 : 0; + bool retResult = pRegion + && pRegion->childrenObjectReturnable( boxes ) + && pRegion->canManageEstate(); if ( retResult ) { result = true; |