aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstartup.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-04-12 17:41:10 -0700
committerMcCabe Maxsted2011-04-12 17:41:10 -0700
commit809de77034c5956a95f35c90024e62b02b439164 (patch)
tree69beeac02b6c37b38c881d702ede4b7b83642a31 /linden/indra/newview/llstartup.h
parentPartial revert of a47ebd78. This caused issues with selection and alt-camming... (diff)
downloadmeta-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 '')
-rw-r--r--linden/indra/newview/llstartup.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index 3fe8daa..6dc3946 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -123,6 +123,9 @@ public:
123 static std::string sSLURLCommand; 123 static std::string sSLURLCommand;
124 // *HACK: On startup, if we were passed a secondlife://app/do/foo 124 // *HACK: On startup, if we were passed a secondlife://app/do/foo
125 // command URL, store it for later processing. 125 // command URL, store it for later processing.
126
127 static bool handleSocksProxy(bool reportOK = true);
128
126 static bool shouldAutoLogin() { return mShouldAutoLogin; }; 129 static bool shouldAutoLogin() { return mShouldAutoLogin; };
127 static void setShouldAutoLogin(bool value) { mShouldAutoLogin = value; }; 130 static void setShouldAutoLogin(bool value) { mShouldAutoLogin = value; };
128 131