diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-14 17:26:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-14 17:26:24 -0400 |
| commit | c2e2a49d9baa950242bddc1be14f1d3c79943bf2 (patch) | |
| tree | 60085005493453a22924c174efea81e9fc8ae928 /indra/newview/tests | |
| parent | ee3137b0ef416a43e6d786e36516b8311ba52fc3 (diff) | |
| parent | 9a4a6163ff8d146c0b357c3f9b68254f7025f862 (diff) | |
merge changes for DRTVWR-193
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" |