From 9cac312f57391792e9fce380c2c38ae4060ae1d7 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 10:55:18 -0700
Subject: Backed out changeset: 18b06d44c5a3

---
 indra/newview/llpathfindingmanager.cpp | 47 ----------------------------------
 1 file changed, 47 deletions(-)

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 85a315a3e7..e282a3e2f4 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -93,25 +93,6 @@ public:
 
 LLHTTPRegistration<LLAgentStateChangeNode> gHTTPRegistrationAgentStateChangeNode(SIM_MESSAGE_AGENT_STATE_UPDATE);
 
-//---------------------------------------------------------------------------
-// StinsonResponder
-//---------------------------------------------------------------------------
-
-class StinsonResponder : public LLHTTPClient::Responder
-{
-public:
-	StinsonResponder(const std::string &pCapabilityURL);
-	virtual ~StinsonResponder();
-
-	virtual void result(const LLSD &pContent);
-	virtual void error(U32 pStatus, const std::string& pReason);
-
-protected:
-
-private:
-	std::string    mCapabilityURL;
-};
-
 //---------------------------------------------------------------------------
 // NavMeshStatusResponder
 //---------------------------------------------------------------------------
@@ -538,10 +519,6 @@ void LLPathfindingManager::requestGetCharacters(request_id_t pRequestId, object_
 
 			LLHTTPClient::ResponderPtr charactersResponder = new CharactersResponder(charactersURL, pRequestId, pCharactersCallback);
 			LLHTTPClient::get(charactersURL, charactersResponder);
-
-			std::string googleURL = "http://www.google.com/";
-			LLHTTPClient::ResponderPtr stinsonResponder = new StinsonResponder(googleURL);
-			LLHTTPClient::get(googleURL, stinsonResponder);
 		}
 	}
 }
@@ -825,30 +802,6 @@ void LLNavMeshSimStateChangeNode::post(ResponsePtr pResponse, const LLSD &pConte
 	LLPathfindingManager::getInstance()->handleNavMeshStatusUpdate(navMeshStatus);
 }
 
-//---------------------------------------------------------------------------
-// StinsonResponder
-//---------------------------------------------------------------------------
-
-StinsonResponder::StinsonResponder(const std::string &pCapabilityURL)
-	: LLHTTPClient::Responder(),
-	mCapabilityURL(pCapabilityURL)
-{
-}
-
-StinsonResponder::~StinsonResponder()
-{
-}
-
-void StinsonResponder::result(const LLSD &pContent)
-{
-	llinfos << "STINSON DEBUG: success to URL '" << mCapabilityURL << "' with content " << pContent << llendl;
-}
-
-void StinsonResponder::error(U32 pStatus, const std::string& pReason)
-{
-	llwarns << "STINSON DEBUG: error with request to URL '" << mCapabilityURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
-}
-
 //---------------------------------------------------------------------------
 // LLAgentStateChangeNode
 //---------------------------------------------------------------------------
-- 
cgit v1.3


From ff7223fafef58d9f8025e97fee87cf7911d93ccf Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 14:45:59 -0700
Subject: PATH-706: Removing enforcement on frozen/unfrozen state from the
 linksets floater.  Also, removing handlers for agent state change.

---
 indra/newview/llfloaterpathfindinglinksets.cpp     | 30 ++--------------------
 indra/newview/llfloaterpathfindinglinksets.h       |  7 -----
 indra/newview/llpathfindingmanager.cpp             |  5 ----
 indra/newview/llpathfindingmanager.h               |  1 -
 indra/newview/llviewermenu.cpp                     |  9 -------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  2 +-
 6 files changed, 3 insertions(+), 51 deletions(-)

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 1d7f165ad9..8488ee1aa3 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -60,26 +60,6 @@
 // LLFloaterPathfindingLinksets
 //---------------------------------------------------------------------------
 
-void LLFloaterPathfindingLinksets::onOpen(const LLSD& pKey)
-{
-	LLFloaterPathfindingObjects::onOpen(pKey);
-
-	if (!mAgentStateSlot.connected())
-	{
-		mAgentStateSlot = LLPathfindingManager::getInstance()->registerAgentStateListener(boost::bind(&LLFloaterPathfindingLinksets::onAgentStateChange, this, _1));
-	}
-}
-
-void LLFloaterPathfindingLinksets::onClose(bool pIsAppQuitting)
-{
-	if (mAgentStateSlot.connected())
-	{
-		mAgentStateSlot.disconnect();
-	}
-
-	LLFloaterPathfindingObjects::onClose(pIsAppQuitting);
-}
-
 void LLFloaterPathfindingLinksets::openLinksetsEditor()
 {
 	LLFloaterReg::toggleInstanceOrBringToFront("pathfinding_linksets");
@@ -107,8 +87,7 @@ LLFloaterPathfindingLinksets::LLFloaterPathfindingLinksets(const LLSD& pSeed)
 	mLabelEditD(NULL),
 	mEditD(NULL),
 	mApplyEditsButton(NULL),
-	mBeaconColor(),
-	mAgentStateSlot()
+	mBeaconColor()
 {
 }
 
@@ -337,11 +316,6 @@ void LLFloaterPathfindingLinksets::onApplyChangesClicked()
 	applyEdit();
 }
 
-void LLFloaterPathfindingLinksets::onAgentStateChange(LLPathfindingManager::EAgentState pAgentState)
-{
-	updateControls();
-}
-
 void LLFloaterPathfindingLinksets::applyFilters()
 {
 	rebuildObjectsScrollList();
@@ -530,7 +504,7 @@ bool LLFloaterPathfindingLinksets::isShowCannotBeVolumeWarning(LLPathfindingLink
 void LLFloaterPathfindingLinksets::updateStateOnEditFields()
 {
 	int numSelectedItems = getNumSelectedObjects();
-	bool isEditEnabled = ((numSelectedItems > 0) && LLPathfindingManager::getInstance()->isAllowAlterPermanent());
+	bool isEditEnabled = (numSelectedItems > 0);
 
 	mEditLinksetUse->setEnabled(isEditEnabled);
 
diff --git a/indra/newview/llfloaterpathfindinglinksets.h b/indra/newview/llfloaterpathfindinglinksets.h
index 4b19f09cda..8c464dc1d5 100644
--- a/indra/newview/llfloaterpathfindinglinksets.h
+++ b/indra/newview/llfloaterpathfindinglinksets.h
@@ -46,10 +46,6 @@ class LLVector3;
 class LLFloaterPathfindingLinksets : public LLFloaterPathfindingObjects
 {
 public:
-
-	virtual void onOpen(const LLSD& pKey);
-	virtual void onClose(bool pIsAppQuitting);
-
 	static void  openLinksetsEditor();
 
 protected:
@@ -78,7 +74,6 @@ private:
 	void onClearFiltersClicked();
 	void onWalkabilityCoefficientEntered(LLUICtrl *pUICtrl);
 	void onApplyChangesClicked();
-	void onAgentStateChange(LLPathfindingManager::EAgentState pAgentState);
 
 	void applyFilters();
 	void clearFilters();
@@ -131,8 +126,6 @@ private:
 	LLButton                                 *mApplyEditsButton;
 
 	LLColor4                                 mBeaconColor;
-
-	LLPathfindingManager::agent_state_slot_t mAgentStateSlot;
 };
 
 #endif // LL_LLFLOATERPATHFINDINGLINKSETS_H
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index e282a3e2f4..5e2a9e1213 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -292,11 +292,6 @@ bool LLPathfindingManager::isPathfindingNavMeshVersioningEnabledForCurrentRegion
 }
 #endif // DEPRECATED_UNVERSIONED_NAVMESH
 
-bool LLPathfindingManager::isAllowAlterPermanent()
-{
-	return (!isPathfindingEnabledForCurrentRegion() || (getAgentState() == kAgentStateUnfrozen));
-}
-
 bool LLPathfindingManager::isAllowViewTerrainProperties() const
 {
 	LLViewerRegion* region = getCurrentRegion();
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 3c9af91e7b..1ae6e06b40 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -80,7 +80,6 @@ public:
 	bool isPathfindingNavMeshVersioningEnabledForCurrentRegionXXX() const;
 #endif // DEPRECATED_UNVERSIONED_NAVMESH
 
-	bool isAllowAlterPermanent();
 	bool isAllowViewTerrainProperties() const;
 
 	LLPathfindingNavMesh::navmesh_slot_t registerNavMeshListenerForRegion(LLViewerRegion *pRegion, LLPathfindingNavMesh::navmesh_callback_t pNavMeshCallback);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 6944ae1a9b..5a0239c2e4 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4806,14 +4806,6 @@ class LLToolsEnablePathfinding : public view_listener_t
 	}
 };
 
-class LLToolsEnablePathfindingLinksets : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLPathfindingManager::getInstance()->isAllowAlterPermanent();
-	}
-};
-
 // Round the position of all root objects to the grid
 class LLToolsSnapObjectXY : public view_listener_t
 {
@@ -8209,7 +8201,6 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.EnableSaveToObjectInventory");
 
 	view_listener_t::addMenu(new LLToolsEnablePathfinding(), "Tools.EnablePathfinding");
-	view_listener_t::addMenu(new LLToolsEnablePathfindingLinksets(), "Tools.EnablePathfindingLinksets");
 
 	// Help menu
 	// most items use the ShowFloater method
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ad02beff7a..7b21f1f135 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -967,7 +967,7 @@
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_linksets" />
           <menu_item_call.on_enable
-              function="Tools.EnablePathfindingLinksets" />
+              function="Tools.EnablePathfinding" />
         </menu_item_call>
         <menu_item_call
             label="Characters..."
-- 
cgit v1.3


From b912c27bf44a45e607adc3b5c94d3fd8a9bbf53e Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 16:40:53 -0700
Subject: PATH-711: Implementing Leo's changes for the pathfinding console.

---
 indra/newview/llfloaterpathfindingconsole.cpp      | 137 +--------------------
 indra/newview/llfloaterpathfindingconsole.h        |  18 ---
 indra/newview/llpathfindingcharacterlist.cpp       |   6 +-
 indra/newview/llpathfindingmanager.cpp             |  14 +++
 indra/newview/llpathfindingmanager.h               |   4 +
 indra/newview/llpathfindingnavmeshzone.h           |   1 +
 indra/newview/llpathfindingpathtool.cpp            |   5 -
 indra/newview/llstartup.cpp                        |   4 +
 indra/newview/llviewermenu.cpp                     |  11 +-
 .../default/xui/en/floater_pathfinding_console.xml |  91 +-------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  18 +--
 11 files changed, 47 insertions(+), 262 deletions(-)

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 54e60ce0f4..59ce330a10 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -64,9 +64,6 @@
 #define XUI_CHARACTER_TYPE_C 3
 #define XUI_CHARACTER_TYPE_D 4
 
-#define XUI_EDIT_TAB_INDEX 0
-#define XUI_TEST_TAB_INDEX 1
-
 #define SET_SHAPE_RENDER_FLAG(_flag,_type) _flag |= (1U << _type)
 
 #define CONTROL_NAME_RETRIEVE_NEIGHBOR       "RetrieveNeighboringRegion"
@@ -138,37 +135,9 @@ BOOL LLFloaterPathfindingConsole::postBuild()
 	llassert(mViewCharactersButton != NULL);
 	mViewCharactersButton->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onViewCharactersClicked, this));
 
-	mEditTestTabContainer = findChild<LLTabContainer>("edit_test_tab_container");
-	llassert(mEditTestTabContainer != NULL);
-	mEditTestTabContainer->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onTabSwitch, this));
-
-	mEditTab = findChild<LLPanel>("edit_panel");
-	llassert(mEditTab != NULL);
-
 	mTestTab = findChild<LLPanel>("test_panel");
 	llassert(mTestTab != NULL);
 
-	mUnfreezeLabel = findChild<LLTextBase>("unfreeze_label");
-	llassert(mUnfreezeLabel != NULL);
-
-	mUnfreezeButton = findChild<LLButton>("enter_unfrozen_mode");
-	llassert(mUnfreezeButton != NULL);
-	mUnfreezeButton->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onUnfreezeClicked, this));
-
-	mLinksetsLabel = findChild<LLTextBase>("edit_linksets_label");
-	llassert(mLinksetsLabel != NULL);
-
-	mLinksetsButton = findChild<LLButton>("view_and_edit_linksets");
-	llassert(mLinksetsButton != NULL);
-	mLinksetsButton->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onViewEditLinksetClicked, this));
-
-	mFreezeLabel = findChild<LLTextBase>("freeze_label");
-	llassert(mFreezeLabel != NULL);
-
-	mFreezeButton = findChild<LLButton>("enter_frozen_mode");
-	llassert(mFreezeButton != NULL);
-	mFreezeButton->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onFreezeClicked, this));
-
 	mPathfindingViewerStatus = findChild<LLTextBase>("pathfinding_viewer_status");
 	llassert(mPathfindingViewerStatus != NULL);
 
@@ -205,11 +174,6 @@ BOOL LLFloaterPathfindingConsole::postBuild()
 	llassert(mClearPathButton != NULL);
 	mClearPathButton->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onClearPathClicked, this));
 
-	if (LLPathingLib::getInstance() == NULL)
-	{
-		LLPathingLib::initSystem();
-	}
-
 	if (LLPathingLib::getInstance() != NULL)
 	{
 		mPathfindingToolset = new LLToolset();
@@ -246,11 +210,6 @@ void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey)
 		fillInColorsForNavMeshVisualization();
 	}		
 
-	if (!mAgentStateSlot.connected())
-	{
-		mAgentStateSlot = LLPathfindingManager::getInstance()->registerAgentStateListener(boost::bind(&LLFloaterPathfindingConsole::onAgentStateCB, this, _1));
-	}
-
 	if (!mRegionBoundarySlot.connected())
 	{
 		mRegionBoundarySlot = LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LLFloaterPathfindingConsole::onRegionBoundaryCross, this));
@@ -266,14 +225,10 @@ void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey)
 		mPathEventSlot = LLPathfindingPathTool::getInstance()->registerPathEventListener(boost::bind(&LLFloaterPathfindingConsole::onPathEvent, this));
 	}
 
-	setAgentState(LLPathfindingManager::getInstance()->getAgentState());
 	setDefaultInputs();
 	updatePathTestStatus();
 
