diff options
| author | Karl Stiefvater (qarl) <qarl@lindenlab.com> | 2010-07-01 17:18:55 -0500 |
|---|---|---|
| committer | Karl Stiefvater (qarl) <qarl@lindenlab.com> | 2010-07-01 17:18:55 -0500 |
| commit | 2530b057bb18550ed2825c14988a807ab90d460f (patch) | |
| tree | 63c51d22118a5b58d676e5404d6a815b084427b2 /indra/newview/llpanelobject.h | |
| parent | 0fc367441762d85dd77867e78ff75b867c946b4a (diff) | |
added new physics parameters to prims
Diffstat (limited to 'indra/newview/llpanelobject.h')
| -rw-r--r-- | indra/newview/llpanelobject.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 7f368c38c7..2c62002ac6 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -71,7 +71,7 @@ public: static void onCommitPhysics( LLUICtrl* ctrl, void* userdata); static void onCommitTemporary( LLUICtrl* ctrl, void* userdata); static void onCommitPhantom( LLUICtrl* ctrl, void* userdata); - static void onCommitPhysicsShapeType( LLUICtrl* ctrl, void* userdata); + static void onCommitPhysicsParam( LLUICtrl* ctrl, void* userdata); static void onCommitCastShadows( LLUICtrl* ctrl, void* userdata); static void onCommitParametric(LLUICtrl* ctrl, void* userdata); @@ -94,7 +94,7 @@ protected: void sendIsPhysical(); void sendIsTemporary(); void sendIsPhantom(); - void sendPhysicsShapeType(); + void sendPhysicsParam(); void sendCastShadows(); void sendSculpt(); @@ -167,9 +167,15 @@ protected: LLCheckBoxCtrl *mCheckPhysics; LLCheckBoxCtrl *mCheckTemporary; LLCheckBoxCtrl *mCheckPhantom; - LLComboBox *mComboPhysicsShapeType; LLCheckBoxCtrl *mCheckCastShadows; - + + LLComboBox* mComboPhysicsShapeType; + LLSpinCtrl* mSpinPhysicsGravity; + LLCheckBoxCtrl* mCheckPhysicsMaterialOverride; + LLSpinCtrl* mSpinPhysicsFriction; + LLSpinCtrl* mSpinPhysicsDensity; + LLSpinCtrl* mSpinPhysicsRestitution; + LLTextureCtrl *mCtrlSculptTexture; LLTextBox *mLabelSculptType; LLComboBox *mCtrlSculptType; @@ -180,7 +186,6 @@ protected: BOOL mIsPhysical; // to avoid sending "physical" when not changed BOOL mIsTemporary; // to avoid sending "temporary" when not changed BOOL mIsPhantom; // to avoid sending "phantom" when not changed - U8 mPhysicsShapeType; // to avoid sending "physics shape type" when not changed BOOL mCastShadows; // to avoid sending "cast shadows" when not changed S32 mSelectedType; // So we know what selected type we last were |