diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 11:24:33 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 11:24:33 -0700 |
| commit | b088449517c7070ba15b6e344dbc7a1145f64dac (patch) | |
| tree | 66562b72586081f59fa74e9baaedf560ff49ffd5 /indra/newview/llworldmapmessage.cpp | |
| parent | 4bf8a0c7fca329ce1d0c58bc3ebf86fbbe544d40 (diff) | |
| parent | bb95afc9e1246abfc3656b31b33d1e5ae1dc85f2 (diff) | |
Merge from ssh://hg.lindenlab.com/dessie/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))) { |