diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-02 11:14:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-02 11:14:13 -0400 |
| commit | 770d8b0d01d3dabeccded0df3a06058f6196d829 (patch) | |
| tree | 777efc076d2560cf80f183728443a5cbb147ca7d /indra/newview/tests | |
| parent | a6fab91181362c1a5d616c84c78901f61c86228c (diff) | |
improve logging of invalid grid definitions, prevent clashes with old viewers
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/lllogininstance_test.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/tests/llslurl_test.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/tests/llviewernetwork_test.cpp | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp index c9f49d9343..b7e81c4199 100644 --- a/indra/newview/tests/lllogininstance_test.cpp +++ b/indra/newview/tests/lllogininstance_test.cpp @@ -114,8 +114,9 @@ LLGridManager::~LLGridManager() { } -void LLGridManager::addGrid(LLSD& grid_data) +bool LLGridManager::addGrid(LLSD& grid_data) { + return true; } LLGridManager::LLGridManager() : diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp index f995d8f0f5..09343ef227 100644 --- a/indra/newview/tests/llslurl_test.cpp +++ b/indra/newview/tests/llslurl_test.cpp @@ -93,7 +93,7 @@ const char *gSampleGridFile = " <array>" " <string>foobar/loginuri</string>" " </array>" - " <key>name</key><string>foo.bar.com</string>" + " <key>keyname</key><string>foo.bar.com</string>" " <key>credential_type</key><string>agent</string>" " <key>grid_login_id</key><string>FooBar</string>" " </map>" @@ -106,7 +106,7 @@ const char *gSampleGridFile = " <array>" " <string>mygrid/loginuri</string>" " </array>" - " <key>name</key><string>my.grid.com</string>" + " <key>keyname</key><string>my.grid.com</string>" " <key>credential_type</key><string>agent</string>" " <key>grid_login_id</key><string>MyGrid</string>" " </map>" diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp index 43d3b6522e..a1e97ea17e 100644 --- a/indra/newview/tests/llviewernetwork_test.cpp +++ b/indra/newview/tests/llviewernetwork_test.cpp @@ -95,13 +95,13 @@ const char *gSampleGridFile = " <string>altgrid/myloginuri1</string>" " <string>altgrid/myloginuri2</string>" " </array>" - " <key>name</key><string>altgrid.long.name</string>" + " <key>keyname</key><string>altgrid.long.name</string>" " <key>credential_type</key><string>agent</string>" " <key>grid_login_id</key><string>AltGrid</string>" " </map>" " <key>minimal.long.name</key>" " <map>" - " <key>name</key><string>minimal.long.name</string>" + " <key>keyname</key><string>minimal.long.name</string>" " </map>" " <!-- Note that the values for agni and aditi below are deliberately" " incorrect to test that they are not overwritten -->" @@ -115,7 +115,7 @@ const char *gSampleGridFile = " <array>" " <string>myloginuri</string>" " </array>" - " <key>name</key><string>util.agni.lindenlab.com</string> <!-- conflict -->" + " <key>keyname</key><string>util.agni.lindenlab.com</string> <!-- conflict -->" " </map>" " <key>util.foobar.lindenlab.com</key>" " <map>" @@ -127,7 +127,7 @@ const char *gSampleGridFile = " <array>" " <string>myloginuri</string>" " </array>" - " <key>name</key><string>util.foobar.lindenlab.com</string>" + " <key>keyname</key><string>util.foobar.lindenlab.com</string>" " </map>" " </map>" "</llsd>" |