From b2782a6f4b1b7b171f93f4139ddc7eda1dc324ac Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 17 Feb 2012 19:08:40 -0800
Subject: [PATCH] PATH-292: Clarifying and centralizing how the default initial
agent state is specified.
---
indra/newview/llfloaterpathfindingbasic.cpp | 2 +-
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 fc46a752593..1ea7a2e682d 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 ef50e2ad6cb..e8aa8385cfa 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;
--
GitLab