diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-06-17 17:41:36 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-06-17 17:41:36 +0300 |
| commit | d03338ee61c4e6f60b7460a2ad4cead07977c1bd (patch) | |
| tree | 5e84b3b7c2aff58f9c55aa4f294d4aace4423c88 /indra/newview | |
| parent | 9745a0a9e4fab00da010793994c6d50e42635ebe (diff) | |
| parent | 7aaca88e5b35c99a2c1bc61d9d386941199ab110 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-release/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llworldmapmessage.cpp | 3 |
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))) { |