diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-07 13:58:19 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-07 13:58:19 -0700 |
| commit | 78821c51a1f7d5fcc6e4a2678bfd3446ccfaee36 (patch) | |
| tree | 51da53114f257ca57c2aa36da655019b75cf0269 /indra/newview/llstartup.h | |
| parent | c64bd7d5cb28fc221716e866ff9c9a28c22e69ce (diff) | |
| parent | fef401a1768bae9bfb23a13549fa3a5005f2c7ae (diff) | |
Merge from viewer-experience
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; |