diff options
| author | McCabe Maxsted | 2011-04-12 17:41:10 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-04-12 17:41:10 -0700 |
| commit | 809de77034c5956a95f35c90024e62b02b439164 (patch) | |
| tree | 69beeac02b6c37b38c881d702ede4b7b83642a31 /linden/indra/newview/llpanelnetwork.h | |
| parent | Partial revert of a47ebd78. This caused issues with selection and alt-camming... (diff) | |
| download | meta-impy-809de77034c5956a95f35c90024e62b02b439164.zip meta-impy-809de77034c5956a95f35c90024e62b02b439164.tar.gz meta-impy-809de77034c5956a95f35c90024e62b02b439164.tar.bz2 meta-impy-809de77034c5956a95f35c90024e62b02b439164.tar.xz | |
Ported SOCKS5 proxy support from Snowglobe 1.5
Diffstat (limited to 'linden/indra/newview/llpanelnetwork.h')
| -rw-r--r-- | linden/indra/newview/llpanelnetwork.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelnetwork.h b/linden/indra/newview/llpanelnetwork.h index 900158a..628f713 100644 --- a/linden/indra/newview/llpanelnetwork.h +++ b/linden/indra/newview/llpanelnetwork.h | |||
| @@ -52,6 +52,14 @@ private: | |||
| 52 | static void onClickResetCache(void*); | 52 | static void onClickResetCache(void*); |
| 53 | static void onCommitPort(LLUICtrl* ctrl, void*); | 53 | static void onCommitPort(LLUICtrl* ctrl, void*); |
| 54 | static void onCommitXMLRPCProxyEnabled(LLUICtrl* ctrl, void* data); | 54 | static void onCommitXMLRPCProxyEnabled(LLUICtrl* ctrl, void* data); |
| 55 | static void onCommitSocks5ProxyEnabled(LLUICtrl* ctrl, void* data); | ||
| 56 | static void onClickTestProxy(void* user_data); | ||
| 57 | static void onSocksSettingsModified(LLUICtrl* ctrl, void* data); | ||
| 58 | static void onSocksAuthChanged(LLUICtrl* ctrl, void* data); | ||
| 59 | static void updateProxyEnabled(LLPanelNetwork * self, bool enabled, std::string authtype); | ||
| 60 | |||
| 61 | static bool sSocksSettingsChanged; | ||
| 62 | |||
| 55 | }; | 63 | }; |
| 56 | 64 | ||
| 57 | #endif | 65 | #endif |