summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-02-19 00:17:12 +0000
committerDon Kjer <don@lindenlab.com>2011-02-19 00:17:12 +0000
commit8330a4d0fd046834a27a988102b439a6ec1f0aa2 (patch)
tree7fd2227522bf5c2377a45124cb50aad0afb90597 /indra/newview/llworld.cpp
parent3f5760b5ee4e422e11f3416133b7a4c3a73b1d8c (diff)
parent18bf5f09b22a2c36ccf543104b1115a7b0b9db71 (diff)
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
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 7f3a8deb47..d9ec41e73a 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -276,6 +276,8 @@ void LLWorld::removeRegion(const LLHost &host)
delete regionp;
updateWaterObjects();
+
+ llassert_always(!gObjectList.hasMapObjectInRegion(regionp)) ;
}