diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-11 12:54:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-11 12:54:12 -0500 |
| commit | ee2aebfaf38ca12574b9835340ed8c55c6fbccf2 (patch) | |
| tree | a03a005363255f6c3a6219d629499534bd25a370 /indra/newview/llworld.cpp | |
| parent | 111e915a91ff5431d215312c8659518f5f149555 (diff) | |
| parent | 924be3f25c2fca57a8d6f5f902eaeca5c2dd91e1 (diff) | |
merge up to lastest upstream
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 399442e5c4..9db6d5e08c 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -281,6 +281,8 @@ void LLWorld::removeRegion(const LLHost &host) delete regionp; updateWaterObjects(); + + llassert_always(!gObjectList.hasMapObjectInRegion(regionp)) ; } |