PATH-198: Laid out the pathfinding buttons per Leo's design. Functionality is currently hooked up to stubs that report a warning message about lack of implementation.

1 files changed, 23 insertions, 1 deletions

diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 12eea7844d..1b629f515b 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -68,6 +68,7 @@
 #include "llworld.h"
 #include "pipeline.h"
 #include "llviewershadermgr.h"
+#include "llradiogroup.h"
 
 #include "lldrawpool.h"
 #include "lluictrlfactory.h"
@@ -158,6 +159,14 @@ BOOL	LLPanelVolume::postBuild()
 		mSpinPhysicsRestitution->setCommitCallback(boost::bind(&LLPanelVolume::sendPhysicsRestitution, this, _1, mSpinPhysicsRestitution));
 	}
 
+	// Pathfinding Parameters
+	{
+		// Pathfinding state
+		mPathfindingType = findChild<LLRadioGroup>("edit_pathfinding_state");
+		llassert(mPathfindingType != NULL);
+		mPathfindingType->setCommitCallback(boost::bind(&LLPanelVolume::sendPathfindingType, this));
+	}
+
 	std::map<std::string, std::string> material_name_map;
 	material_name_map["Stone"]= LLTrans::getString("Stone");
 	material_name_map["Metal"]= LLTrans::getString("Metal");	
@@ -194,7 +203,8 @@ BOOL	LLPanelVolume::postBuild()
 
 LLPanelVolume::LLPanelVolume()
 	: LLPanel(),
-	  mComboMaterialItemCount(0)
+	  mComboMaterialItemCount(0),
+	  mPathfindingType(NULL)
 {
 	setMouseOpaque(FALSE);
 
@@ -463,6 +473,8 @@ void LLPanelVolume::getState( )
 	mSpinPhysicsRestitution->set(objectp->getPhysicsRestitution());
 	mSpinPhysicsRestitution->setEnabled(editable);
 
+	mPathfindingType->setEnabled(editable);
+
 	// update the physics shape combo to include allowed physics shapes
 	mComboPhysicsShapeType->removeall();
 	mComboPhysicsShapeType->add(getString("None"), LLSD(1));
@@ -546,6 +558,8 @@ void LLPanelVolume::refresh()
 	getChildView("Physics Friction")->setVisible(enable_mesh);
 	getChildView("Physics Density")->setVisible(enable_mesh);
 	getChildView("Physics Restitution")->setVisible(enable_mesh);
+
+	mPathfindingType->setVisible(enable_mesh);
 	
     /* TODO: add/remove individual physics shape types as per the PhysicsShapeTypes simulator features */
 }
@@ -600,6 +614,8 @@ void LLPanelVolume::clearCtrls()
 	mSpinPhysicsDensity->setEnabled(FALSE);
 	mSpinPhysicsRestitution->setEnabled(FALSE);
 
+	mPathfindingType->setEnabled(FALSE);
+
 	mComboMaterial->setEnabled( FALSE );
 }
 
@@ -685,6 +701,12 @@ void LLPanelVolume::sendPhysicsDensity(LLUICtrl* ctrl, void* userdata)
 	LLSelectMgr::getInstance()->selectionSetDensity(val);
 }
 
+void LLPanelVolume::sendPathfindingType()
+{
+	S32 val = mPathfindingType->getValue().asInteger();
+	llwarns << "functionality to set '" << mPathfindingType->getName() << "' to value " << val << " has not been implemented." << llendl;
+}
+
 void LLPanelVolume::refreshCost()
 {
 	LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstObject();