diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2011-06-08 14:53:00 -0700 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2011-06-08 14:53:00 -0700 |
commit | 484a4733b7b361d87c6092f4f399951e84c2aacd (patch) | |
tree | 3031f4f041ffbe87f57d3a58e8ecf3bc988f439b /indra/newview/llpanelobject.h | |
parent | 3dfb4944ed916f9a251078a2614a854b9de0315d (diff) | |
parent | 68a7c4cb83aca58e6ad9162be9e5022d6f801eac (diff) |
Merge latest from lindenlab/viewer-development/
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; |