diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-03 05:50:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-03 05:50:31 -0400 |
| commit | e575a0ef04ed35ccdf4c0de50baecfc460b6c707 (patch) | |
| tree | 927c3e9304edb7408eb81c1c1a591fa978db1b79 /indra/newview/tests/llslurl_test.cpp | |
| parent | d59715d6f1028f86827f1bd7b43c29abe697fcc9 (diff) | |
| parent | 770d8b0d01d3dabeccded0df3a06058f6196d829 (diff) | |
merge up to latest pathfinding project viewer
Diffstat (limited to 'indra/newview/tests/llslurl_test.cpp')
| -rw-r--r-- | indra/newview/tests/llslurl_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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>" |