diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-05 15:59:34 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-05 15:59:34 -0700 |
| commit | 9d22b22d962321822a6be6a23150e6d5f939cd50 (patch) | |
| tree | 0dfeab5f7d33c5de6ef8e67af59695529266dddf /indra/newview/llpathfindingmanager.h | |
| parent | d23fbd0dd0dca9819965b850313dea92da913430 (diff) | |
PATH-482: BUGFIX Automatically reloading the character and linksets floaters on region crossing.
Diffstat (limited to 'indra/newview/llpathfindingmanager.h')
| -rw-r--r-- | indra/newview/llpathfindingmanager.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h index d906a94d44..795ee88f3d 100644 --- a/indra/newview/llpathfindingmanager.h +++ b/indra/newview/llpathfindingmanager.h @@ -73,8 +73,10 @@ public: kRequestError
} ERequestStatus;
- typedef boost::function<void (ERequestStatus, LLPathfindingLinksetListPtr)> linksets_callback_t;
- typedef boost::function<void (ERequestStatus, LLPathfindingCharacterListPtr)> characters_callback_t;
+ typedef U32 request_id_t;
+
+ typedef boost::function<void (request_id_t, ERequestStatus, LLPathfindingLinksetListPtr)> linksets_callback_t;
+ typedef boost::function<void (request_id_t, ERequestStatus, LLPathfindingCharacterListPtr)> characters_callback_t;
LLPathfindingManager();
virtual ~LLPathfindingManager();
@@ -96,10 +98,10 @@ public: EAgentState getLastKnownNonErrorAgentState() const;
void requestSetAgentState(EAgentState pAgentState);
- ERequestStatus requestGetLinksets(linksets_callback_t pLinksetsCallback) const;
- ERequestStatus requestSetLinksets(LLPathfindingLinksetListPtr pLinksetList, LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD, linksets_callback_t pLinksetsCallback) const;
+ ERequestStatus requestGetLinksets(request_id_t pRequestId, linksets_callback_t pLinksetsCallback) const;
+ ERequestStatus requestSetLinksets(request_id_t pRequestId, LLPathfindingLinksetListPtr pLinksetList, LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD, linksets_callback_t pLinksetsCallback) const;
- ERequestStatus requestGetCharacters(characters_callback_t pCharactersCallback) const;
+ ERequestStatus requestGetCharacters(request_id_t pRequestId, characters_callback_t pCharactersCallback) const;
protected:
|