livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-16887 FIXED Crash in LLNetMap::draw

meow-7.2.2
Mnikolenko Productengine 2022-02-21 16:07:58 +02:00
parent 1461e4d437
commit 9f10853c03
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llnetmap.cpp
View File

@ -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);

7
indra/newview/lltracker.cpp
View File

@ -109,7 +109,12 @@ void LLTracker::stopTracking(bool clear_ui)
// static virtual
void LLTracker::drawHUDArrow()
{
if (!gSavedSettings.getBOOL("RenderTrackerBeacon")) return;
if (!LLWorld::instanceExists())
{
return;
}
if (!gSavedSettings.getBOOL("RenderTrackerBeacon")) return;
if (gViewerWindow->getProgressView()->getVisible()) return;