diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-14 18:41:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-14 18:41:25 -0400 |
| commit | 981190cf3151f436d370b841b1baa5a2a607b94d (patch) | |
| tree | 99b85f7f3ce1c1824246a56d2d4ee2c357d97df4 /indra/newview/tests | |
| parent | 3e3e695341cf11cbcba1eb71f08bdc8e23808a6f (diff) | |
| parent | c2e2a49d9baa950242bddc1be14f1d3c79943bf2 (diff) | |
merge back beta fixes
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" |