diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-24 13:57:57 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-24 13:57:57 -0700 |
| commit | 31d69a6bc5a81dc3e844138033e41e339dce3aa1 (patch) | |
| tree | 39119d49fcbbaf3cf7fda13b7b62970e1a2a5999 /indra/newview/llstartup.h | |
| parent | 6e92b96e88401aaca203b627e84ce311b7f75e4a (diff) | |
| parent | b19e6c295972c83a2637a29007bc5d0a92711ea9 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llstartup.h')
| -rw-r--r-- | indra/newview/llstartup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h index 3754aaf966..760e38890b 100644 --- a/indra/newview/llstartup.h +++ b/indra/newview/llstartup.h @@ -111,7 +111,7 @@ public: static void postStartupState(); static void setStartSLURL(const LLSLURL& slurl); - static LLSLURL& getStartSLURL() { return sStartSLURL; } + static LLSLURL& getStartSLURL(); static bool startLLProxy(); // Initialize the SOCKS 5 proxy |