From 74c5c0a0d7761d0762bb0e7775259e0556fd392a Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Wed, 6 Jul 2011 20:05:38 +0300
Subject: SH-1945 FIXED Added a check for Estate Managership when checking
 whether an object encroaching on the region can be returned.

---
 indra/newview/llviewerobject.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llviewerobject.cpp')

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;
-- 
cgit v1.2.3