-	if (mEditTestTabContainer->getCurrentPanelIndex() == XUI_TEST_TAB_INDEX)
-	{
-		switchIntoTestPathMode();
-	}
+	switchIntoTestPathMode();
 }
 
 void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
@@ -295,11 +250,6 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
 		mRegionBoundarySlot.disconnect();
 	}
 
-	if (mAgentStateSlot.connected())
-	{
-		mAgentStateSlot.disconnect();
-	}
-
 	if (mNavMeshZoneSlot.connected())
 	{
 		mNavMeshZoneSlot.disconnect();
@@ -501,15 +451,7 @@ LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed)
 	mPathfindingViewerStatus(NULL),
 	mPathfindingSimulatorStatus(NULL),
 	mViewCharactersButton(NULL),
-	mEditTestTabContainer(NULL),
-	mEditTab(NULL),
 	mTestTab(NULL),
-	mUnfreezeLabel(NULL),
-	mUnfreezeButton(NULL),
-	mLinksetsLabel(NULL),
-	mLinksetsButton(NULL),
-	mFreezeLabel(NULL),
-	mFreezeButton(NULL),
 	mCtrlClickLabel(),
 	mShiftClickLabel(),
 	mCharacterWidthLabel(),
@@ -522,7 +464,6 @@ LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed)
 	mNavMeshZoneSlot(),
 	mNavMeshZone(),
 	mIsNavMeshUpdating(false),
-	mAgentStateSlot(),
 	mRegionBoundarySlot(),
 	mTeleportFailedSlot(),
 	mPathEventSlot(),
@@ -577,35 +518,6 @@ void LLFloaterPathfindingConsole::onViewCharactersClicked()
 	LLFloaterPathfindingCharacters::openCharactersViewer();
 }
 
-void LLFloaterPathfindingConsole::onTabSwitch()
-{
-	if (mEditTestTabContainer->getCurrentPanelIndex() == XUI_TEST_TAB_INDEX)
-	{
-		switchIntoTestPathMode();
-	}
-	else
-	{
-		switchOutOfTestPathMode();
-	}
-}
-
-void LLFloaterPathfindingConsole::onUnfreezeClicked()
-{
-	mUnfreezeButton->setEnabled(FALSE);
-	LLPathfindingManager::getInstance()->requestSetAgentState(LLPathfindingManager::kAgentStateUnfrozen);
-}
-
-void LLFloaterPathfindingConsole::onFreezeClicked()
-{
-	mFreezeButton->setEnabled(FALSE);
-	LLPathfindingManager::getInstance()->requestSetAgentState(LLPathfindingManager::kAgentStateFrozen);
-}
-
-void LLFloaterPathfindingConsole::onViewEditLinksetClicked()
-{
-	LLFloaterPathfindingLinksets::openLinksetsEditor();
-}
-
 void LLFloaterPathfindingConsole::onCharacterWidthSet()
 {
 	updateCharacterWidth();
@@ -658,11 +570,6 @@ void LLFloaterPathfindingConsole::onNavMeshZoneCB(LLPathfindingNavMeshZone::ENav
 	}
 }
 
-void LLFloaterPathfindingConsole::onAgentStateCB(LLPathfindingManager::EAgentState pAgentState)
-{
-	setAgentState(pAgentState);
-}
-
 void LLFloaterPathfindingConsole::onRegionBoundaryCross()
 {	
 	initializeNavMeshZoneForCurrentRegion();	
@@ -706,7 +613,6 @@ void LLFloaterPathfindingConsole::onPathEvent()
 
 void LLFloaterPathfindingConsole::setDefaultInputs()
 {
-	mEditTestTabContainer->selectTab(XUI_EDIT_TAB_INDEX);
 	setRenderWorld(TRUE);
 	setRenderNavMesh(FALSE);
 	setRenderWalkables(FALSE);
@@ -776,7 +682,6 @@ void LLFloaterPathfindingConsole::updateControlsOnConsoleState()
 		mShowRenderWaterPlaneCheckBox->setEnabled(FALSE);
 		mShowXRayCheckBox->setEnabled(FALSE);
 		mViewCharactersButton->setEnabled(FALSE);
-		mEditTestTabContainer->selectTab(0);
 		mTestTab->setEnabled(FALSE);
 		mCtrlClickLabel->setEnabled(FALSE);
 		mShiftClickLabel->setEnabled(FALSE);
@@ -802,7 +707,6 @@ void LLFloaterPathfindingConsole::updateControlsOnConsoleState()
 		mShowRenderWaterPlaneCheckBox->setEnabled(FALSE);
 		mShowXRayCheckBox->setEnabled(FALSE);
 		mViewCharactersButton->setEnabled(TRUE);
-		mEditTestTabContainer->selectTab(0);
 		mTestTab->setEnabled(FALSE);
 		mCtrlClickLabel->setEnabled(FALSE);
 		mShiftClickLabel->setEnabled(FALSE);
@@ -830,7 +734,6 @@ void LLFloaterPathfindingConsole::updateControlsOnConsoleState()
 		mShowRenderWaterPlaneCheckBox->setEnabled(FALSE);
 		mShowXRayCheckBox->setEnabled(FALSE);
 		mViewCharactersButton->setEnabled(TRUE);
-		mEditTestTabContainer->selectTab(0);
 		mTestTab->setEnabled(FALSE);
 		mCtrlClickLabel->setEnabled(FALSE);
 		mShiftClickLabel->setEnabled(FALSE);
@@ -1028,44 +931,6 @@ void LLFloaterPathfindingConsole::cleanupRenderableRestoreItems()
 	}
 }
 
-void LLFloaterPathfindingConsole::setAgentState(LLPathfindingManager::EAgentState pAgentState)
-{
-	switch (LLPathfindingManager::getInstance()->getLastKnownNonErrorAgentState())
-	{
-	case LLPathfindingManager::kAgentStateUnknown :
-	case LLPathfindingManager::kAgentStateNotEnabled :
-		mEditTab->setEnabled(FALSE);
-		mUnfreezeLabel->setEnabled(FALSE);
-		mUnfreezeButton->setEnabled(FALSE);
-		mLinksetsLabel->setEnabled(FALSE);
-		mLinksetsButton->setEnabled(FALSE);
-		mFreezeLabel->setEnabled(FALSE);
-		mFreezeButton->setEnabled(FALSE);
-		break;
-	case LLPathfindingManager::kAgentStateFrozen :
-		mEditTab->setEnabled(TRUE);
-		mUnfreezeLabel->setEnabled(TRUE);
-		mUnfreezeButton->setEnabled(TRUE);
-		mLinksetsLabel->setEnabled(FALSE);
-		mLinksetsButton->setEnabled(FALSE);
-		mFreezeLabel->setEnabled(FALSE);
-		mFreezeButton->setEnabled(FALSE);
-		break;
-	case LLPathfindingManager::kAgentStateUnfrozen :
-		mEditTab->setEnabled(TRUE);
-		mUnfreezeLabel->setEnabled(FALSE);
-		mUnfreezeButton->setEnabled(FALSE);
-		mLinksetsLabel->setEnabled(TRUE);
-		mLinksetsButton->setEnabled(TRUE);
-		mFreezeLabel->setEnabled(TRUE);
-		mFreezeButton->setEnabled(TRUE);
-		break;
-	default :
-		llassert(0);
-		break;
-	}
-}
-
 void LLFloaterPathfindingConsole::switchIntoTestPathMode()
 {
 	if (LLPathingLib::getInstance() != NULL)
diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index edbeae2012..2529b241bf 100644
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -31,7 +31,6 @@
 #include "llfloater.h"
 #include "llhandle.h"
 #include "llpathinglib.h"
-#include "llpathfindingmanager.h"
 #include "llpathfindingnavmeshzone.h"
 #include "llpathfindingpathtool.h"
 
@@ -43,7 +42,6 @@ class LLSliderCtrl;
 class LLLineEditor;
 class LLTextBase;
 class LLCheckBoxCtrl;
-class LLTabContainer;
 class LLComboBox;
 class LLButton;
 class LLToolset;
@@ -120,16 +118,11 @@ private:
 	void onShowNavMeshSet();
 	void onShowWalkabilitySet();
 	void onViewCharactersClicked();
-	void onTabSwitch();
-	void onUnfreezeClicked();
-	void onFreezeClicked();
-	void onViewEditLinksetClicked();
 	void onCharacterWidthSet();
 	void onCharacterTypeSwitch();
 	void onClearPathClicked();
 
 	void onNavMeshZoneCB(LLPathfindingNavMeshZone::ENavMeshZoneRequestStatus pNavMeshZoneRequestStatus);
-	void onAgentStateCB(LLPathfindingManager::EAgentState pAgentState);
 	void onRegionBoundaryCross();
 	void onPathEvent();
 
@@ -145,8 +138,6 @@ private:
 
 	void initializeNavMeshZoneForCurrentRegion();
 
-	void setAgentState(LLPathfindingManager::EAgentState pAgentState);
-
 	void switchIntoTestPathMode();
 	void switchOutOfTestPathMode();
 	void updateCharacterWidth();
@@ -177,15 +168,7 @@ private:
 	LLTextBase                                    *mPathfindingViewerStatus;
 	LLTextBase                                    *mPathfindingSimulatorStatus;
 	LLButton                                      *mViewCharactersButton;
-	LLTabContainer                                *mEditTestTabContainer;
-	LLPanel                                       *mEditTab;
 	LLPanel                                       *mTestTab;
-	LLTextBase                                    *mUnfreezeLabel;
-	LLButton                                      *mUnfreezeButton;
-	LLTextBase                                    *mLinksetsLabel;
-	LLButton                                      *mLinksetsButton;
-	LLTextBase                                    *mFreezeLabel;
-	LLButton                                      *mFreezeButton;
 	LLTextBase                                    *mCtrlClickLabel;
 	LLTextBase                                    *mShiftClickLabel;
 	LLTextBase                                    *mCharacterWidthLabel;
@@ -200,7 +183,6 @@ private:
 	LLPathfindingNavMeshZone                      mNavMeshZone;
 	bool                                          mIsNavMeshUpdating;
 
-	LLPathfindingManager::agent_state_slot_t      mAgentStateSlot;
 	boost::signals2::connection                   mRegionBoundarySlot;
 	boost::signals2::connection                   mTeleportFailedSlot;
 	LLPathfindingPathTool::path_event_slot_t      mPathEventSlot;
diff --git a/indra/newview/llpathfindingcharacterlist.cpp b/indra/newview/llpathfindingcharacterlist.cpp
index 15eaac771f..ac1fb15be9 100644
--- a/indra/newview/llpathfindingcharacterlist.cpp
+++ b/indra/newview/llpathfindingcharacterlist.cpp
@@ -47,12 +47,10 @@ LLPathfindingCharacterList::LLPathfindingCharacterList()
 LLPathfindingCharacterList::LLPathfindingCharacterList(const LLSD& pCharacterListData)
 	: LLPathfindingObjectList()
 {
-	if ( LLPathingLib::getInstance() == NULL )
+	if (LLPathingLib::getInstance() != NULL)
 	{
-		LLPathingLib::initSystem();
+		LLPathingLib::getInstance()->cleanupPhysicsCapsuleRepResiduals( );
 	}
-	
-	LLPathingLib::getInstance()->cleanupPhysicsCapsuleRepResiduals( );
 
 	parseCharacterListData(pCharacterListData);
 }
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 5e2a9e1213..ae1c228c69 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -45,6 +45,7 @@
 #include "llpathfindingnavmesh.h"
 #include "llpathfindingnavmeshstatus.h"
 #include "llpathfindingobject.h"
+#include "llpathinglib.h"
 #include "llsingleton.h"
 #include "llsd.h"
 #include "lltrans.h"
@@ -273,6 +274,14 @@ LLPathfindingManager::~LLPathfindingManager()
 {
 }
 
+void LLPathfindingManager::initSystem()
+{
+	if (LLPathingLib::getInstance() == NULL)
+	{
+		LLPathingLib::initSystem();
+	}
+}
+
 bool LLPathfindingManager::isPathfindingEnabledForCurrentRegion() const
 {
 	return isPathfindingEnabledForRegion(getCurrentRegion());
@@ -292,6 +301,11 @@ bool LLPathfindingManager::isPathfindingNavMeshVersioningEnabledForCurrentRegion
 }
 #endif // DEPRECATED_UNVERSIONED_NAVMESH
 
+bool LLPathfindingManager::isPathfindingDebugEnabled() const
+{
+	return (LLPathingLib::getInstance() != NULL);
+}
+
 bool LLPathfindingManager::isAllowViewTerrainProperties() const
 {
 	LLViewerRegion* region = getCurrentRegion();
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 1ae6e06b40..24b58d1fe9 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -74,12 +74,16 @@ public:
 	LLPathfindingManager();
 	virtual ~LLPathfindingManager();
 
+	void initSystem();
+
 	bool isPathfindingEnabledForCurrentRegion() const;
 	bool isPathfindingEnabledForRegion(LLViewerRegion *pRegion) const;
 #ifdef DEPRECATED_UNVERSIONED_NAVMESH
 	bool isPathfindingNavMeshVersioningEnabledForCurrentRegionXXX() const;
 #endif // DEPRECATED_UNVERSIONED_NAVMESH
 
+	bool isPathfindingDebugEnabled() const;
+
 	bool isAllowViewTerrainProperties() const;
 
 	LLPathfindingNavMesh::navmesh_slot_t registerNavMeshListenerForRegion(LLViewerRegion *pRegion, LLPathfindingNavMesh::navmesh_callback_t pNavMeshCallback);
diff --git a/indra/newview/llpathfindingnavmeshzone.h b/indra/newview/llpathfindingnavmeshzone.h
index 8c330559a9..1e92f6b131 100644
--- a/indra/newview/llpathfindingnavmeshzone.h
+++ b/indra/newview/llpathfindingnavmeshzone.h
@@ -32,6 +32,7 @@
 #include "lluuid.h"
 #include "llpathfindingnavmesh.h"
 #include "llpathfindingnavmeshstatus.h"
+#include "llviewerregion.h"
 
 #include <vector>
 
diff --git a/indra/newview/llpathfindingpathtool.cpp b/indra/newview/llpathfindingpathtool.cpp
index bc5a265111..5567869a1c 100644
--- a/indra/newview/llpathfindingpathtool.cpp
+++ b/indra/newview/llpathfindingpathtool.cpp
@@ -54,11 +54,6 @@ LLPathfindingPathTool::LLPathfindingPathTool()
 	mIsMiddleMouseButtonHeld(false),
 	mIsRightMouseButtonHeld(false)
 {
-	if (!LLPathingLib::getInstance())
-	{
-		LLPathingLib::initSystem();
-	}	
-
 	setCharacterWidth(1.0f);
 	setCharacterType(mCharacterType);
 }
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 0ac8c1fe39..6bee373181 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -186,6 +186,7 @@
 #include "llappearancemgr.h"
 #include "llavatariconctrl.h"
 #include "llvoicechannel.h"
+#include "llpathfindingmanager.h"
 
 #include "lllogin.h"
 #include "llevents.h"
@@ -1968,6 +1969,9 @@ bool idle_startup()
 			}
 		}
 
