diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-29 12:23:28 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-29 12:23:28 -0400 |
commit | 5a39c44b56191a4ba516d3c504b3a0a574156e72 (patch) | |
tree | e95e5fc6cde0a046ac88abeba4a3410123cae890 /indra/newview/llstartup.h | |
parent | f5a890453b0a98636e6267b3272567ae0eecf1e4 (diff) | |
parent | 68a15f73c190d2a803ad8b11ed8d9b32bc9e46ee (diff) |
merged .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; |