diff options
author | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:09:50 -0500 |
commit | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (patch) | |
tree | 55de3117a3937e6258f586fd7a5a5ad294819920 /indra/newview/llworld.cpp | |
parent | 10cf492ef1730e869389b704345a6604ed363427 (diff) | |
parent | eacd9d5d590069b56ae3497a3830c5e299475a4a (diff) |
merge changes for storm-937
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)) ; } |