diff options
author | Don Kjer <don@lindenlab.com> | 2012-08-17 01:41:07 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-08-17 01:41:07 +0000 |
commit | 7ac0d2b8a31174b3d8872ec8ed5ed64c3d0bc7ed (patch) | |
tree | 71ee0b4b8ed4f0f1a90f3138604b9d074087c4ad /indra/newview/tests | |
parent | 48b7eff75835058f144bbc27a5b2ef2997be2be4 (diff) | |
parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) |
Merge viewer-development -> sunshine
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" |