From 1872aa9d6b613fec824aebfbceff2e25469411e8 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Mon, 19 Oct 2020 01:00:58 +0200
Subject: [PATCH] And more avoidable getInstance calls...

---
 indra/newview/llstatusbar.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 011203494d..695e7a0e96 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -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)