summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobject.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelobject.h')
-rw-r--r--indra/newview/llpanelobject.h17
1 files changed, 2 insertions, 15 deletions
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index 54bb5df8bf..e2f2a4400d 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -62,15 +62,14 @@ public:
static void onCommitPosition( LLUICtrl* ctrl, void* userdata);
static void onCommitScale( LLUICtrl* ctrl, void* userdata);
static void onCommitRotation( LLUICtrl* ctrl, void* userdata);
- static void onCommitPhysics( LLUICtrl* ctrl, void* userdata);
static void onCommitTemporary( LLUICtrl* ctrl, void* userdata);
static void onCommitPhantom( LLUICtrl* ctrl, void* userdata);
- static void onCommitPhysicsParam( LLUICtrl* ctrl, void* userdata);
static void onCommitCastShadows( LLUICtrl* ctrl, void* userdata);
+ static void onCommitPhysics( LLUICtrl* ctrl, void* userdata);
+ static void onCommitMaterial( LLUICtrl* ctrl, void* userdata);
static void onCommitParametric(LLUICtrl* ctrl, void* userdata);
- static void onCommitMaterial( LLUICtrl* ctrl, void* userdata);
void onCommitSculpt(const LLSD& data);
void onCancelSculpt(const LLSD& data);
@@ -81,7 +80,6 @@ public:
protected:
void getState();
- void refreshCost();
void sendRotation(BOOL btn_down);
void sendScale(BOOL btn_down);
@@ -89,11 +87,6 @@ protected:
void sendIsPhysical();
void sendIsTemporary();
void sendIsPhantom();
- void sendPhysicsShapeType(LLUICtrl* ctrl, void* userdata);
- void sendPhysicsGravity(LLUICtrl* ctrl, void* userdata);
- void sendPhysicsFriction(LLUICtrl* ctrl, void* userdata);
- void sendPhysicsRestitution(LLUICtrl* ctrl, void* userdata);
- void sendPhysicsDensity(LLUICtrl* ctrl, void* userdata);
void sendCastShadows();
void sendSculpt();
@@ -167,12 +160,6 @@ protected:
LLCheckBoxCtrl *mCheckPhantom;
LLCheckBoxCtrl *mCheckCastShadows;
- LLComboBox* mComboPhysicsShapeType;
- LLSpinCtrl* mSpinPhysicsGravity;
- LLSpinCtrl* mSpinPhysicsFriction;
- LLSpinCtrl* mSpinPhysicsDensity;
- LLSpinCtrl* mSpinPhysicsRestitution;
-
LLTextureCtrl *mCtrlSculptTexture;
LLTextBox *mLabelSculptType;
LLComboBox *mCtrlSculptType;