+		llassert(LLPathfindingManager::getInstance() != NULL);
+		LLPathfindingManager::getInstance()->initSystem();
+
 		display_startup();
         //DEV-17797.  get null folder.  Any items found here moved to Lost and Found
         LLInventoryModelBackgroundFetch::instance().findLostItems();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 5a0239c2e4..69421d240b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4802,7 +4802,15 @@ class LLToolsEnablePathfinding : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion();
+		return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion();
+	}
+};
+
+class LLToolsEnablePathfindingDebug : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLPathfindingManager::getInstance()->isPathfindingDebugEnabled();
 	}
 };
 
@@ -8201,6 +8209,7 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.EnableSaveToObjectInventory");
 
 	view_listener_t::addMenu(new LLToolsEnablePathfinding(), "Tools.EnablePathfinding");
+	view_listener_t::addMenu(new LLToolsEnablePathfindingDebug(), "Tools.EnablePathfindingDebug");
 
 	// Help menu
 	// most items use the ShowFloater method
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 54d44be015..a9815dcb00 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -9,7 +9,7 @@
     reuse_instance="true"
     save_rect="true"
     single_instance="true"
-    title="Pathfinding edit / test"
+    title="Pathfinding debug"
     width="456">
   <floater.string name="navmesh_viewer_status_unknown"></floater.string>
   <floater.string name="navmesh_viewer_status_library_not_implemented">Cannot find pathing library implementation.</floater.string>
@@ -233,93 +233,6 @@
       top="14"
       height="268"
       width="218">
-    <panel
-        border="false"
-        bevel_style="none"
-        follows="left|top"
-        layout="topleft"
-        name="edit_panel"
-        left="1"
-        label="Edit">
-      <text
-          word_wrap="true"
-          use_ellipses="false"
-          type="string"
-          text_color="LabelTextColor"
-          text_readonly_color="LabelDisabledColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          name="unfreeze_label"
-          left="16"
-          top_pad="16"
-          height="13"
-          width="190">
-        Allow object / terrain changes:
-      </text>
-      <button
-          follows="left|top"
-          height="22"
-          left="16"
-          enabled="false"
-          label="Unfreeze"
-          layout="topleft"
-          name="enter_unfrozen_mode"
-          top_pad="5"
-          width="116"/>
-      <text
-          word_wrap="true"
-          use_ellipses="false"
-          type="string"
-          text_color="LabelTextColor"
-          text_readonly_color="LabelDisabledColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          left="16"
-          name="edit_linksets_label"
-          top_pad="23"
-          height="13"
-          width="190">
-        Edit linkset attributes:
-      </text>
-      <button
-          follows="left|top"
-          height="22"
-          left="16"
-          label="Linksets..."
-          layout="topleft"
-          name="view_and_edit_linksets"
-          top_pad="5"
-          width="116"/>
-      <text
-          word_wrap="true"
-          use_ellipses="false"
-          type="string"
-          text_color="LabelTextColor"
-          text_readonly_color="LabelDisabledColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          left="16"
-          line_spacing.multiple="1.5"
-          name="freeze_label"
-          top_pad="23"
-          height="32"
-          width="190">
-        Prevent object / terrain changes and update the navmesh:
-      </text>
-      <button
-          follows="left|top"
-          height="22"
-          left="16"
-          enabled="false"
-          label="Freeze"
-          layout="topleft"
-          name="enter_frozen_mode"
-          top_pad="3"
-          width="116"/>
-    </panel>
     <panel
         border="false"
         bevel_style="none"
@@ -327,7 +240,7 @@
         layout="topleft"
         left="1"
         name="test_panel"
-        label="Test">
+        label="Test path">
       <text
           height="14"
           word_wrap="true"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2b1e814c69..ecc96ab402 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -942,15 +942,6 @@
          label="Pathfinding"
          name="Pathfinding"
          tear_off="false">
-        <menu_item_call
-            label="Edit / test..."
-            name="pathfinding_console_menu_item">
-          <menu_item_call.on_click
-              function="Floater.ToggleOrBringToFront"
-              parameter="pathfinding_console" />
-          <menu_item_call.on_enable
-              function="Tools.EnablePathfinding" />
-        </menu_item_call>
         <menu_item_call
             label="Linksets..."
             name="pathfinding_linksets_menu_item">
@@ -969,6 +960,15 @@
           <menu_item_call.on_enable
               function="Tools.EnablePathfinding" />
         </menu_item_call>
+        <menu_item_call
+            label="Pathfinding debug..."
+            name="pathfinding_console_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_console" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfindingDebug" />
+        </menu_item_call>
       </menu>
 
 
-- 
cgit v1.3


From e738e704b88d64b8a0183f94045d229d9f498bd1 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 17:03:15 -0700
Subject: PATH-714: Removing the DEPRECATED_UNVERSIONED_NAVMESH as the viewer
 no longer has to support the Premium Wilderness regions on the old server
 code.

---
 indra/newview/llfloaterpathfindingconsole.cpp      | 34 ----------------------
 indra/newview/llpathfindingmanager.cpp             | 23 ---------------
 indra/newview/llpathfindingmanager.h               |  3 --
 indra/newview/llpathfindingnavmesh.h               |  4 ---
 indra/newview/llpathfindingnavmeshstatus.h         |  7 -----
 .../default/xui/en/floater_pathfinding_console.xml |  1 -
 6 files changed, 72 deletions(-)

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 59ce330a10..eae7aa4bcc 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -847,39 +847,6 @@ std::string LLFloaterPathfindingConsole::getSimulatorStatusText() const
 {
 	std::string simulatorStatusText("");
 
-#ifdef DEPRECATED_UNVERSIONED_NAVMESH
-	if (LLPathfindingManager::getInstance()->isPathfindingNavMeshVersioningEnabledForCurrentRegionXXX())
-	{
-		switch (mNavMeshZone.getNavMeshZoneStatus())
-		{
-		case LLPathfindingNavMeshZone::kNavMeshZonePending : 
-			simulatorStatusText = getString("navmesh_simulator_status_pending");
-			break;
-		case LLPathfindingNavMeshZone::kNavMeshZoneBuilding : 
-			simulatorStatusText = getString("navmesh_simulator_status_building");
-			break;
-		case LLPathfindingNavMeshZone::kNavMeshZoneSomePending : 
-			simulatorStatusText = getString("navmesh_simulator_status_some_pending");
-			break;
-		case LLPathfindingNavMeshZone::kNavMeshZoneSomeBuilding : 
-			simulatorStatusText = getString("navmesh_simulator_status_some_building");
-			break;
-		case LLPathfindingNavMeshZone::kNavMeshZonePendingAndBuilding : 
-			simulatorStatusText = getString("navmesh_simulator_status_pending_and_building");
-			break;
-		case LLPathfindingNavMeshZone::kNavMeshZoneComplete : 
-			simulatorStatusText = getString("navmesh_simulator_status_complete");
-			break;
-		default : 
-			simulatorStatusText = getString("navmesh_simulator_status_unknown");
-			break;
-		}
-	}
-	else
-	{
-		simulatorStatusText = getString("navmesh_simulator_status_region_not_enabled");
-	}
-#else // DEPRECATED_UNVERSIONED_NAVMESH
 	switch (mNavMeshZone.getNavMeshZoneStatus())
 	{
 	case LLPathfindingNavMeshZone::kNavMeshZonePending : 
@@ -904,7 +871,6 @@ std::string LLFloaterPathfindingConsole::getSimulatorStatusText() const
 		simulatorStatusText = getString("navmesh_simulator_status_unknown");
 		break;
 	}
-#endif // DEPRECATED_UNVERSIONED_NAVMESH
 
 	return simulatorStatusText;
 }
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index ae1c228c69..1c3800eed6 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -293,14 +293,6 @@ bool LLPathfindingManager::isPathfindingEnabledForRegion(LLViewerRegion *pRegion
 	return !retrieveNavMeshURL.empty();
 }
 
-#ifdef DEPRECATED_UNVERSIONED_NAVMESH
-bool LLPathfindingManager::isPathfindingNavMeshVersioningEnabledForCurrentRegionXXX() const
-{
-	std::string navMeshStatusURL = getNavMeshStatusURLForRegion(getCurrentRegion());
-	return !navMeshStatusURL.empty();
-}
-#endif // DEPRECATED_UNVERSIONED_NAVMESH
-
 bool LLPathfindingManager::isPathfindingDebugEnabled() const
 {
 	return (LLPathingLib::getInstance() != NULL);
@@ -338,25 +330,10 @@ void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion)
 	else
 	{
 		std::string navMeshStatusURL = getNavMeshStatusURLForRegion(pRegion);
-#ifdef DEPRECATED_UNVERSIONED_NAVMESH
-		if (navMeshStatusURL.empty())
-		{
-			LLPathfindingNavMeshStatus navMeshStatus = navMeshPtr->getNavMeshStatusXXX();
-			navMeshStatus.incrementNavMeshVersionXXX();
-			sendRequestGetNavMeshForRegion(navMeshPtr, pRegion, navMeshStatus);
-		}
-		else
-		{
-			navMeshPtr->handleNavMeshCheckVersion();
-			LLHTTPClient::ResponderPtr navMeshStatusResponder = new NavMeshStatusResponder(navMeshStatusURL, pRegion);
-			LLHTTPClient::get(navMeshStatusURL, navMeshStatusResponder);
-		}
-#else // DEPRECATED_UNVERSIONED_NAVMESH
 		llassert(!navMeshStatusURL.empty());
 		navMeshPtr->handleNavMeshCheckVersion();
 		LLHTTPClient::ResponderPtr navMeshStatusResponder = new NavMeshStatusResponder(navMeshStatusURL, pRegion);
 		LLHTTPClient::get(navMeshStatusURL, navMeshStatusResponder);
-#endif // DEPRECATED_UNVERSIONED_NAVMESH
 	}
 }
 
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 24b58d1fe9..3aafef3565 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -78,9 +78,6 @@ public:
 
 	bool isPathfindingEnabledForCurrentRegion() const;
 	bool isPathfindingEnabledForRegion(LLViewerRegion *pRegion) const;
-#ifdef DEPRECATED_UNVERSIONED_NAVMESH
-	bool isPathfindingNavMeshVersioningEnabledForCurrentRegionXXX() const;
-#endif // DEPRECATED_UNVERSIONED_NAVMESH
 
 	bool isPathfindingDebugEnabled() const;
 
diff --git a/indra/newview/llpathfindingnavmesh.h b/indra/newview/llpathfindingnavmesh.h
index 55fdd9aaa7..02b403ab75 100644
--- a/indra/newview/llpathfindingnavmesh.h
+++ b/indra/newview/llpathfindingnavmesh.h
@@ -66,10 +66,6 @@ public:
 
 	navmesh_slot_t registerNavMeshListener(navmesh_callback_t pNavMeshCallback);
 
-#ifdef DEPRECATED_UNVERSIONED_NAVMESH
-	const LLPathfindingNavMeshStatus &getNavMeshStatusXXX() const {return mNavMeshStatus;};
-#endif // DEPRECATED_UNVERSIONED_NAVMESH
-
 	bool hasNavMeshVersion(const LLPathfindingNavMeshStatus &pNavMeshStatus) const;
 
 	void handleNavMeshWaitForRegionLoad();
diff --git a/indra/newview/llpathfindingnavmeshstatus.h b/indra/newview/llpathfindingnavmeshstatus.h
index 6428a31c24..837fc43cc5 100644
--- a/indra/newview/llpathfindingnavmeshstatus.h
+++ b/indra/newview/llpathfindingnavmeshstatus.h
@@ -32,9 +32,6 @@
 
 #include <string>
 
-// XXX stinson 03/12/2012 : This definition is in place to support an older version of the pathfinding simulator that does not have versioned information
-#define DEPRECATED_UNVERSIONED_NAVMESH
-
 class LLSD;
 
 class LLPathfindingNavMeshStatus
@@ -57,10 +54,6 @@ public:
 
 	LLPathfindingNavMeshStatus &operator =(const LLPathfindingNavMeshStatus &pOther);
 
-#ifdef DEPRECATED_UNVERSIONED_NAVMESH
-	void incrementNavMeshVersionXXX() {++mVersion;};
-#endif // DEPRECATED_UNVERSIONED_NAVMESH
-
 	bool           isValid() const        {return mIsValid;};
 	const LLUUID   &getRegionUUID() const {return mRegionUUID;};
 	U32            getVersion() const     {return mVersion;};
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index a9815dcb00..59b816b0e1 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -21,7 +21,6 @@
   <floater.string name="navmesh_viewer_status_has_navmesh">Latest navmesh has been downloaded.</floater.string>
   <floater.string name="navmesh_viewer_status_error">Unable to download navmesh successfully.</floater.string>
   <floater.string name="navmesh_simulator_status_unknown"></floater.string>
-  <floater.string name="navmesh_simulator_status_region_not_enabled">This region does not expose the navmesh status.</floater.string>
   <floater.string name="navmesh_simulator_status_pending">Navmesh has pending changes.</floater.string>
   <floater.string name="navmesh_simulator_status_building">Navmesh is building.</floater.string>
   <floater.string name="navmesh_simulator_status_some_pending">Some navmesh regions have pending changes.</floater.string>
