From 20995433c19823490653ddc1cb86ce167fcf6d1f Mon Sep 17 00:00:00 2001
From: Cinders <cinder@cinderblocks.biz>
Date: Mon, 1 Apr 2013 21:46:45 -0600
Subject: [PATCH] Don't show Pathfinding Disabled icons on OpenSim grids

---
 indra/newview/lllocationinputctrl.cpp | 20 ++++++++++++++++----
 indra/newview/llstatusbar.cpp         | 14 +++++++++++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 583b0afe3c..7bdfa71874 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -69,6 +69,11 @@
 
 #include "llmenuoptionpathfindingrebakenavmesh.h"	// <FS:Zi> Pathfinding rebake functions
 #include "llfloaterreg.h"
+// <FS:CR> Don't show pathfinding icons in OpenSim
+#ifdef OPENSIM
+#include "llviewernetwork.h"
+#endif // OPENSIM
+// </FS:CR>
 
 //============================================================================
 /*
@@ -437,9 +442,9 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	mInfoBtn->setToolTip(LLTrans::getString("LocationCtrlInfoBtnTooltip"));
 
 	// <FS:ND> Prevent querying LLTrans each frame
-	mTooltips.push_back( LLTrans::getString("LocationCtrlGeneralIconTooltip") );
-	mTooltips.push_back( LLTrans::getString("LocationCtrlAdultIconTooltip") );
-	mTooltips.push_back( LLTrans::getString("LocationCtrlModerateIconTooltip") );
+	mTooltips.push_back( LLTrans::getString("LocationCtrlGeneralIconTooltip") );
+	mTooltips.push_back( LLTrans::getString("LocationCtrlAdultIconTooltip") );
+	mTooltips.push_back( LLTrans::getString("LocationCtrlModerateIconTooltip") );
 	// </FS:ND>
 }
 
@@ -920,6 +925,12 @@ void LLLocationInputCtrl::refreshParcelIcons()
 		bool allow_damage	= vpm->allowAgentDamage(agent_region, current_parcel);
 		bool see_avs        = current_parcel->getSeeAVs();
 		bool pathfinding_dynamic_enabled = agent_region->dynamicPathfindingEnabled();
+// <FS:CR> Don't show pathfinding icons on OpenSim
+		bool is_opensim = false;
+#ifdef OPENSIM
+		is_opensim = LLGridManager::getInstance()->isInOpenSim();
+#endif // OPENSIM
+// </FS:CR>
 
 		// Most icons are "block this ability"
 		mParcelIcon[VOICE_ICON]->setVisible(   !allow_voice );
@@ -929,7 +940,8 @@ void LLLocationInputCtrl::refreshParcelIcons()
 		mParcelIcon[SCRIPTS_ICON]->setVisible( !allow_scripts );
 		mParcelIcon[DAMAGE_ICON]->setVisible(  allow_damage );
 		mParcelIcon[PATHFINDING_DIRTY_ICON]->setVisible(mIsNavMeshDirty);
-		mParcelIcon[PATHFINDING_DISABLED_ICON]->setVisible(!mIsNavMeshDirty && !pathfinding_dynamic_enabled);
+		mParcelIcon[PATHFINDING_DISABLED_ICON]->setVisible(!mIsNavMeshDirty && !pathfinding_dynamic_enabled //);
+														   && !is_opensim);// <FS:CR> Don't show pathfinding icons on OpenSim
 
 		mDamageText->setVisible(allow_damage);
 		mParcelIcon[SEE_AVATARS_ICON]->setVisible( !see_avs );
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 9cf139f2e5..d563dd9f17 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -104,6 +104,12 @@
 #include "llmenuoptionpathfindingrebakenavmesh.h"	// <FS:Zi> Pathfinding rebake functions
 #include "llvieweraudio.h"
 #include "fslightshare.h"	// <FS:CR> FIRE-5118 - Lightshare support
+// <FS:CR> Don't show pathfinding icons on OpenSim
+#ifdef OPENSIM
+#include "llviewernetwork.h"
+#endif // OPENSIM
+// </FS:CR>
+
 //
 // Globals
 //
@@ -1076,6 +1082,12 @@ void LLStatusBar::updateParcelIcons()
 			current_parcel = agent_parcel;
 		}
 
+		// <FS:CR> Don't show pathfinding icons on OpenSim
+		bool is_opensim = false;
+#ifdef OPENSIM
+		is_opensim = LLGridManager::getInstance()->isInOpenSim();
+#endif // OPENSIM
+		// </FS:CR>
 		// <FS:Zi> allow_voice is now declared outside the if() block
 		//	bool allow_voice	= vpm->allowAgentVoice(agent_region, current_parcel);
 		allow_voice	= vpm->allowAgentVoice(agent_region, current_parcel);
@@ -1124,7 +1136,7 @@ void LLStatusBar::updateParcelIcons()
 		// <FS:Ansariel> Pathfinding support
 		mParcelIcon[PATHFINDING_DIRTY_ICON]->setVisible(pathfinding_navmesh_dirty);
 		mParcelIcon[PATHFINDING_DIRTY_ICON]->setColor(LLColor4::white % pathfinding_dirty_icon_alpha);
-		mParcelIcon[PATHFINDING_DISABLED_ICON]->setVisible(!pathfinding_navmesh_dirty && !pathfinding_dynamic_enabled);
+		mParcelIcon[PATHFINDING_DISABLED_ICON]->setVisible(!pathfinding_navmesh_dirty && !pathfinding_dynamic_enabled && !is_opensim);
 		// </FS:Ansariel> Pathfinding support
 		mDamageText->setVisible(allow_damage);
 		mBuyParcelBtn->setVisible(is_for_sale);