diff options
| author | Don Kjer <don@lindenlab.com> | 2011-06-13 02:48:52 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-06-13 02:48:52 +0000 |
| commit | 45c6dcbe87fbfc1351e4faa9ef3196a191b7dd69 (patch) | |
| tree | 4fe43929cb518d67e8afbd227db3bc62e4d175e5 /indra/newview/llpanelobject.h | |
| parent | 694b0838bc80efc152e7ecda09ffdc7a944b7079 (diff) | |
| parent | 12d9d1d3ef76518171ae87aae2467593218f8413 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelobject.h')
| -rw-r--r-- | indra/newview/llpanelobject.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index e2f2a4400d..475dfdaedb 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -66,7 +66,6 @@ public: static void onCommitPhantom( 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); @@ -94,10 +93,6 @@ protected: void getVolumeParams(LLVolumeParams& volume_params); protected: - S32 mComboMaterialItemCount; - - LLComboBox* mComboMaterial; - // Per-object options LLComboBox* mComboBaseType; |