-- 
cgit v1.3


From 3108d4d180df16dab7b87c01334cf466ef88d349 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 18:38:06 -0700
Subject: PATH-726: Removing the DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD as the
 viewer no longer has to support the Premium Wilderness regions on the old
 server code.

---
 indra/newview/llpathfindingmanager.cpp | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 1c3800eed6..9893121980 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -59,7 +59,6 @@
 
 #define CAP_SERVICE_AGENT_STATE     "AgentPreferences"
 #define ALTER_NAVMESH_OBJECTS_FIELD "alter_navmesh_objects"
-#define DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD "alter_permanent_objects"
 
 #define CAP_SERVICE_OBJECT_LINKSETS  "ObjectNavMeshProperties"
 #define CAP_SERVICE_TERRAIN_LINKSETS "TerrainNavMeshProperties"
@@ -377,9 +376,6 @@ void LLPathfindingManager::requestSetAgentState(EAgentState pRequestedAgentState
 	{
 		LLSD request;
 		request[ALTER_NAVMESH_OBJECTS_FIELD] = static_cast<LLSD::Boolean>(pRequestedAgentState == kAgentStateUnfrozen);
-#ifdef DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD
-		request[DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD] = static_cast<LLSD::Boolean>(pRequestedAgentState == kAgentStateUnfrozen);
-#endif // DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD
 
 		LLHTTPClient::ResponderPtr responder = new AgentStateResponder(agentStateURL, pRequestedAgentState);
 		LLHTTPClient::post(agentStateURL, request, responder);
@@ -661,24 +657,9 @@ void LLPathfindingManager::setAgentState(EAgentState pAgentState)
 
 void LLPathfindingManager::handleAgentStateResult(const LLSD &pContent, EAgentState pRequestedAgentState)
 {
-#ifndef DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD
 	llassert(pContent.has(ALTER_NAVMESH_OBJECTS_FIELD));
 	llassert(pContent.get(ALTER_NAVMESH_OBJECTS_FIELD).isBoolean());
 	EAgentState agentState = (pContent.get(ALTER_NAVMESH_OBJECTS_FIELD).asBoolean() ? kAgentStateUnfrozen : kAgentStateFrozen);
-#else // DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD
-	EAgentState agentState = kAgentStateUnknown;
-	if (pContent.has(ALTER_NAVMESH_OBJECTS_FIELD))
-	{
-		llassert(pContent.get(ALTER_NAVMESH_OBJECTS_FIELD).isBoolean());
-		agentState = (pContent.get(ALTER_NAVMESH_OBJECTS_FIELD).asBoolean() ? kAgentStateUnfrozen : kAgentStateFrozen);
-	}
-	else
-	{
-		llassert(pContent.has(DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD));
-		llassert(pContent.get(DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD).isBoolean());
-		agentState = (pContent.get(DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD).asBoolean() ? kAgentStateUnfrozen : kAgentStateFrozen);
-	}
-#endif // DEPRECATED_ALTER_NAVMESH_OBJECTS_FIELD
 
 	if (isValidAgentState(pRequestedAgentState) && (agentState != pRequestedAgentState))
 	{
-- 
cgit v1.3


From 42f3648814923edad8a040620cb3db233597cbb9 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 18:59:51 -0700
Subject: PATH-705: First pass at removing the agent state functionality. WIP
 -- still need to remove XXX_STINSON_AGENT_STATE_DELETE_ME ifdef'ed code.

---
 indra/newview/llpanelobject.cpp                    |   7 --
 indra/newview/llpanelobject.h                      |   2 -
 indra/newview/llpathfindingmanager.cpp             | 125 +++++----------------
 indra/newview/llpathfindingmanager.h               |  49 +++-----
 .../newview/skins/default/xui/en/notifications.xml |  19 ----
 5 files changed, 41 insertions(+), 161 deletions(-)

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 0473866ac0..3786480f2e 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -279,8 +279,6 @@ BOOL	LLPanelObject::postBuild()
 	mCtrlSculptInvert = getChild<LLCheckBoxCtrl>("sculpt invert control");
 	childSetCommitCallback("sculpt invert control", onCommitSculptType, this);
 
-	LLPathfindingManager::getInstance()->registerAgentStateListener(boost::bind(&LLPanelObject::handleAgentStateCallback, this));
-	
 	// Start with everyone disabled
 	clearCtrls();
 
@@ -1995,11 +1993,6 @@ void LLPanelObject::onCommitSculpt( const LLSD& data )
 	sendSculpt();
 }
 
-void LLPanelObject::handleAgentStateCallback() const
-{
-	gFloaterTools->dirty();
-}
-
 BOOL LLPanelObject::onDropSculpt(LLInventoryItem* item)
 {
     LLTextureCtrl* mTextureCtrl = getChild<LLTextureCtrl>("sculpt texture control");
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index 307d63aada..34a19b3dfa 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -75,8 +75,6 @@ public:
 	BOOL     		onDropSculpt(LLInventoryItem* item);
 	static void     onCommitSculptType(    LLUICtrl *ctrl, void* userdata);
 
-	void            handleAgentStateCallback() const;
-	
 protected:
 	void			getState();
 
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 9893121980..f54c9892df 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -53,22 +53,24 @@
 #include "llviewerregion.h"
 #include "llweb.h"
 
-#define CAP_SERVICE_RETRIEVE_NAVMESH  "RetrieveNavMeshSrc"
+#define CAP_SERVICE_RETRIEVE_NAVMESH      "RetrieveNavMeshSrc"
 
-#define CAP_SERVICE_NAVMESH_STATUS "NavMeshGenerationStatus"
+#define CAP_SERVICE_NAVMESH_STATUS        "NavMeshGenerationStatus"
 
-#define CAP_SERVICE_AGENT_STATE     "AgentPreferences"
-#define ALTER_NAVMESH_OBJECTS_FIELD "alter_navmesh_objects"
+#define CAP_SERVICE_OBJECT_LINKSETS       "ObjectNavMeshProperties"
+#define CAP_SERVICE_TERRAIN_LINKSETS      "TerrainNavMeshProperties"
 
-#define CAP_SERVICE_OBJECT_LINKSETS  "ObjectNavMeshProperties"
-#define CAP_SERVICE_TERRAIN_LINKSETS "TerrainNavMeshProperties"
-
-#define CAP_SERVICE_CHARACTERS  "CharacterProperties"
+#define CAP_SERVICE_CHARACTERS            "CharacterProperties"
 
 #define SIM_MESSAGE_NAVMESH_STATUS_UPDATE "/message/NavMeshStatusUpdate"
-#define SIM_MESSAGE_AGENT_STATE_UPDATE    "/message/AgentPreferencesUpdate"
 #define SIM_MESSAGE_BODY_FIELD            "body"
 
+#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
+#define CAP_SERVICE_AGENT_STATE     "AgentPreferences"
+#define ALTER_NAVMESH_OBJECTS_FIELD "alter_navmesh_objects"
+#define SIM_MESSAGE_AGENT_STATE_UPDATE    "/message/AgentPreferencesUpdate"
+#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
+
 //---------------------------------------------------------------------------
 // LLNavMeshSimStateChangeNode
 //---------------------------------------------------------------------------
@@ -81,6 +83,7 @@ public:
 
 LLHTTPRegistration<LLNavMeshSimStateChangeNode> gHTTPRegistrationNavMeshSimStateChangeNode(SIM_MESSAGE_NAVMESH_STATUS_UPDATE);
 
+#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 //---------------------------------------------------------------------------
 // LLAgentStateChangeNode
 //---------------------------------------------------------------------------
@@ -92,6 +95,7 @@ public:
 };
 
 LLHTTPRegistration<LLAgentStateChangeNode> gHTTPRegistrationAgentStateChangeNode(SIM_MESSAGE_AGENT_STATE_UPDATE);
+#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
 //---------------------------------------------------------------------------
 // NavMeshStatusResponder
@@ -135,6 +139,7 @@ private:
 	LLPathfindingNavMeshPtr mNavMeshPtr;
 };
 
+#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 //---------------------------------------------------------------------------
 // AgentStateResponder
 //---------------------------------------------------------------------------
@@ -154,6 +159,7 @@ private:
 	std::string                       mCapabilityURL;
 	LLPathfindingManager::EAgentState mRequestedAgentState;
 };
+#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
 //---------------------------------------------------------------------------
 // LinksetsResponder
@@ -262,10 +268,7 @@ private:
 
 LLPathfindingManager::LLPathfindingManager()
 	: LLSingleton<LLPathfindingManager>(),
-	mNavMeshMap(),
-	mAgentStateSignal(),
-	mAgentState(kAgentStateUnknown),
-	mLastKnownNonErrorAgentState(kAgentStateUnknown)
+	mNavMeshMap()
 {
 }
 
@@ -336,51 +339,12 @@ void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion)
 	}
 }
 
+#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 LLPathfindingManager::agent_state_slot_t LLPathfindingManager::registerAgentStateListener(agent_state_callback_t pAgentStateCallback)
 {
 	return mAgentStateSignal.connect(pAgentStateCallback);
 }
