diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-03 20:03:52 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-03 20:03:52 -0400 |
| commit | db2d21a89b62acc14025e7c529721e994ca96a9f (patch) | |
| tree | 5124aa04ff7a212c00891b517740afd050c724e5 /indra/newview/llpanelobject.h | |
| parent | d5f96c38e6f5838672c87e540aaaa3b1663837f8 (diff) | |
| parent | eef9016ca15631783e0d61b98da858a971b2ab72 (diff) | |
reconciled .hgtags
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; |