Merge branch 'next' of git://github.com/jacek/imprudence into next

Conflicts (manually merged):
	linden/indra/llcommon/llversionviewer.h
	linden/indra/llvfs/lldir.cpp
	linden/indra/llvfs/lldir_mac.cpp
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/Info-meta-impy.plist
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/packaging/mac/Info.plist.in
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerversion.cpp
	linden/indra/newview/viewerversion.h
	linden/install.xml

Also some post merge tweaks.

1 files changed, 17 insertions, 3 deletions

diff --git a/linden/indra/newview/llpanelnetwork.h b/linden/indra/newview/llpanelnetwork.h
index 628f713..b8e5618 100644
--- a/linden/indra/newview/llpanelnetwork.h
+++ b/linden/indra/newview/llpanelnetwork.h
@@ -47,9 +47,13 @@ public:
         void cancel();
 
 private:
-        static void onClickClearCache(void*);
-        static void onClickSetCache(void*);
-        static void onClickResetCache(void*);
+        void refresh();
+
+        static void onCommitSpeedRezCheckBox(LLUICtrl* ctrl, void* user_data);
+
+        static void onClickClearDiskCache(void*);
+        static void onClickSetDiskCache(void*);
+        static void onClickResetDiskCache(void*);
         static void onCommitPort(LLUICtrl* ctrl, void*);
         static void onCommitXMLRPCProxyEnabled(LLUICtrl* ctrl, void* data);
         static void onCommitSocks5ProxyEnabled(LLUICtrl* ctrl, void* data);
@@ -60,6 +64,16 @@ private:
         
         static bool sSocksSettingsChanged;
 
+        // formerly the web panel -- MC
+        static void onClickClearWebCache(void*);
+        static void onClickClearCookies(void*);
+        static void onClickSearchDefault(void* user_data);
+        static void onClickSearchClear(void* user_data);
+        static bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response);
+        static bool callback_clear_cookies(const LLSD& notification, const LLSD& response);
+        static void onCommitCookies(LLUICtrl* ctrl, void* data);
+        static void onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data);
+
 };
 
 #endif