summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-10 10:44:21 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-10 10:44:21 -0500
commite3ed1565f8c6eeff5d87f862465038aa98576fa9 (patch)
tree4ab57c1658d589d802f1e6bb6ff3331b75b61074 /indra/newview/llworld.cpp
parent952c3eaaa8c78d00ef62932d46af1d8fa565e7b2 (diff)
parent76cb9a7796ffce930458aae00147f8dafa4b33fb (diff)
Automated merge up from viewer-development into mesh-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 146bab0c0a..85871f21d6 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)) ;
}