diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-02-17 19:08:40 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-02-17 19:08:40 -0800 |
| commit | b2782a6f4b1b7b171f93f4139ddc7eda1dc324ac (patch) | |
| tree | 1839d8db2a1931d4e9c5da8e3383088afeb57c5c /indra/newview | |
| parent | 516ad5b3c234321daf01294d6e03bdc4be019d36 (diff) | |
PATH-292: Clarifying and centralizing how the default initial agent state is specified.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterpathfindingbasic.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpathfindingmanager.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llfloaterpathfindingbasic.cpp b/indra/newview/llfloaterpathfindingbasic.cpp index fc46a75259..1ea7a2e682 100644 --- a/indra/newview/llfloaterpathfindingbasic.cpp +++ b/indra/newview/llfloaterpathfindingbasic.cpp @@ -82,7 +82,7 @@ LLFloaterPathfindingBasic::LLFloaterPathfindingBasic(const LLSD& pSeed) mUnfreezeButton(NULL),
mFreezeLabel(NULL),
mFreezeButton(NULL),
- mAgentState(LLPathfindingManager::kAgentStateNotEnabled)
+ mAgentState(LLPathfindingManager::kAgentStateInitialDefault)
{
}
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h index ef50e2ad6c..e8aa8385cf 100644 --- a/indra/newview/llpathfindingmanager.h +++ b/indra/newview/llpathfindingmanager.h @@ -40,10 +40,11 @@ class LLPathfindingManager : public LLSingleton<LLPathfindingManager> {
public:
typedef enum {
- kAgentStateNotEnabled = 0,
- kAgentStateFrozen = 1,
- kAgentStateUnfrozen = 2,
- kAgentStateError = 3
+ kAgentStateNotEnabled = 0,
+ kAgentStateFrozen = 1,
+ kAgentStateUnfrozen = 2,
+ kAgentStateError = 3,
+ kAgentStateInitialDefault = kAgentStateUnfrozen
} EAgentState;
typedef boost::function<void (EAgentState pAgentState)> agent_state_callback_t;
|