diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-02-22 15:00:53 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-02-22 15:00:53 -0600 |
| commit | ce534cf32e1df84b6b10435e9604b0cbde6abf95 (patch) | |
| tree | 0549c54b68cf82ce60a6ce8202ed094d054165e9 /indra/newview/llnetmap.cpp | |
| parent | 1c5c45f27317d6ee7c2c30de11f43aeee3855434 (diff) | |
| parent | 900c13d361671c35cd5899dc99bbfbc9c5ec2200 (diff) | |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 937f36b6fc..1240ce7c0f 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -147,6 +147,10 @@ void LLNetMap::setScale( F32 scale ) void LLNetMap::draw() { + if (!LLWorld::instanceExists()) + { + return; + } LL_PROFILE_ZONE_SCOPED; static LLFrameTimer map_timer; static LLUIColor map_avatar_color = LLUIColorTable::instance().getColor("MapAvatarColor", LLColor4::white); |