diff options
author | skolb <none@none> | 2009-12-14 14:32:31 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-14 14:32:31 -0800 |
commit | 4a2d57ad489344d77c2bc5213dad2c40c161a34e (patch) | |
tree | 7603c04688b9de5a08b9d06fa1f787beb2291f7c /indra/newview/llpanelmediasettingsgeneral.h | |
parent | 93f827ec7855c419c19dbf1a055e7cdc546eb650 (diff) | |
parent | caaf0173aa7f3a98a147357fb2d8b185cb9b8b68 (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.h')
-rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h index c6895b1dc9..5f90321362 100644 --- a/indra/newview/llpanelmediasettingsgeneral.h +++ b/indra/newview/llpanelmediasettingsgeneral.h @@ -37,7 +37,6 @@ class LLButton; class LLCheckBoxCtrl; -class LLComboBox; class LLLineEditor; class LLSpinCtrl; class LLTextureCtrl; @@ -90,7 +89,6 @@ private: void checkHomeUrlPassesWhitelist(); - LLComboBox* mControls; LLCheckBoxCtrl* mAutoLoop; LLCheckBoxCtrl* mFirstClick; LLCheckBoxCtrl* mAutoZoom; |