livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Brad Payne (Vir Linden) 2011-07-06 17:39:32 -04:00
parent 5e5b140ed8 74c5c0a0d7
commit bab80fed2f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewerobject.cpp
View File

@ -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;