summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-17 18:52:15 -0500
committerOz Linden <oz@lindenlab.com>2011-02-17 18:52:15 -0500
commit65ca5968cd59663c3567287c14ce506e37c085c4 (patch)
treeb74325f43d5757fdab1ce607b4f6aff94529e7b3 /indra/newview/llworld.cpp
parent49e28d324066add8cca44e27806b8077d3b0c542 (diff)
parentcba34d7d4cdb0339113a4798965d595645d5cb49 (diff)
Automated merge with file:///Users/oz/Work/viewer-vs2010
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)) ;
}