diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-06-01 17:05:38 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-06-01 17:05:38 -0400 |
| commit | 2662c4b679f0eb2745619dc4fd1dd79af65126f0 (patch) | |
| tree | f27ba8675353676d91327fc606b005f0096b2fb9 /indra/newview/llpanelobject.h | |
| parent | 4b97f03b04e7df25e5b3622122f6d124d4a5f617 (diff) | |
| parent | 2002a39e4db5ba96f4a0a7653f76a3cd55846a31 (diff) | |
Merge. Pulling fix for VWR-25862 into bigger cache tree.
Diffstat (limited to 'indra/newview/llpanelobject.h')
| -rw-r--r-- | indra/newview/llpanelobject.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index e07bf007ec..475dfdaedb 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -62,14 +62,13 @@ 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 onCommitCastShadows( LLUICtrl* ctrl, void* userdata); + static void onCommitPhysics( 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); @@ -87,16 +86,13 @@ protected: void sendIsPhysical(); void sendIsTemporary(); void sendIsPhantom(); + void sendCastShadows(); void sendSculpt(); void getVolumeParams(LLVolumeParams& volume_params); protected: - S32 mComboMaterialItemCount; - - LLComboBox* mComboMaterial; - // Per-object options LLComboBox* mComboBaseType; |