diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-05-13 23:35:42 +0000 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-05-13 23:35:42 +0000 |
| commit | 3975de991d2afa2ed903ac28bcc91246dfb22c20 (patch) | |
| tree | 3f6d7d09d05768d7f1095ecb7602e688e8fa8a3b /indra/newview/tests | |
| parent | a087bbeda3229745cb625fbd1106438572dfee4a (diff) | |
svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
(finish)
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/llxmlrpclistener_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llxmlrpclistener_test.cpp b/indra/newview/tests/llxmlrpclistener_test.cpp index 0c1ee42ffc..c94ba0a3e8 100644 --- a/indra/newview/tests/llxmlrpclistener_test.cpp +++ b/indra/newview/tests/llxmlrpclistener_test.cpp @@ -26,7 +26,7 @@ #include "llcontrol.h" #include "tests/wrapllerrs.h" -LLControlGroup gSavedSettings; +LLControlGroup gSavedSettings("Global"); /***************************************************************************** * TUT |