diff options
| author | Richard Linden <none@none> | 2010-06-24 10:47:31 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-24 10:47:31 -0700 |
| commit | 483f66e082dd758ac1efafdcb5ba9c277690d760 (patch) | |
| tree | 2e6f5c10c08e9bdf7caa11c31a40d6a3e9792ff4 /indra/newview/llpanelobject.h | |
| parent | 8f892d0f36fda170a5cecf0aea89887d6d0e45ef (diff) | |
| parent | 1683c7c6e99814e101312aad38718d393a2605e3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelobject.h')
| -rw-r--r-- | indra/newview/llpanelobject.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h index 58d9fe9b76..b4e1eee8fb 100644 --- a/indra/newview/llpanelobject.h +++ b/indra/newview/llpanelobject.h @@ -101,11 +101,9 @@ protected: protected: S32 mComboMaterialItemCount; - LLTextBox* mLabelMaterial; LLComboBox* mComboMaterial; // Per-object options - LLTextBox* mLabelBaseType; LLComboBox* mComboBaseType; LLTextBox* mLabelCut; |