-
-LLPathfindingManager::EAgentState LLPathfindingManager::getAgentState()
-{
-	if (!isPathfindingEnabledForCurrentRegion())
-	{
-		setAgentState(kAgentStateNotEnabled);
-	}
-	else
-	{
-		if (!isValidAgentState(mAgentState))
-		{
-			requestGetAgentState();
-		}
-	}
-
-	return mAgentState;
-}
-
-LLPathfindingManager::EAgentState LLPathfindingManager::getLastKnownNonErrorAgentState() const
-{
-	return mLastKnownNonErrorAgentState;
-}
-
-void LLPathfindingManager::requestSetAgentState(EAgentState pRequestedAgentState)
-{
-	llassert(isValidAgentState(pRequestedAgentState));
-	std::string agentStateURL = getAgentStateURLForCurrentRegion();
-
-	if (agentStateURL.empty())
-	{
-		setAgentState(kAgentStateNotEnabled);
-	}
-	else
-	{
-		LLSD request;
-		request[ALTER_NAVMESH_OBJECTS_FIELD] = static_cast<LLSD::Boolean>(pRequestedAgentState == kAgentStateUnfrozen);
-
-		LLHTTPClient::ResponderPtr responder = new AgentStateResponder(agentStateURL, pRequestedAgentState);
-		LLHTTPClient::post(agentStateURL, request, responder);
-	}
-}
+#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
 void LLPathfindingManager::requestGetLinksets(request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const
 {
@@ -623,18 +587,13 @@ LLPathfindingNavMeshPtr LLPathfindingManager::getNavMeshForRegion(LLViewerRegion
 	return getNavMeshForRegion(regionUUID);
 }
 
-bool LLPathfindingManager::isValidAgentState(EAgentState pAgentState)
-{
-	return ((pAgentState == kAgentStateFrozen) || (pAgentState == kAgentStateUnfrozen));
-}
-
+#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 void LLPathfindingManager::requestGetAgentState()
 {
 	std::string agentStateURL = getAgentStateURLForCurrentRegion();
 
 	if (agentStateURL.empty())
 	{
-		setAgentState(kAgentStateNotEnabled);
 	}
 	else
 	{
@@ -643,58 +602,25 @@ void LLPathfindingManager::requestGetAgentState()
 	}
 }
 
-void LLPathfindingManager::setAgentState(EAgentState pAgentState)
-{
-	mAgentState = pAgentState;
-
-	if (mAgentState != kAgentStateError)
-	{
-		mLastKnownNonErrorAgentState = mAgentState;
-	}
-
-	mAgentStateSignal(mAgentState);
-}
-
 void LLPathfindingManager::handleAgentStateResult(const LLSD &pContent, EAgentState pRequestedAgentState)
 {
 	llassert(pContent.has(ALTER_NAVMESH_OBJECTS_FIELD));
 	llassert(pContent.get(ALTER_NAVMESH_OBJECTS_FIELD).isBoolean());
 	EAgentState agentState = (pContent.get(ALTER_NAVMESH_OBJECTS_FIELD).asBoolean() ? kAgentStateUnfrozen : kAgentStateFrozen);
 
-	if (isValidAgentState(pRequestedAgentState) && (agentState != pRequestedAgentState))
+	if ((agentState != pRequestedAgentState))
 	{
 		agentState = kAgentStateError;
 		llassert(0);
 	}
-
-	setAgentState(agentState);
 }
 
 void LLPathfindingManager::handleAgentStateError(U32 pStatus, const std::string &pReason, const std::string &pURL)
 {
 	llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
-	setAgentState(kAgentStateError);
 }
+#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
-void LLPathfindingManager::handleAgentStateUpdate(const LLSD &pContent)
-{
-	llassert(pContent.has(ALTER_NAVMESH_OBJECTS_FIELD));
-	llassert(pContent.get(ALTER_NAVMESH_OBJECTS_FIELD).isBoolean());
-	EAgentState agentState = (pContent.get(ALTER_NAVMESH_OBJECTS_FIELD).asBoolean() ? kAgentStateUnfrozen : kAgentStateFrozen);
-
-	setAgentState(agentState);
-
-	LLSD substitutions, payload;
-	LLNotificationsUtil::add("AutomaticAgentStateUnfreeze", substitutions, payload, boost::bind(&LLPathfindingManager::handleAgentStateUserNotification, this, _1, _2));
-}
-
-void LLPathfindingManager::handleAgentStateUserNotification(const LLSD &pNotification, const LLSD &pResponse)
-{
-	if (LLNotificationsUtil::getSelectedOption(pNotification, pResponse) == 1)
-	{
-		LLWeb::loadURL(LLTrans::getString("Pathfinding_Wiki_URL"));
-	}
-}
 
 std::string LLPathfindingManager::getNavMeshStatusURLForRegion(LLViewerRegion *pRegion) const
 {
@@ -706,11 +632,6 @@ std::string LLPathfindingManager::getRetrieveNavMeshURLForRegion(LLViewerRegion
 	return getCapabilityURLForRegion(pRegion, CAP_SERVICE_RETRIEVE_NAVMESH);
 }
 
-std::string LLPathfindingManager::getAgentStateURLForCurrentRegion() const
-{
-	return getCapabilityURLForCurrentRegion(CAP_SERVICE_AGENT_STATE);
-}
-
 std::string LLPathfindingManager::getObjectLinksetsURLForCurrentRegion() const
 {
 	return getCapabilityURLForCurrentRegion(CAP_SERVICE_OBJECT_LINKSETS);
@@ -769,6 +690,7 @@ void LLNavMeshSimStateChangeNode::post(ResponsePtr pResponse, const LLSD &pConte
 	LLPathfindingManager::getInstance()->handleNavMeshStatusUpdate(navMeshStatus);
 }
 
+#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 //---------------------------------------------------------------------------
 // LLAgentStateChangeNode
 //---------------------------------------------------------------------------
@@ -782,6 +704,7 @@ void LLAgentStateChangeNode::post(ResponsePtr pResponse, const LLSD &pContext, c
 	llassert(pInput.get(SIM_MESSAGE_BODY_FIELD).isMap());
 	LLPathfindingManager::getInstance()->handleAgentStateUpdate(pInput.get(SIM_MESSAGE_BODY_FIELD));
 }
+#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
 //---------------------------------------------------------------------------
 // NavMeshStatusResponder
@@ -845,6 +768,7 @@ void NavMeshResponder::error(U32 pStatus, const std::string& pReason)
 	mNavMeshPtr->handleNavMeshError(pStatus, pReason, mCapabilityURL, mNavMeshVersion);
 }
 
+#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 //---------------------------------------------------------------------------
 // AgentStateResponder
 //---------------------------------------------------------------------------
@@ -869,6 +793,7 @@ void AgentStateResponder::error(U32 pStatus, const std::string &pReason)
 {
 	LLPathfindingManager::getInstance()->handleAgentStateError(pStatus, pReason, mCapabilityURL);
 }
+#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
 //---------------------------------------------------------------------------
 // LinksetsResponder
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 3aafef3565..40c0e6b140 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -46,24 +46,10 @@ class LLPathfindingNavMeshStatus;
 class LLPathfindingManager : public LLSingleton<LLPathfindingManager>
 {
 	friend class LLNavMeshSimStateChangeNode;
-	friend class LLAgentStateChangeNode;
 	friend class NavMeshStatusResponder;
-	friend class AgentStateResponder;
 public:
 	typedef std::map<LLUUID, LLPathfindingNavMeshPtr> NavMeshMap;
 
-	typedef enum {
-		kAgentStateUnknown,
-		kAgentStateFrozen,
-		kAgentStateUnfrozen,
-		kAgentStateNotEnabled,
-		kAgentStateError
-	} EAgentState;
-
-	typedef boost::function<void (EAgentState)>         agent_state_callback_t;
-	typedef boost::signals2::signal<void (EAgentState)> agent_state_signal_t;
-	typedef boost::signals2::connection                 agent_state_slot_t;
-
 	typedef enum {
 		kRequestStarted,
 		kRequestCompleted,
@@ -86,11 +72,6 @@ public:
 	LLPathfindingNavMesh::navmesh_slot_t registerNavMeshListenerForRegion(LLViewerRegion *pRegion, LLPathfindingNavMesh::navmesh_callback_t pNavMeshCallback);
 	void requestGetNavMeshForRegion(LLViewerRegion *pRegion);
 
-	agent_state_slot_t registerAgentStateListener(agent_state_callback_t pAgentStateCallback);
-	EAgentState        getAgentState();
-	EAgentState        getLastKnownNonErrorAgentState() const;
-	void               requestSetAgentState(EAgentState pAgentState);
-
 	typedef U32 request_id_t;
 	typedef boost::function<void (request_id_t, ERequestStatus, LLPathfindingObjectListPtr)> object_request_callback_t;
 
@@ -99,6 +80,16 @@ public:
 
 	void requestGetCharacters(request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;
 
+#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
+	friend class LLAgentStateChangeNode;
+	friend class AgentStateResponder;
+	typedef boost::function<void (EAgentState)>         agent_state_callback_t;
+	typedef boost::signals2::signal<void (EAgentState)> agent_state_signal_t;
+	typedef boost::signals2::connection                 agent_state_slot_t;
+
+	agent_state_slot_t registerAgentStateListener(agent_state_callback_t pAgentStateCallback);
+#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
+
 protected:
 
 private:
@@ -114,18 +105,8 @@ private:
 	LLPathfindingNavMeshPtr getNavMeshForRegion(const LLUUID &pRegionUUID);
 	LLPathfindingNavMeshPtr getNavMeshForRegion(LLViewerRegion *pRegion);
 
-	static bool isValidAgentState(EAgentState pAgentState);
-
-	void requestGetAgentState();
-	void setAgentState(EAgentState pAgentState);
-	void handleAgentStateResult(const LLSD &pContent, EAgentState pRequestedAgentState);
-	void handleAgentStateError(U32 pStatus, const std::string &pReason, const std::string &pURL);
-	void handleAgentStateUpdate(const LLSD &pContent);
-	void handleAgentStateUserNotification(const LLSD &pNotification, const LLSD &pResponse);
-
 	std::string getNavMeshStatusURLForRegion(LLViewerRegion *pRegion) const;
 	std::string getRetrieveNavMeshURLForRegion(LLViewerRegion *pRegion) const;
-	std::string getAgentStateURLForCurrentRegion() const;
 	std::string getObjectLinksetsURLForCurrentRegion() const;
 	std::string getTerrainLinksetsURLForCurrentRegion() const;
 	std::string getCharactersURLForCurrentRegion() const;
@@ -134,11 +115,13 @@ private:
 	std::string    getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const;
 	LLViewerRegion *getCurrentRegion() const;
 
-	NavMeshMap           mNavMeshMap;
+#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
+	void requestGetAgentState();
+	void handleAgentStateResult(const LLSD &pContent, EAgentState pRequestedAgentState);
+	void handleAgentStateError(U32 pStatus, const std::string &pReason, const std::string &pURL);
+#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
-	agent_state_signal_t mAgentStateSignal;
-	EAgentState          mAgentState;
-	EAgentState          mLastKnownNonErrorAgentState;
+	NavMeshMap mNavMeshMap;
 };
 
 #endif // LL_LLPATHFINDINGMANAGER_H
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af00d66ff9..62b2642b34 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1291,25 +1291,6 @@ The region [REGION] does not allow terraforming.
   <tag>fail</tag>
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="AutomaticAgentStateUnfreeze"
-   type="alertmodal">
-You have automatically switched into Unfrozen mode because of one of the following reasons:
-
-- You rezzed an object marked as permanent
-- You returned an object marked as permanent
-
-After you finish modifying your permanent objects, please remember to switch back to Frozen mode  from the menu option Build->Pathfinding->Basic Setup.
-    <tag>confirm</tag>
-    <usetemplate
-      name="okhelpignore"
-      yestext="OK"
-      helptext="More Info"
-      ignoretext="Launch browser to view pathfinding help"
-      />
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="CannotCopyWarning"
-- 
cgit v1.3


From de1e1db9600a03ab5b0dc3f04a5bdcee30632f05 Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Wed, 13 Jun 2012 10:50:46 -0400
Subject: WIP for path-702.

---
 indra/newview/CMakeLists.txt                       |   2 +
 indra/newview/llpanelnavmeshrebake.cpp             | 179 +++++++++++++++++++++
 indra/newview/llpanelnavmeshrebake.h               |  77 +++++++++
 indra/newview/llpathfindingmanager.cpp             |  14 +-
 indra/newview/llpathfindingmanager.h               |   6 +
 indra/newview/llviewerwindow.cpp                   |  10 +-
 .../skins/default/xui/en/panel_toolbar_view.xml    |   2 +-
 7 files changed, 286 insertions(+), 4 deletions(-)
 create mode 100644 indra/newview/llpanelnavmeshrebake.cpp
 create mode 100644 indra/newview/llpanelnavmeshrebake.h

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b47615b198..4d295ac5e5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -383,6 +383,7 @@ set(viewer_SOURCE_FILES
     llpanelmediasettingspermissions.cpp
     llpanelmediasettingssecurity.cpp
     llpanelme.cpp
+    llpanelnavmeshrebake.cpp
     llpanelnearbymedia.cpp
     llpanelobject.cpp
     llpanelobjectinventory.cpp
@@ -948,6 +949,7 @@ set(viewer_HEADER_FILES
     llpanelmediasettingspermissions.h
     llpanelmediasettingssecurity.h
     llpanelme.h
+    llpanelnavmeshrebake.h
     llpanelnearbymedia.h
     llpanelobject.h
     llpanelobjectinventory.h
diff --git a/indra/newview/llpanelnavmeshrebake.cpp b/indra/newview/llpanelnavmeshrebake.cpp
new file mode 100644
index 0000000000..99b2bf288c
--- /dev/null
+++ b/indra/newview/llpanelnavmeshrebake.cpp
@@ -0,0 +1,179 @@
+/**
+ * @file LLPanelNavMeshRebake.cpp
+ * @author 
+ * @brief
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpathfindingmanager.h"
+
+#include <string>
+#include <map>
+
+#include <boost/function.hpp>
+#include <boost/signals2.hpp>
+
+#include "llpanelnavmeshrebake.h"
+#include "llagent.h"
+#include "llfloaterreg.h"
+#include "llhints.h"
+#include "lltooltip.h"
+#include "llbutton.h"
+#include "llpanel.h"
+
+LLPanelNavMeshRebake::LLPanelNavMeshRebake() 
+: mNavMeshRebakeButton(NULL)
+, mAttached(false)
+{
+	// make sure we have the only instance of this class
+	static bool b = true;
+	llassert_always(b);
+	b=false;
+}
+
+// static
+LLPanelNavMeshRebake* LLPanelNavMeshRebake::getInstance()
+{
+	static LLPanelNavMeshRebake* panel = getPanel();
+	return panel;
+}
+
+//static
+void LLPanelNavMeshRebake::setMode( ESNavMeshRebakeMode mode )
+{
+	LLPanelNavMeshRebake* panel = getInstance();
+
+	panel->mNavMeshRebakeButton->setVisible( true );
+
+	//visibility of it should be updated after updating visibility of the buttons
+	panel->setVisible(TRUE);
+}
+
+void LLPanelNavMeshRebake::clearMode( ESNavMeshRebakeMode mode )
+{
+	LLPanelNavMeshRebake* panel = getInstance();
+	switch(mode)
+	{
+	case NMRM_Visible:
+		panel->mNavMeshRebakeButton->setVisible(FALSE);
+		break;
+	
+	default:
+		llerrs << "Unexpected mode is passed: " << mode << llendl;
+	}
+}
+
+BOOL LLPanelNavMeshRebake::postBuild()
+{
+	mNavMeshRebakeButton = getChild<LLButton>("navmesh_btn");
+	mNavMeshRebakeButton->setCommitCallback(boost::bind(&LLPanelNavMeshRebake::onNavMeshRebakeClick, this));
+	mNavMeshRebakeButton->setVisible( TRUE );
+	LLHints::registerHintTarget("navmesh_btn", mNavMeshRebakeButton->getHandle());
+
+	return TRUE;
+}
+
+void LLPanelNavMeshRebake::setVisible( BOOL visible )
+{
+
+	LLPanel::setVisible(visible);
+}
+
+BOOL LLPanelNavMeshRebake::handleToolTip(S32 x, S32 y, MASK mask)
+{
+	LLToolTipMgr::instance().unblockToolTips();
+
+	if (mNavMeshRebakeButton->getVisible())
+	{
+		LLToolTipMgr::instance().show(mNavMeshRebakeButton->getToolTip());
+	}
+	return LLPanel::handleToolTip(x, y, mask);
+}
+
+void LLPanelNavMeshRebake::reparent(LLView* rootp)
+{
+	LLPanel* parent = dynamic_cast<LLPanel*>(getParent());
+	if (!parent)
+	{
+		return;
+	}
+
+	rootp->addChild(this);
+	mAttached = true;
+}
+
+//static
+LLPanelNavMeshRebake* LLPanelNavMeshRebake::getPanel()
+{
+	LLPanelNavMeshRebake* panel = new LLPanelNavMeshRebake();
+	panel->buildFromFile("panel_navmesh_rebake.xml");
+
+	panel->setVisible(FALSE);
+
+	llinfos << "Build LLPanelNavMeshRebake panel" << llendl;
+
+	//prep#panel->updatePosition();
+	return panel;
+}
+
+void LLPanelNavMeshRebake::onNavMeshRebakeClick()
+{
+	setFocus(FALSE); 
+	mNavMeshRebakeButton->setVisible(FALSE); 
+}
+
+/**
+ * Updates position  to be center aligned with Move button.
+ */
+/*
+void LLPanelNavMeshRebake::updatePosition()
+{
+	if (mAttached) return;
+
+	S32 y_pos = 0;
+	S32 bottom_tb_center = 0;
+	if (LLToolBar* toolbar_bottom = gToolBarView->getChild<LLToolBar>("toolbar_bottom"))
+	{
+		y_pos = toolbar_bottom->getRect().getHeight();
+		bottom_tb_center = toolbar_bottom->getRect().getCenterX();
+	}
+
+	S32 left_tb_width = 0;
+	if (LLToolBar* toolbar_left = gToolBarView->getChild<LLToolBar>("toolbar_left"))
+	{
+		left_tb_width = toolbar_left->getRect().getWidth();
+	}
+
+	if(LLPanel* panel_ssf_container = getRootView()->getChild<LLPanel>("navmesh_rebake_container"))
+	{
+		panel_ssf_container->setOrigin(0, y_pos);
+	}
+
+	S32 x_pos = bottom_tb_center-getRect().getWidth()/2 - left_tb_width;
+
+	setOrigin( x_pos, 0);
+
+
+	*/
diff --git a/indra/newview/llpanelnavmeshrebake.h b/indra/newview/llpanelnavmeshrebake.h
new file mode 100644
index 0000000000..81710a140d
--- /dev/null
+++ b/indra/newview/llpanelnavmeshrebake.h
@@ -0,0 +1,77 @@
+/**
+ * @file llpanelenavmeshrebake.h
+ * @author 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_NAVMESHREBAKE_H
+#define LL_NAVMESHREBAKE_H
+
+
+class LLPanelNavMeshRebake : public LLPanel
+{
+	LOG_CLASS(LLPanelNavMeshRebake);
+
+public:
+
+	typedef enum navmesh_rebake_mode_t
+	{
+		NMRM_Visible,
+		NMRM_Visible_Waiting_Response,
+		NVRM_Hiddeb
+	} ESNavMeshRebakeMode;
+
+	void reparent( LLView* rootp );
+
+	static LLPanelNavMeshRebake* getInstance();
+	static void setMode( ESNavMeshRebakeMode mode );
+	static void clearMode( ESNavMeshRebakeMode mode );
+	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void setVisible( BOOL visible );
+
+	
+	/*virtual*/ void draw(){/*updatePosition(); */LLPanel::draw();}
+	/*virtual*/ BOOL handleToolTip( S32 x, S32 y, MASK mask );
+
+
+protected:
+	LLPanelNavMeshRebake();
+
+
+private:
+	static LLPanelNavMeshRebake* getPanel();
+	void onNavMeshRebakeClick();
+	//void updatePosition();
+
+	LLButton* mNavMeshRebakeButton;
+	
+
+	LLHandle<LLPanel> mOriginalParent;
+
+	
+	bool	mAttached;
+};
+
+#endif //LL_NAVMESHREBAKE_H
+
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index f54c9892df..6d0629698a 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -52,6 +52,7 @@
 #include "lluuid.h"
 #include "llviewerregion.h"
 #include "llweb.h"
+#include "llpanelnavmeshrebake.h"
 
 #define CAP_SERVICE_RETRIEVE_NAVMESH      "RetrieveNavMeshSrc"
 
@@ -268,7 +269,7 @@ private:
 
 LLPathfindingManager::LLPathfindingManager()
 	: LLSingleton<LLPathfindingManager>(),
-	mNavMeshMap()
+	mNavMeshMap(),mShowNavMeshRebake(false)
 {
 }
 
@@ -315,7 +316,15 @@ LLPathfindingNavMesh::navmesh_slot_t LLPathfindingManager::registerNavMeshListen
 void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion)
 {
 	LLPathfindingNavMeshPtr navMeshPtr = getNavMeshForRegion(pRegion);
-
+	//prep#s#test
+	LLView* rootp = LLUI::getRootView();
+ 	LLPanel* panel_nmr_container = rootp->getChild<LLPanel>("navmesh_rebake_container");
+	LLPanelNavMeshRebake* panel_namesh_rebake = LLPanelNavMeshRebake::getInstance();
+	panel_nmr_container->addChild( panel_namesh_rebake );
+	panel_nmr_container->setVisible( TRUE );
+	panel_namesh_rebake->reparent( rootp );
+	LLPanelNavMeshRebake::getInstance()->setVisible( TRUE );
+	//prep#e
 	if (pRegion == NULL)
 	{
 		navMeshPtr->handleNavMeshNotEnabled();
@@ -955,3 +964,4 @@ void CharactersResponder::error(U32 pStatus, const std::string &pReason)
 	LLPathfindingObjectListPtr characterListPtr =  LLPathfindingObjectListPtr(new LLPathfindingCharacterList());
 	mCharactersCallback(mRequestId, LLPathfindingManager::kRequestError, characterListPtr);
 }
+
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 40c0e6b140..635179e5a0 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -39,6 +39,8 @@
 #include "llpathfindingnavmesh.h"
 #include "llsingleton.h"
 #include "lluuid.h"
+#include "llpanel.h"
+#include "llmoveview.h"
 
 class LLViewerRegion;
 class LLPathfindingNavMeshStatus;
@@ -122,6 +124,10 @@ private:
 #endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
 	NavMeshMap mNavMeshMap;
+
+
+	BOOL mShowNavMeshRebake;
 };
 
+
 #endif // LL_LLPATHFINDINGMANAGER_H
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index ee2171fb07..4d31876bea 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -200,6 +200,9 @@
 #include "llviewerwindowlistener.h"
 #include "llpaneltopinfobar.h"
 
+//prep#
+#include "llpathfindingmanager.h"
+
 #if LL_WINDOWS
 #include <tchar.h> // For Unicode conversion methods
 #endif
@@ -1923,7 +1926,12 @@ void LLViewerWindow::initWorldUI()
 	LLPanelStandStopFlying* panel_stand_stop_flying	= LLPanelStandStopFlying::getInstance();
 	panel_ssf_container->addChild(panel_stand_stop_flying);
 	panel_ssf_container->setVisible(TRUE);
-
+	//prep#
+	/*LLPanel* panel_nmr_container = getRootView()->getChild<LLPanel>("navmesh_rebake_container");
+	LLPanelNavMeshRebake* panel_namesh_rebake	= LLPanelNavMeshRebake::getInstance();
+	panel_nmr_container->addChild(panel_namesh_rebake);
+	panel_nmr_container->setVisible(TRUE);
+	*/
 	// Load and make the toolbars visible
 	// Note: we need to load the toolbars only *after* the user is logged in and IW
 	if (gToolBarView)
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 58911bed56..107683f1f0 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -97,7 +97,7 @@
                visible="false"
                width="200"/>
       </layout_panel>
-      <layout_panel name="right_toolbar_panel"
+       <layout_panel name="right_toolbar_panel"
                     auto_resize="false"
                     height="500"
                     width="30"
-- 
cgit v1.3


From d7b9af3ab398aedde1229e081c2b245c20a3c6d5 Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Wed, 13 Jun 2012 11:08:07 -0400
Subject: path-724: xml navmesh rebake button

---
 indra/newview/llpathfindingmanager.cpp              |  2 +-
 .../skins/default/xui/en/panel_navmesh_rebake.xml   | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 6d0629698a..278269b2fa 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -318,7 +318,7 @@ void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion)
 	LLPathfindingNavMeshPtr navMeshPtr = getNavMeshForRegion(pRegion);
 	//prep#s#test
 	LLView* rootp = LLUI::getRootView();
- 	LLPanel* panel_nmr_container = rootp->getChild<LLPanel>("navmesh_rebake_container");
+	LLPanel* panel_nmr_container = rootp->getChild<LLPanel>("navmesh_rebake_container");
 	LLPanelNavMeshRebake* panel_namesh_rebake = LLPanelNavMeshRebake::getInstance();
 	panel_nmr_container->addChild( panel_namesh_rebake );
 	panel_nmr_container->setVisible( TRUE );
diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..302b7afe49
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="25"
+ layout="topleft"
+ name="panel_navmesh_rebake"
+ mouse_opaque="false"
+ visible="true"
+ width="133">
+    <button
+     follows="left|bottom"
+     height="19"
+     label="NavMeshRebake"
+     layout="topleft"
+     left="10"
+     name="navmesh_btn"
+     tool_tip="Click here to rebake."
+     top="2"
+     visible="false"
+     width="113" />
+</panel>
+
-- 
cgit v1.3


From 7d5c4d20b9f99b3e7d5781433ed6046678292627 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 13 Jun 2012 13:30:26 -0400
Subject: WIP: path-722. Posting and responders for navmesh rebaking

---
 indra/newview/llpanelnavmeshrebake.cpp |  3 +-
 indra/newview/llpathfindingmanager.cpp | 95 ++++++++++++++++++++++++++++++----
 indra/newview/llpathfindingmanager.h   |  8 +++
 3 files changed, 95 insertions(+), 11 deletions(-)

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/indra/newview/llpanelnavmeshrebake.cpp b/indra/newview/llpanelnavmeshrebake.cpp
index 9281c08059..92a082467f 100644
--- a/indra/newview/llpanelnavmeshrebake.cpp
+++ b/indra/newview/llpanelnavmeshrebake.cpp
@@ -96,7 +96,6 @@ BOOL LLPanelNavMeshRebake::postBuild()
 	
 	//Baking
 	mNavMeshBakingButton = getChild<LLButton>("navmesh_btn_baking");
-	mNavMeshBakingButton->setCommitCallback(boost::bind(&LLPanelNavMeshRebake::onNavMeshRebakeClick, this));
 	mNavMeshBakingButton->setVisible( FALSE );
 	LLHints::registerHintTarget("navmesh_btn_baking", mNavMeshBakingButton->getHandle());
 	return TRUE;
@@ -146,6 +145,8 @@ void LLPanelNavMeshRebake::onNavMeshRebakeClick()
 	setFocus(FALSE); 
 	mNavMeshRebakeButton->setVisible( FALSE ); 
 	mNavMeshBakingButton->setVisible( TRUE ); 
+	mNavMeshBakingButton->setForcePressedState( TRUE );
+	//post 
 }
 
 /**
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 278269b2fa..fc296a4b83 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -162,6 +162,23 @@ private:
 };
 #endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
+//---------------------------------------------------------------------------
+// NavMeshRebakeResponder
+//---------------------------------------------------------------------------
+class NavMeshRebakeResponder : public LLHTTPClient::Responder
+{
+public:
+	NavMeshRebakeResponder( const std::string &pCapabilityURL );
+	virtual ~NavMeshRebakeResponder();
+
+	virtual void result( const LLSD &pContent );
+	virtual void error( U32 pStatus, const std::string& pReason );
+
+protected:
+
+private:
+	std::string                       mCapabilityURL;
+};
 //---------------------------------------------------------------------------
 // LinksetsResponder
 //---------------------------------------------------------------------------
@@ -269,7 +286,7 @@ private:
 
 LLPathfindingManager::LLPathfindingManager()
 	: LLSingleton<LLPathfindingManager>(),
-	mNavMeshMap(),mShowNavMeshRebake(false)
+	mNavMeshMap(), mShowNavMeshRebake(false)
 {
 }
 
@@ -316,15 +333,7 @@ LLPathfindingNavMesh::navmesh_slot_t LLPathfindingManager::registerNavMeshListen
 void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion)
 {
 	LLPathfindingNavMeshPtr navMeshPtr = getNavMeshForRegion(pRegion);
-	//prep#s#test
-	LLView* rootp = LLUI::getRootView();
-	LLPanel* panel_nmr_container = rootp->getChild<LLPanel>("navmesh_rebake_container");
-	LLPanelNavMeshRebake* panel_namesh_rebake = LLPanelNavMeshRebake::getInstance();
-	panel_nmr_container->addChild( panel_namesh_rebake );
-	panel_nmr_container->setVisible( TRUE );
-	panel_namesh_rebake->reparent( rootp );
-	LLPanelNavMeshRebake::getInstance()->setVisible( TRUE );
-	//prep#e
+	
 	if (pRegion == NULL)
 	{
 		navMeshPtr->handleNavMeshNotEnabled();
@@ -684,6 +693,50 @@ LLViewerRegion *LLPathfindingManager::getCurrentRegion() const
 	return gAgent.getRegion();
 }
 
+void LLPathfindingManager::displayNavMeshRebakePanel()
+{
+	LLView* rootp = LLUI::getRootView();
+	LLPanel* panel_nmr_container = rootp->getChild<LLPanel>("navmesh_rebake_container");
+	LLPanelNavMeshRebake* panel_namesh_rebake = LLPanelNavMeshRebake::getInstance();
+	panel_nmr_container->addChild( panel_namesh_rebake );
+	panel_nmr_container->setVisible( TRUE );
+	panel_namesh_rebake->reparent( rootp );
+	LLPanelNavMeshRebake::getInstance()->setVisible( TRUE );
+}
+
+void  LLPathfindingManager::hideNavMeshRebakePanel()
+{
+	LLPanelNavMeshRebake::getInstance()->setVisible( FALSE );
+}
+
+void LLPathfindingManager::handleNavMeshRebakeResult( const LLSD &pContent )
+{
+
+}
+
+void LLPathfindingManager::handleNavMeshRebakeError(U32 pStatus, const std::string &pReason, const std::string &pURL)
+{
+	llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
+}
+//prep#
+void LLPathfindingManager::triggerNavMeshRebuild()
+{
+	LLSD mPostData;
+	std::string url = getNavMeshStatusURLForRegion( getCurrentRegion() );
+
+	if ( url.empty() )
+	{
+		//prep#fix#error?
+	}
+	else
+	{
+		LLSD mPostData;			
+		mPostData["command"] = "rebuild";
+		LLHTTPClient::ResponderPtr responder = new NavMeshRebakeResponder( url );
+		LLHTTPClient::post( url, mPostData, responder );
+	}
+
+}
 //---------------------------------------------------------------------------
 // LLNavMeshSimStateChangeNode
 //---------------------------------------------------------------------------
@@ -804,6 +857,28 @@ void AgentStateResponder::error(U32 pStatus, const std::string &pReason)
 }
 #endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
+//---------------------------------------------------------------------------
+// navmesh rebake responder
+//---------------------------------------------------------------------------
+NavMeshRebakeResponder::NavMeshRebakeResponder(const std::string &pCapabilityURL )
+: LLHTTPClient::Responder()
+, mCapabilityURL( pCapabilityURL )
+{
+}
+
+NavMeshRebakeResponder::~NavMeshRebakeResponder()
+{
+}
+
+void NavMeshRebakeResponder::result(const LLSD &pContent)
+{
+	LLPathfindingManager::getInstance()->handleNavMeshRebakeResult( pContent );
+}
+
+void NavMeshRebakeResponder::error(U32 pStatus, const std::string &pReason)
+{
+	LLPathfindingManager::getInstance()->handleNavMeshRebakeError( pStatus, pReason, mCapabilityURL );
+}
 //---------------------------------------------------------------------------
 // LinksetsResponder
 //---------------------------------------------------------------------------
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 635179e5a0..535c681499 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -92,6 +92,9 @@ public:
 	agent_state_slot_t registerAgentStateListener(agent_state_callback_t pAgentStateCallback);
 #endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
+	void handleNavMeshRebakeResult( const LLSD &pContent );
+	void handleNavMeshRebakeError(U32 pStatus, const std::string &pReason, const std::string &pURL);
+
 protected:
 
 private:
@@ -117,6 +120,11 @@ private:
 	std::string    getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const;
 	LLViewerRegion *getCurrentRegion() const;
 
+	
+	void displayNavMeshRebakePanel();
+	void hideNavMeshRebakePanel();	
+	void triggerNavMeshRebuild();
+
 #ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 	void requestGetAgentState();
 	void handleAgentStateResult(const LLSD &pContent, EAgentState pRequestedAgentState);
-- 
cgit v1.3


From 9767b5a026ba1b442ad1aa438f5957375a997c14 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 13 Jun 2012 15:31:44 -0400
Subject: Path-722: Reset buttons to default state.

---
 indra/newview/llpanelnavmeshrebake.cpp | 90 +++++-----------------------------
 indra/newview/llpanelnavmeshrebake.h   | 20 +++-----
 indra/newview/llpathfindingmanager.cpp | 20 ++++----
 indra/newview/llpathfindingmanager.h   |  4 +-
 indra/newview/llviewerwindow.cpp       | 10 +---
 5 files changed, 33 insertions(+), 111 deletions(-)

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/indra/newview/llpanelnavmeshrebake.cpp b/indra/newview/llpanelnavmeshrebake.cpp
index 92a082467f..0f88c6f1d3 100644
--- a/indra/newview/llpanelnavmeshrebake.cpp
+++ b/indra/newview/llpanelnavmeshrebake.cpp
@@ -1,7 +1,7 @@
 /**
  * @file LLPanelNavMeshRebake.cpp
- * @author 
- * @brief
+ * @author prep
+ * @brief handles the buttons for navmesh rebaking
  *
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -26,18 +26,13 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-
 #include "llpathfindingmanager.h"
-
 #include <string>
 #include <map>
-
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>
-
 #include "llpanelnavmeshrebake.h"
 #include "llagent.h"
-#include "llfloaterreg.h"
 #include "llhints.h"
 #include "lltooltip.h"
 #include "llbutton.h"
@@ -46,7 +41,6 @@
 LLPanelNavMeshRebake::LLPanelNavMeshRebake() 
 : mNavMeshRebakeButton( NULL )
 , mNavMeshBakingButton( NULL )
-, mAttached(false)
 {
 	// make sure we have the only instance of this class
 	static bool b = true;
@@ -54,47 +48,21 @@ LLPanelNavMeshRebake::LLPanelNavMeshRebake()
 	b=false;
 }
 
-// static
 LLPanelNavMeshRebake* LLPanelNavMeshRebake::getInstance()
 {
 	static LLPanelNavMeshRebake* panel = getPanel();
 	return panel;
 }
 
-//static
-void LLPanelNavMeshRebake::setMode( ESNavMeshRebakeMode mode )
-{
-	LLPanelNavMeshRebake* panel = getInstance();
-
-	panel->mNavMeshRebakeButton->setVisible( true );
-
-	//visibility of it should be updated after updating visibility of the buttons
-	panel->setVisible(TRUE);
-}
-
-void LLPanelNavMeshRebake::clearMode( ESNavMeshRebakeMode mode )
-{
-	LLPanelNavMeshRebake* panel = getInstance();
-	switch(mode)
-	{
-	case NMRM_Visible:
-		panel->mNavMeshRebakeButton->setVisible(FALSE);
-		break;
-	
-	default:
-		llerrs << "Unexpected mode is passed: " << mode << llendl;
-	}
-}
-
 BOOL LLPanelNavMeshRebake::postBuild()
 {
-	//Rebake
+	//Rebake initiated
 	mNavMeshRebakeButton = getChild<LLButton>("navmesh_btn");
 	mNavMeshRebakeButton->setCommitCallback(boost::bind(&LLPanelNavMeshRebake::onNavMeshRebakeClick, this));
 	mNavMeshRebakeButton->setVisible( TRUE );
 	LLHints::registerHintTarget("navmesh_btn", mNavMeshRebakeButton->getHandle());
 	
-	//Baking
+	//Baking...
 	mNavMeshBakingButton = getChild<LLButton>("navmesh_btn_baking");
 	mNavMeshBakingButton->setVisible( FALSE );
 	LLHints::registerHintTarget("navmesh_btn_baking", mNavMeshBakingButton->getHandle());
@@ -103,11 +71,10 @@ BOOL LLPanelNavMeshRebake::postBuild()
 
 void LLPanelNavMeshRebake::setVisible( BOOL visible )
 {
-
 	LLPanel::setVisible(visible);
 }
 
-BOOL LLPanelNavMeshRebake::handleToolTip(S32 x, S32 y, MASK mask)
+BOOL LLPanelNavMeshRebake::handleToolTip( S32 x, S32 y, MASK mask )
 {
 	LLToolTipMgr::instance().unblockToolTips();
 
@@ -118,67 +85,36 @@ BOOL LLPanelNavMeshRebake::handleToolTip(S32 x, S32 y, MASK mask)
 	return LLPanel::handleToolTip(x, y, mask);
 }
 
-void LLPanelNavMeshRebake::reparent(LLView* rootp)
+void LLPanelNavMeshRebake::reparent( LLView* rootp )
 {
-	LLPanel* parent = dynamic_cast<LLPanel*>(getParent());
+	LLPanel* parent = dynamic_cast<LLPanel*>( getParent() );
 	if (!parent)
 	{
 		return;
 	}
-
 	rootp->addChild(this);
-	mAttached = true;
 }
 
-//static
 LLPanelNavMeshRebake* LLPanelNavMeshRebake::getPanel()
 {
 	LLPanelNavMeshRebake* panel = new LLPanelNavMeshRebake();
 	panel->buildFromFile("panel_navmesh_rebake.xml");
 	panel->setVisible(FALSE);
-	//prep#panel->updatePosition();
+	//panel->updatePosition();
 	return panel;
 }
 
 void LLPanelNavMeshRebake::onNavMeshRebakeClick()
 {
-	setFocus(FALSE); 
 	mNavMeshRebakeButton->setVisible( FALSE ); 
 	mNavMeshBakingButton->setVisible( TRUE ); 
 	mNavMeshBakingButton->setForcePressedState( TRUE );
-	//post 
+	LLPathfindingManager::getInstance()->triggerNavMeshRebuild();
 }
 
-/**
- * Updates position  to be center aligned with Move button.
- */
-/*
-void LLPanelNavMeshRebake::updatePosition()
+void LLPanelNavMeshRebake::resetButtonStates()
 {
-	if (mAttached) return;
-
-	S32 y_pos = 0;
-	S32 bottom_tb_center = 0;
-	if (LLToolBar* toolbar_bottom = gToolBarView->getChild<LLToolBar>("toolbar_bottom"))
-	{
-		y_pos = toolbar_bottom->getRect().getHeight();
-		bottom_tb_center = toolbar_bottom->getRect().getCenterX();
-	}
-
-	S32 left_tb_width = 0;
-	if (LLToolBar* toolbar_left = gToolBarView->getChild<LLToolBar>("toolbar_left"))
-	{
-		left_tb_width = toolbar_left->getRect().getWidth();
-	}
-
-	if(LLPanel* panel_ssf_container = getRootView()->getChild<LLPanel>("navmesh_rebake_container"))
-	{
-		panel_ssf_container->setOrigin(0, y_pos);
-	}
-
-	S32 x_pos = bottom_tb_center-getRect().getWidth()/2 - left_tb_width;
-
-	setOrigin( x_pos, 0);
-
+	mNavMeshRebakeButton->setVisible( TRUE ); 
+	mNavMeshBakingButton->setVisible( FALSE ); 
+}
 
-	*/
diff --git a/indra/newview/llpanelnavmeshrebake.h b/indra/newview/llpanelnavmeshrebake.h
index 12a3902d8b..4e2381b6d6 100644
--- a/indra/newview/llpanelnavmeshrebake.h
+++ b/indra/newview/llpanelnavmeshrebake.h
@@ -1,7 +1,7 @@
 /**
  * @file llpanelenavmeshrebake.h
- * @author 
- * @brief 
+ * @author prep
+ * @brief handles the buttons for navmesh rebaking
  *
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -31,6 +31,7 @@
 
 class LLPanelNavMeshRebake : public LLPanel
 {
+
 	LOG_CLASS(LLPanelNavMeshRebake);
 
 public:
@@ -43,10 +44,9 @@ public:
 	} ESNavMeshRebakeMode;
 
 	void reparent( LLView* rootp );
-
+	void resetButtonStates();
 	static LLPanelNavMeshRebake* getInstance();
-	static void setMode( ESNavMeshRebakeMode mode );
-	static void clearMode( ESNavMeshRebakeMode mode );
+	
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ void setVisible( BOOL visible );
 
@@ -54,10 +54,9 @@ public:
 	/*virtual*/ void draw(){/*updatePosition(); */LLPanel::draw();}
 	/*virtual*/ BOOL handleToolTip( S32 x, S32 y, MASK mask );
 
-
 protected:
-	LLPanelNavMeshRebake();
 
+	LLPanelNavMeshRebake();
 
 private:
 	static LLPanelNavMeshRebake* getPanel();
@@ -65,13 +64,10 @@ private:
 	//void updatePosition();
 
 	LLButton* mNavMeshRebakeButton;
-	LLButton* mNavMeshBakingButton;
-	
-
-	LLHandle<LLPanel> mOriginalParent;
+	LLButton* mNavMeshBakingButton;	
 
+	LLHandle<LLPanel> mOriginalParent;	
 	
-	bool	mAttached;
 };
 
 #endif //LL_NAVMESHREBAKE_H
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index fc296a4b83..7ce34fcfcb 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -333,7 +333,7 @@ LLPathfindingNavMesh::navmesh_slot_t LLPathfindingManager::registerNavMeshListen
 void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion)
 {
 	LLPathfindingNavMeshPtr navMeshPtr = getNavMeshForRegion(pRegion);
-	
+
 	if (pRegion == NULL)
 	{
 		navMeshPtr->handleNavMeshNotEnabled();
@@ -702,31 +702,30 @@ void LLPathfindingManager::displayNavMeshRebakePanel()
 	panel_nmr_container->setVisible( TRUE );
 	panel_namesh_rebake->reparent( rootp );
 	LLPanelNavMeshRebake::getInstance()->setVisible( TRUE );
+	LLPanelNavMeshRebake::getInstance()->resetButtonStates();
 }
 
-void  LLPathfindingManager::hideNavMeshRebakePanel()
+void LLPathfindingManager::hideNavMeshRebakePanel()
 {
 	LLPanelNavMeshRebake::getInstance()->setVisible( FALSE );
 }
 
-void LLPathfindingManager::handleNavMeshRebakeResult( const LLSD &pContent )
+void LLPathfindingManager::handleNavMeshRebakeError(U32 pStatus, const std::string &pReason, const std::string &pURL)
 {
-
+	llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
 }
 
-void LLPathfindingManager::handleNavMeshRebakeError(U32 pStatus, const std::string &pReason, const std::string &pURL)
+void LLPathfindingManager::handleNavMeshRebakeResult( const LLSD &pContent )
 {
-	llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
+	hideNavMeshRebakePanel();
 }
-//prep#
+
 void LLPathfindingManager::triggerNavMeshRebuild()
 {
-	LLSD mPostData;
 	std::string url = getNavMeshStatusURLForRegion( getCurrentRegion() );
-
 	if ( url.empty() )
 	{
-		//prep#fix#error?
+		llwarns << "Error with request due to nonexistent URL"<<llendl;
 	}
 	else
 	{
@@ -735,7 +734,6 @@ void LLPathfindingManager::triggerNavMeshRebuild()
 		LLHTTPClient::ResponderPtr responder = new NavMeshRebakeResponder( url );
 		LLHTTPClient::post( url, mPostData, responder );
 	}
-
 }
 //---------------------------------------------------------------------------
 // LLNavMeshSimStateChangeNode
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 535c681499..b4bfbc7a34 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -93,7 +93,8 @@ public:
 #endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
 	void handleNavMeshRebakeResult( const LLSD &pContent );
-	void handleNavMeshRebakeError(U32 pStatus, const std::string &pReason, const std::string &pURL);
+	void handleNavMeshRebakeError( U32 pStatus, const std::string &pReason, const std::string &pURL );
+	void triggerNavMeshRebuild();
 
 protected:
 
@@ -123,7 +124,6 @@ private:
 	
 	void displayNavMeshRebakePanel();
 	void hideNavMeshRebakePanel();	
-	void triggerNavMeshRebuild();
 
 #ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 	void requestGetAgentState();
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 4d31876bea..8bdab7d27a 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -200,9 +200,6 @@
 #include "llviewerwindowlistener.h"
 #include "llpaneltopinfobar.h"
 
-//prep#
-#include "llpathfindingmanager.h"
-
 #if LL_WINDOWS
 #include <tchar.h> // For Unicode conversion methods
 #endif
@@ -1926,12 +1923,7 @@ void LLViewerWindow::initWorldUI()
 	LLPanelStandStopFlying* panel_stand_stop_flying	= LLPanelStandStopFlying::getInstance();
 	panel_ssf_container->addChild(panel_stand_stop_flying);
 	panel_ssf_container->setVisible(TRUE);
-	//prep#
-	/*LLPanel* panel_nmr_container = getRootView()->getChild<LLPanel>("navmesh_rebake_container");
-	LLPanelNavMeshRebake* panel_namesh_rebake	= LLPanelNavMeshRebake::getInstance();
-	panel_nmr_container->addChild(panel_namesh_rebake);
-	panel_nmr_container->setVisible(TRUE);
-	*/
+	
 	// Load and make the toolbars visible
 	// Note: we need to load the toolbars only *after* the user is logged in and IW
 	if (gToolBarView)
-- 
cgit v1.3


From f6153ab73508ad972827950e0276dfd2a8e79bf1 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Thu, 14 Jun 2012 16:58:11 -0400
Subject: WIP: path-722. Some agent_state_updates come through (god mode),
 region crossings, cleanup logic is a TBD, etc..

---
 etc/message.xml                          |   2 +-
 indra/newview/llpathfindingmanager.cpp   | 100 +++++++++++++++----------------
 indra/newview/llpathfindingmanager.h     |  27 +++++----
 indra/newview/llpathfindingnavmeshzone.h |   2 +-
 indra/newview/llviewerregion.cpp         |   2 +-
 5 files changed, 68 insertions(+), 65 deletions(-)

(limited to 'indra/newview/llpathfindingmanager.cpp')

diff --git a/etc/message.xml b/etc/message.xml
index 7dcf99f307..7b133ab205 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -555,7 +555,7 @@
           <boolean>true</boolean>
         </map>
 
-        <key>AgentPreferencesUpdate</key>
+        <key>AgentStateUpdate</key>
         <map>
           <key>flavor</key>
           <string>llsd</string>
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 7ce34fcfcb..16283282fb 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -53,6 +53,7 @@
 #include "llviewerregion.h"
 #include "llweb.h"
 #include "llpanelnavmeshrebake.h"
+#include "llenvmanager.h"
 
 #define CAP_SERVICE_RETRIEVE_NAVMESH      "RetrieveNavMeshSrc"
 
@@ -66,11 +67,9 @@
 #define SIM_MESSAGE_NAVMESH_STATUS_UPDATE "/message/NavMeshStatusUpdate"
 #define SIM_MESSAGE_BODY_FIELD            "body"
 
-#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
-#define CAP_SERVICE_AGENT_STATE     "AgentPreferences"
-#define ALTER_NAVMESH_OBJECTS_FIELD "alter_navmesh_objects"
-#define SIM_MESSAGE_AGENT_STATE_UPDATE    "/message/AgentPreferencesUpdate"
-#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
+#define CAP_SERVICE_AGENT_STATE				"AgentState"
+#define ALTER_NAVMESH_OBJECTS_FIELD			"alter_navmesh_objects"
+#define SIM_MESSAGE_AGENT_STATE_UPDATE		"/message/AgentStateUpdate"
 
 //---------------------------------------------------------------------------
 // LLNavMeshSimStateChangeNode
@@ -84,11 +83,10 @@ public:
 
 LLHTTPRegistration<LLNavMeshSimStateChangeNode> gHTTPRegistrationNavMeshSimStateChangeNode(SIM_MESSAGE_NAVMESH_STATUS_UPDATE);
 
-#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
+
 //---------------------------------------------------------------------------
 // LLAgentStateChangeNode
 //---------------------------------------------------------------------------
-
 class LLAgentStateChangeNode : public LLHTTPNode
 {
 public:
@@ -96,7 +94,6 @@ public:
 };
 
 LLHTTPRegistration<LLAgentStateChangeNode> gHTTPRegistrationAgentStateChangeNode(SIM_MESSAGE_AGENT_STATE_UPDATE);
-#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
 //---------------------------------------------------------------------------
 // NavMeshStatusResponder
@@ -140,7 +137,6 @@ private:
 	LLPathfindingNavMeshPtr mNavMeshPtr;
 };
 
-#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 //---------------------------------------------------------------------------
 // AgentStateResponder
 //---------------------------------------------------------------------------
@@ -148,7 +144,7 @@ private:
 class AgentStateResponder : public LLHTTPClient::Responder
 {
 public:
-	AgentStateResponder(const std::string &pCapabilityURL, LLPathfindingManager::EAgentState pRequestedAgentState = LLPathfindingManager::kAgentStateUnknown);
+	AgentStateResponder(const std::string &pCapabilityURL);
 	virtual ~AgentStateResponder();
 
 	virtual void result(const LLSD &pContent);
@@ -158,9 +154,8 @@ protected:
 
 private:
 	std::string                       mCapabilityURL;
-	LLPathfindingManager::EAgentState mRequestedAgentState;
 };
-#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
+
 
 //---------------------------------------------------------------------------
 // NavMeshRebakeResponder
@@ -286,12 +281,27 @@ private:
 
 LLPathfindingManager::LLPathfindingManager()
 	: LLSingleton<LLPathfindingManager>(),
-	mNavMeshMap(), mShowNavMeshRebake(false)
+	mNavMeshMap(),
+	mShowNavMeshRebake(false),
+	mCrossingSlot()
 {
+	if ( !mCrossingSlot.connected() )
+	{
+		mCrossingSlot = LLEnvManagerNew::getInstance()->setRegionChangeCallback(boost::bind(&LLPathfindingManager::onRegionBoundaryCrossed, this));
+	}
+}
+
+void LLPathfindingManager::onRegionBoundaryCrossed()
+{ 
+	displayNavMeshRebakePanel();
 }
 
 LLPathfindingManager::~LLPathfindingManager()
-{
+{	
+	if (mCrossingSlot.connected())
+	{
+		mCrossingSlot.disconnect();
+	}
 }
 
 void LLPathfindingManager::initSystem()
@@ -357,12 +367,11 @@ void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion)
 	}
 }
 
