summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-17 14:56:33 -0500
committerOz Linden <oz@lindenlab.com>2011-02-17 14:56:33 -0500
commitc1901890576d3b9442846c8890b1724438eab46e (patch)
tree7d76da988c79d3b11fc2fc5e51d5f2c0248abaf0 /indra/newview/llworld.cpp
parent10cf492ef1730e869389b704345a6604ed363427 (diff)
parentfb94ad7646b5c8a2eaa65e41b0b8b1679652d956 (diff)
merge changes for storm-937
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)) ;
}