diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-07-06 20:05:38 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-07-06 20:05:38 +0300 |
| commit | 74c5c0a0d7761d0762bb0e7775259e0556fd392a (patch) | |
| tree | c336c9967b63a42c7c080726ab4135a249c838d2 /indra | |
| parent | 5f17754a39c94c90be98313d52efab18e3cfc789 (diff) | |
SH-1945 FIXED Added a check for Estate Managership when checking whether an object encroaching on the region can be returned.
Diffstat (limited to 'indra')
| -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; |