diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs index 007ff63..01c5d3b 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/HGAssetMapperTests.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
77 | scene.StartScripts(); | 77 | scene.StartScripts(); |
78 | 78 | ||
79 | HGAssetMapper hgam = new HGAssetMapper(scene, homeUrl); | 79 | HGAssetMapper hgam = new HGAssetMapper(scene, homeUrl); |
80 | UserAccount ua | 80 | UserAccount ua |
81 | = UserAccountHelpers.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "password"); | 81 | = UserAccountHelpers.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "password"); |
82 | 82 | ||
83 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, soPartsCount, ua.PrincipalID, "part", soIdTail); | 83 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, soPartsCount, ua.PrincipalID, "part", soIdTail); |
@@ -93,6 +93,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
93 | Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID); | 93 | Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID); |
94 | string xmlData = Utils.BytesToString(ncAssetGet.Data); | 94 | string xmlData = Utils.BytesToString(ncAssetGet.Data); |
95 | XmlDocument ncAssetGetXmlDoc = new XmlDocument(); | 95 | XmlDocument ncAssetGetXmlDoc = new XmlDocument(); |
96 | ncAssetGetXmlDoc.XmlResolver=null; | ||
96 | ncAssetGetXmlDoc.LoadXml(xmlData); | 97 | ncAssetGetXmlDoc.LoadXml(xmlData); |
97 | 98 | ||
98 | // Console.WriteLine(ncAssetGetXmlDoc.OuterXml); | 99 | // Console.WriteLine(ncAssetGetXmlDoc.OuterXml); |
@@ -116,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
116 | XmlNode uuidAttribute = savedScriptStateNodes[0].Attributes.GetNamedItem("UUID"); | 117 | XmlNode uuidAttribute = savedScriptStateNodes[0].Attributes.GetNamedItem("UUID"); |
117 | Assert.NotNull(uuidAttribute); | 118 | Assert.NotNull(uuidAttribute); |
118 | // XXX: To check the actual UUID attribute we would have to do some work to retreive the UUID of the task | 119 | // XXX: To check the actual UUID attribute we would have to do some work to retreive the UUID of the task |
119 | // item created earlier. | 120 | // item created earlier. |
120 | } | 121 | } |
121 | 122 | ||
122 | private void RezScript(Scene scene, UUID soId, string script, string itemName, UUID userId) | 123 | private void RezScript(Scene scene, UUID soId, string script, string itemName, UUID userId) |
@@ -131,9 +132,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
131 | // immediately for tests rather than chunter through it's threaded mechanisms. | 132 | // immediately for tests rather than chunter through it's threaded mechanisms. |
132 | AutoResetEvent chatEvent = new AutoResetEvent(false); | 133 | AutoResetEvent chatEvent = new AutoResetEvent(false); |
133 | 134 | ||
134 | scene.EventManager.OnChatFromWorld += (s, c) => | 135 | scene.EventManager.OnChatFromWorld += (s, c) => |
135 | { | 136 | { |
136 | // Console.WriteLine("Got chat [{0}]", c.Message); | 137 | // Console.WriteLine("Got chat [{0}]", c.Message); |
137 | chatEvent.Set(); | 138 | chatEvent.Set(); |
138 | }; | 139 | }; |
139 | 140 | ||