diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 309d7513c6e3adc0f19fc95ce74706b3c32278d9..1de9fd65257537a91df04b01587aa8d3fdd24b3c 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -98,6 +98,7 @@ class LLPathfindingManager : public LLSingleton<LLPathfindingManager>
 	void handleNavMeshRebakeError( U32 pStatus, const std::string &pReason, const std::string &pURL );
 	void triggerNavMeshRebuild();
 	void onRegionBoundaryCrossed();
+	void requestGetAgentState();
 
 protected:
 
@@ -129,16 +130,13 @@ class LLPathfindingManager : public LLSingleton<LLPathfindingManager>
 	
 	void displayNavMeshRebakePanel();
 	void hideNavMeshRebakePanel();	
-
-
-	void requestGetAgentState();
-	void handleAgentStateResult(const LLSD &pContent );//, EAgentState pRequestedAgentState);
+	void handleAgentStateResult(const LLSD &pContent );
 	void handleAgentStateError(U32 pStatus, const std::string &pReason, const std::string &pURL);
 
 
 	NavMeshMap mNavMeshMap;
 
-
+	//prep#stinson# set this flag instead of directly showing/hiding the rebake panel
 	BOOL mShowNavMeshRebake;
 };
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6bee373181443a5359405d647dcfbc2e2cb575d4..fd6f6e14d3735eff59cba442ffdd91bc459edaea 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2169,6 +2169,8 @@ bool idle_startup()
 		LLIMFloater::initIMFloater();
 		display_startup();
 
+		LLPathfindingManager::getInstance()->requestGetAgentState();
+
 		return TRUE;
 	}