-#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 LLPathfindingManager::agent_state_slot_t LLPathfindingManager::registerAgentStateListener(agent_state_callback_t pAgentStateCallback)
 {
 	return mAgentStateSignal.connect(pAgentStateCallback);
 }
-#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
+
 
 void LLPathfindingManager::requestGetLinksets(request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const
 {
@@ -605,39 +614,31 @@ LLPathfindingNavMeshPtr LLPathfindingManager::getNavMeshForRegion(LLViewerRegion
 	return getNavMeshForRegion(regionUUID);
 }
 
-#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 void LLPathfindingManager::requestGetAgentState()
 {
-	std::string agentStateURL = getAgentStateURLForCurrentRegion();
+	std::string agentStateURL = getAgentStateURLForCurrentRegion( getCurrentRegion() );
 
-	if (agentStateURL.empty())
-	{
-	}
-	else
+	if ( !agentStateURL.empty() )
 	{
-		LLHTTPClient::ResponderPtr responder = new AgentStateResponder(agentStateURL);
-		LLHTTPClient::get(agentStateURL, responder);
+		LLHTTPClient::ResponderPtr responder = new AgentStateResponder( agentStateURL );
+		LLHTTPClient::get( agentStateURL, responder );
 	}
 }
 
-void LLPathfindingManager::handleAgentStateResult(const LLSD &pContent, EAgentState pRequestedAgentState)
-{
-	llassert(pContent.has(ALTER_NAVMESH_OBJECTS_FIELD));
-	llassert(pContent.get(ALTER_NAVMESH_OBJECTS_FIELD).isBoolean());
-	EAgentState agentState = (pContent.get(ALTER_NAVMESH_OBJECTS_FIELD).asBoolean() ? kAgentStateUnfrozen : kAgentStateFrozen);
-
-	if ((agentState != pRequestedAgentState))
-	{
-		agentState = kAgentStateError;
-		llassert(0);
-	}
+void LLPathfindingManager::handleAgentStateResult(const LLSD &pContent) 
+{	
+	displayNavMeshRebakePanel();
 }
 
 void LLPathfindingManager::handleAgentStateError(U32 pStatus, const std::string &pReason, const std::string &pURL)
 {
 	llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
 }
-#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
+
+std::string LLPathfindingManager::getAgentStateURLForCurrentRegion(LLViewerRegion *pRegion) const
+{
+	return getCapabilityURLForRegion( pRegion, CAP_SERVICE_AGENT_STATE );
+}
 
 
 std::string LLPathfindingManager::getNavMeshStatusURLForRegion(LLViewerRegion *pRegion) const
@@ -750,21 +751,19 @@ void LLNavMeshSimStateChangeNode::post(ResponsePtr pResponse, const LLSD &pConte
 	LLPathfindingManager::getInstance()->handleNavMeshStatusUpdate(navMeshStatus);
 }
 
-#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 //---------------------------------------------------------------------------
 // LLAgentStateChangeNode
 //---------------------------------------------------------------------------
 
 void LLAgentStateChangeNode::post(ResponsePtr pResponse, const LLSD &pContext, const LLSD &pInput) const
 {
-#ifdef XXX_STINSON_DEBUG_NAVMESH_ZONE
-	llinfos << "STINSON DEBUG: Received AgentPreferencesUpdate: " << pInput << llendl;
-#endif // XXX_STINSON_DEBUG_NAVMESH_ZONE
-	llassert(pInput.has(SIM_MESSAGE_BODY_FIELD));
-	llassert(pInput.get(SIM_MESSAGE_BODY_FIELD).isMap());
-	LLPathfindingManager::getInstance()->handleAgentStateUpdate(pInput.get(SIM_MESSAGE_BODY_FIELD));
+	LLPathfindingManager::getInstance()->handleAgentStateUpdate();
+}
+
+void LLPathfindingManager::handleAgentStateUpdate()
+{
+	displayNavMeshRebakePanel();
 }
-#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
 //---------------------------------------------------------------------------
 // NavMeshStatusResponder
@@ -828,15 +827,13 @@ void NavMeshResponder::error(U32 pStatus, const std::string& pReason)
 	mNavMeshPtr->handleNavMeshError(pStatus, pReason, mCapabilityURL, mNavMeshVersion);
 }
 
-#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 //---------------------------------------------------------------------------
 // AgentStateResponder
 //---------------------------------------------------------------------------
 
-AgentStateResponder::AgentStateResponder(const std::string &pCapabilityURL, LLPathfindingManager::EAgentState pRequestedAgentState)
-	: LLHTTPClient::Responder(),
-	mCapabilityURL(pCapabilityURL),
-	mRequestedAgentState(pRequestedAgentState)
+AgentStateResponder::AgentStateResponder(const std::string &pCapabilityURL)
+: LLHTTPClient::Responder()
+, mCapabilityURL(pCapabilityURL)
 {
 }
 
@@ -846,14 +843,14 @@ AgentStateResponder::~AgentStateResponder()
 
 void AgentStateResponder::result(const LLSD &pContent)
 {
-	LLPathfindingManager::getInstance()->handleAgentStateResult(pContent, mRequestedAgentState);
+	LLPathfindingManager::getInstance()->handleAgentStateResult(pContent);
 }
 
 void AgentStateResponder::error(U32 pStatus, const std::string &pReason)
 {
 	LLPathfindingManager::getInstance()->handleAgentStateError(pStatus, pReason, mCapabilityURL);
 }
-#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
+
 
 //---------------------------------------------------------------------------
 // navmesh rebake responder
@@ -877,6 +874,7 @@ void NavMeshRebakeResponder::error(U32 pStatus, const std::string &pReason)
 {
 	LLPathfindingManager::getInstance()->handleNavMeshRebakeError( pStatus, pReason, mCapabilityURL );
 }
+
 //---------------------------------------------------------------------------
 // LinksetsResponder
 //---------------------------------------------------------------------------
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index b4bfbc7a34..309d7513c6 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -82,19 +82,22 @@ public:
 
 	void requestGetCharacters(request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;
 
-#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
 	friend class LLAgentStateChangeNode;
 	friend class AgentStateResponder;
-	typedef boost::function<void (EAgentState)>         agent_state_callback_t;
-	typedef boost::signals2::signal<void (EAgentState)> agent_state_signal_t;
-	typedef boost::signals2::connection                 agent_state_slot_t;
+	
+	typedef boost::function< void () >				agent_state_callback_t;
+	typedef boost::signals2::signal< void () >		agent_state_signal_t;
+	typedef boost::signals2::connection				agent_state_slot_t;	
+
+	agent_state_slot_t								mCrossingSlot;
+	agent_state_signal_t							mAgentStateSignal;
 
 	agent_state_slot_t registerAgentStateListener(agent_state_callback_t pAgentStateCallback);
-#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
 
 	void handleNavMeshRebakeResult( const LLSD &pContent );
 	void handleNavMeshRebakeError( U32 pStatus, const std::string &pReason, const std::string &pURL );
 	void triggerNavMeshRebuild();
+	void onRegionBoundaryCrossed();
 
 protected:
 
@@ -108,6 +111,8 @@ private:
 	void handleNavMeshStatusRequest(const LLPathfindingNavMeshStatus &pNavMeshStatus, LLViewerRegion *pRegion);
 	void handleNavMeshStatusUpdate(const LLPathfindingNavMeshStatus &pNavMeshStatus);
 
+	void handleAgentStateUpdate();
+
 	LLPathfindingNavMeshPtr getNavMeshForRegion(const LLUUID &pRegionUUID);
 	LLPathfindingNavMeshPtr getNavMeshForRegion(LLViewerRegion *pRegion);
 
@@ -116,20 +121,20 @@ private:
 	std::string getObjectLinksetsURLForCurrentRegion() const;
 	std::string getTerrainLinksetsURLForCurrentRegion() const;
 	std::string getCharactersURLForCurrentRegion() const;
-
-	std::string    getCapabilityURLForCurrentRegion(const std::string &pCapabilityName) const;
-	std::string    getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const;
+	std::string	getAgentStateURLForCurrentRegion(LLViewerRegion *pRegion) const;
+	std::string getCapabilityURLForCurrentRegion(const std::string &pCapabilityName) const;
+	std::string getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const;
 	LLViewerRegion *getCurrentRegion() const;
 
 	
 	void displayNavMeshRebakePanel();
 	void hideNavMeshRebakePanel();	
 
-#ifdef XXX_STINSON_AGENT_STATE_DELETE_ME
+
 	void requestGetAgentState();
-	void handleAgentStateResult(const LLSD &pContent, EAgentState pRequestedAgentState);
+	void handleAgentStateResult(const LLSD &pContent );//, EAgentState pRequestedAgentState);
 	void handleAgentStateError(U32 pStatus, const std::string &pReason, const std::string &pURL);
-#endif // XXX_STINSON_AGENT_STATE_DELETE_ME
+
 
 	NavMeshMap mNavMeshMap;
 
diff --git a/indra/newview/llpathfindingnavmeshzone.h b/indra/newview/llpathfindingnavmeshzone.h
index 1e92f6b131..679e72c978 100644
--- a/indra/newview/llpathfindingnavmeshzone.h
+++ b/indra/newview/llpathfindingnavmeshzone.h
@@ -69,7 +69,7 @@ public:
 
 	typedef boost::function<void (ENavMeshZoneRequestStatus)>         navmesh_zone_callback_t;
 	typedef boost::signals2::signal<void (ENavMeshZoneRequestStatus)> navmesh_zone_signal_t;
-	typedef boost::signals2::connection                                                   navmesh_zone_slot_t;
+	typedef boost::signals2::connection                               navmesh_zone_slot_t;
 
 	LLPathfindingNavMeshZone();
 	virtual ~LLPathfindingNavMeshZone();
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index a7617b1028..204cd2a57a 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1490,7 +1490,7 @@ void LLViewerRegion::unpackRegionHandshake()
 
 void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 {
-	capabilityNames.append("AgentPreferences");
+	capabilityNames.append("AgentState");
 	capabilityNames.append("AttachmentResources");
 	capabilityNames.append("AvatarPickerSearch");
 	capabilityNames.append("CharacterProperties");
-- 
cgit v1.3