diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-17 12:46:52 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-17 12:46:52 -0500 |
| commit | 6898b2c6d53fc04384f194d264c1c61bbc08c90f (patch) | |
| tree | edca62b52e875fdd100141cccfefef3e31582417 /indra/newview/llpanelobject.h | |
| parent | 26f321bf6530734173792f92316b32c470cc1b20 (diff) | |
| parent | 90ac5f839fed2da36d2d0eb33d08e481b20bfcb6 (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; |