diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-19 19:06:25 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-19 19:06:25 -0700 |
| commit | b98cbe00fe885cebebe1ec5fd123c969b5d2c29f (patch) | |
| tree | d8226c323c0e5af235e3447381d7fafed7beabf1 /indra/newview/llpathfindingmanager.h | |
| parent | 37f3a016fcc8b1cf92cdb4c546b1ab25546a527a (diff) | |
PATH-702: Refining the behavior of the rebuild navmesh button after it is pushed, and removing unused code.
Diffstat (limited to 'indra/newview/llpathfindingmanager.h')
| -rw-r--r-- | indra/newview/llpathfindingmanager.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h index 2457c18309..f77877af08 100644 --- a/indra/newview/llpathfindingmanager.h +++ b/indra/newview/llpathfindingmanager.h @@ -91,12 +91,11 @@ public: typedef boost::signals2::connection agent_state_slot_t; agent_state_slot_t registerAgentStateListener(agent_state_callback_t pAgentStateCallback); - - void handleNavMeshRebakeResult( const LLSD &pContent ); - void handleNavMeshRebakeError( U32 pStatus, const std::string &pReason, const std::string &pURL ); - void triggerNavMeshRebuild(); void requestGetAgentState(); + typedef boost::function<void (bool)> rebake_navmesh_callback_t; + void requestRebakeNavMesh(rebake_navmesh_callback_t pRebakeNavMeshCallback); + protected: private: @@ -114,6 +113,7 @@ private: LLPathfindingNavMeshPtr getNavMeshForRegion(const LLUUID &pRegionUUID); LLPathfindingNavMeshPtr getNavMeshForRegion(LLViewerRegion *pRegion); + std::string getNavMeshStatusURLForCurrentRegion() const; std::string getNavMeshStatusURLForRegion(LLViewerRegion *pRegion) const; std::string getRetrieveNavMeshURLForRegion(LLViewerRegion *pRegion) const; std::string getObjectLinksetsURLForCurrentRegion() const; @@ -124,10 +124,6 @@ private: std::string getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const; LLViewerRegion *getCurrentRegion() const; -#if 0 - void displayNavMeshRebakePanel(); - void hideNavMeshRebakePanel(); -#endif void handleAgentStateResult(const LLSD &pContent ); void handleAgentStateError(U32 pStatus, const std::string &pReason, const std::string &pURL); @@ -135,5 +131,4 @@ private: agent_state_signal_t mAgentStateSignal; }; - #endif // LL_LLPATHFINDINGMANAGER_H |