diff options
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index 1b629f515b..12eea7844d 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -68,7 +68,6 @@ #include "llworld.h" #include "pipeline.h" #include "llviewershadermgr.h" -#include "llradiogroup.h" #include "lldrawpool.h" #include "lluictrlfactory.h" @@ -159,14 +158,6 @@ 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"); @@ -203,8 +194,7 @@ BOOL LLPanelVolume::postBuild() LLPanelVolume::LLPanelVolume() : LLPanel(), - mComboMaterialItemCount(0), - mPathfindingType(NULL) + mComboMaterialItemCount(0) { setMouseOpaque(FALSE); @@ -473,8 +463,6 @@ 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)); @@ -558,8 +546,6 @@ 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 */ } @@ -614,8 +600,6 @@ void LLPanelVolume::clearCtrls() mSpinPhysicsDensity->setEnabled(FALSE); mSpinPhysicsRestitution->setEnabled(FALSE); - mPathfindingType->setEnabled(FALSE); - mComboMaterial->setEnabled( FALSE ); } @@ -701,12 +685,6 @@ 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(); |