diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-17 10:55:35 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-17 10:55:35 -0400 |
| commit | 0e548921730eac8d4f4791362390993f2d20b99b (patch) | |
| tree | 408f4de337e5d5955ddebcc8b98f9e3fdcbe3540 /indra/newview/llpanelobject.h | |
| parent | a2d8f0cb3308fed1cb2c8d5fa8fb74ec4cefa45b (diff) | |
SH-1352 FIXED Move Material dropdown to Features tab, above Physics settings
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; |