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

And more avoidable getInstance calls...

master
Ansariel 2020-10-19 01:00:58 +02:00
parent 34a3bc9f12
commit 1872aa9d6b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llstatusbar.cpp
View File

@ -588,6 +588,7 @@ void LLStatusBar::refresh()
}
// <FS:Zi> Pathfinding rebake functions
LLMenuOptionPathfindingRebakeNavmesh& navmesh = LLMenuOptionPathfindingRebakeNavmesh::instance();
static LLMenuOptionPathfindingRebakeNavmesh::ERebakeNavMeshMode pathfinding_mode = LLMenuOptionPathfindingRebakeNavmesh::kRebakeNavMesh_Default;
LLViewerRegion* current_region = gAgent.getRegion();
@ -597,7 +598,7 @@ void LLStatusBar::refresh()
bakingStarted = false;
mRebakeStuck = false;
}
if (LLMenuOptionPathfindingRebakeNavmesh::getInstance()->isRebaking())
if (navmesh.isRebaking())
{
if (!bakingStarted)
{
@ -615,9 +616,9 @@ void LLStatusBar::refresh()
updateParcelIcons();
}
}
else if (pathfinding_mode != LLMenuOptionPathfindingRebakeNavmesh::getInstance()->getMode())
else if (pathfinding_mode != navmesh.getMode())
{
pathfinding_mode = LLMenuOptionPathfindingRebakeNavmesh::getInstance()->getMode();
pathfinding_mode = navmesh.getMode();
updateParcelIcons();
}
// </FS:Zi>
@ -1382,9 +1383,10 @@ void LLStatusBar::updateParcelIcons()
bool is_for_sale = (!current_parcel->isPublic() && vpm->canAgentBuyParcel(current_parcel, false));
bool pathfinding_dynamic_enabled = agent_region->dynamicPathfindingEnabled();
bool pathfinding_navmesh_dirty = LLMenuOptionPathfindingRebakeNavmesh::getInstance()->isRebakeNeeded();
LLMenuOptionPathfindingRebakeNavmesh& navmesh = LLMenuOptionPathfindingRebakeNavmesh::instance();
bool pathfinding_navmesh_dirty = navmesh.isRebakeNeeded();
F32 pathfinding_dirty_icon_alpha = 1.0f;
if (LLMenuOptionPathfindingRebakeNavmesh::getInstance()->isRebaking())
if (navmesh.isRebaking())
{
// Stop the blinking after a while
if (mRebakeStuck)