diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-09-15 14:32:55 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-09-15 14:32:55 -0400 |
commit | 11dce3b74d60accd4d73aa976022daff637343d2 (patch) | |
tree | b73503634eb271e0e53d2928a2ac0fd426831075 /indra/newview/llstartup.h | |
parent | 1b9a39a2e1050bb1366cce5f1140a1608633c473 (diff) | |
parent | 671a76b40c0669cb8d4b08a6617ec33c47324a49 (diff) |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llstartup.h')
-rw-r--r-- | indra/newview/llstartup.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h index b3d9ef1dcc..99a644eb9c 100644 --- a/indra/newview/llstartup.h +++ b/indra/newview/llstartup.h @@ -113,6 +113,8 @@ public: static void setStartSLURL(const LLSLURL& slurl); static LLSLURL& getStartSLURL() { return sStartSLURL; } + static bool startLLProxy(); // Initialize the SOCKS 5 proxy + private: static LLSLURL sStartSLURL; |