diff options
author | prep <none@none> | 2012-06-15 13:00:37 -0400 |
---|---|---|
committer | prep <none@none> | 2012-06-15 13:00:37 -0400 |
commit | 43c6d1a2477ade3102396b7dbdc921105adc008c (patch) | |
tree | bdce3d5e2ce006afee97f91c53f20b2dac719e7b /indra | |
parent | 3d0d6b8b184ddf2e0155abea95487508fcfafb4f (diff) |
path-722: At startup we request the agent status update.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llpathfindingmanager.h | 8 | ||||
-rw-r--r-- | indra/newview/llstartup.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h index 309d7513c6..1de9fd6525 100644 --- a/indra/newview/llpathfindingmanager.h +++ b/indra/newview/llpathfindingmanager.h @@ -98,6 +98,7 @@ public: void handleNavMeshRebakeError( U32 pStatus, const std::string &pReason, const std::string &pURL ); void triggerNavMeshRebuild(); void onRegionBoundaryCrossed(); + void requestGetAgentState(); protected: @@ -129,16 +130,13 @@ private: 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 6bee373181..fd6f6e14d3 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; } |