From 770d8b0d01d3dabeccded0df3a06058f6196d829 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 2 Jul 2012 11:14:13 -0400
Subject: improve logging of invalid grid definitions, prevent clashes with old
 viewers

---
 indra/newview/tests/llviewernetwork_test.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/tests/llviewernetwork_test.cpp')

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>"
-- 
cgit v1.2.3