summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-06-17 17:41:04 +0300
committerAlexei Arabadji <aarabadji@productengine.com>2010-06-17 17:41:04 +0300
commit7aaca88e5b35c99a2c1bc61d9d386941199ab110 (patch)
tree3ff7a34df47f97cfb1ed515d97c30265ee3e32cf /indra
parentebf78baa42dd3cd641b9c676be896c603fe66df8 (diff)
EXT-4568 added assertion on receiving form server sim info with empty sim name.
--HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llworldmapmessage.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index 06040a574c..09c5b9b196 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -193,6 +193,9 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
U32 x_world = (U32)(x_regions) * REGION_WIDTH_UNITS;
U32 y_world = (U32)(y_regions) * REGION_WIDTH_UNITS;
+ // name shouldn't be empty, see EXT-4568
+ llassert(!name.empty());
+
// Insert that region in the world map, if failure, flag it as a "null_sim"
if (!(LLWorldMap::getInstance()->insertRegion(x_world, y_world, name, image_id, (U32)accesscode, region_flags)))
{