summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-02-24 17:42:16 -0800
committerDave SIMmONs <simon@lindenlab.com>2011-02-24 17:42:16 -0800
commit52ae219d502d182a7e6c000070e5935b923f30e7 (patch)
tree556151d5097feb5ae079786044188cb0d0400d16 /indra/newview/llworld.cpp
parent1c8c28a8de73228c06fdf2d84045433c7231cd19 (diff)
parent609c70eb5a48389bef1ad33358774764ee9615e2 (diff)
Merge again lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp2
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)) ;
}