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/tests | |
| parent | 6e92b96e88401aaca203b627e84ce311b7f75e4a (diff) | |
| parent | b19e6c295972c83a2637a29007bc5d0a92711ea9 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index b7e81c4199..7705b4c567 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -60,6 +60,7 @@ static LLEventStream gTestPump("test_pump"); #include "../llslurl.h" #include "../llstartup.h" LLSLURL LLStartUp::sStartSLURL; +LLSLURL& LLStartUp::getStartSLURL() { return sStartSLURL; } #include "lllogin.h" |