diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-23 20:02:43 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-23 20:02:43 -0700 |
| commit | b19e6c295972c83a2637a29007bc5d0a92711ea9 (patch) | |
| tree | b9df565b6ec84ff6c55097431392ec792a6dc0cb /indra/newview/tests | |
| parent | e537d6477dfa1eea86dc16c767b793fb530d1ebc (diff) | |
| parent | 6d84272d38a4d09819ae03f4d967195ec3bd660b (diff) | |
Pull merge from richard/viewer-chui
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" |