diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-18 12:24:21 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-18 12:24:21 +0100 |
| commit | 333f60ef3cf1a5ac4ce7687faf8369e7d0a4b2de (patch) | |
| tree | edb2169b848d848d834fe6e418c397c10c89a5ff /indra/newview/llworldmapmessage.cpp | |
| parent | cb50a2395bc37f1f7833171a976f67af9f2df66d (diff) | |
| parent | 9aa710945685a2cae8cfc622f3dc3d900c1ab4c9 (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llworldmapmessage.cpp')
| -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))) { |