diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-09 12:47:36 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-09 12:47:36 +0200 |
| commit | cc6f28432e0b21df1cbb56bbc436175827332da1 (patch) | |
| tree | d5d6006fa91a36bfdc2a731ac1c8a861290c398f /indra/newview/llfloaterpreference.h | |
| parent | ff87f87fa6a33daf72eae963b2aa33c9d5890509 (diff) | |
| parent | b93fb9f31954b4851a13bd3070661537f9359b00 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index a30422564a..d292f3bb7b 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -85,7 +85,6 @@ protected: void onBtnCancel(); void onBtnApply(); -// void onClickClearCache(); void onClickBrowserClearCache(); // if the custom settings box is clicked @@ -141,7 +140,7 @@ public: static void initWindowSizeControls(LLPanel* panelp); - static void buildLists(void* data); + void buildPopupLists(); static void refreshSkin(void* data); static void cleanupBadSetting(); static F32 sAspectRatio; @@ -153,7 +152,6 @@ private: bool mOriginalHideOnlineStatus; std::string mDirectoryVisibility; - }; class LLPanelPreference : public LLPanel |