From 7d9882c04df987cde58f399659e2b8894a5a45f9 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Mon, 16 Feb 2009 02:27:51 +0000
Subject: Fix dependency on non-OpenSim version of
 OpenMetaverse.StructuredData.dll.

---
 .../Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs  | 2 +-
 prebuild.xml                                                      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
index ffeca1a..f22dc67 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
@@ -305,7 +305,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
                 {
                     try
                     {
-                        OSD osdata = OSDParser.DeserializeJson(httpRequest.InputStream);
+                        OSD osdata = OSDParser.DeserializeJson(new StreamReader(httpRequest.InputStream).ReadToEnd());
 
                         if (osdata.Type == OSDType.Map)
                         {
diff --git a/prebuild.xml b/prebuild.xml
index 1e704c0..f5f410f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -768,7 +768,7 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="log4net"/>
       <Reference name="OpenMetaverseTypes"/>
-      <Reference name="OpenMetaverse.StructuredData2"/>
+      <Reference name="OpenMetaverse.StructuredData"/>
       <Reference name="HttpServer"/>
       <Reference name="Nini.dll" />
 
@@ -804,7 +804,7 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenMetaverse"/>
       <Reference name="OpenMetaverseTypes"/>
-      <Reference name="OpenMetaverse.StructuredData2"/>
+      <Reference name="OpenMetaverse.StructuredData"/>
       <Reference name="HttpServer"/>
       <Reference name="log4net"/>
 
@@ -834,7 +834,7 @@
       <Reference name="OpenSim.Grid.AssetInventoryServer" />
       <Reference name="OpenMetaverse"/>
       <Reference name="OpenMetaverseTypes"/>
-      <Reference name="OpenMetaverse.StructuredData2" />
+      <Reference name="OpenMetaverse.StructuredData"/>
       <Reference name="HttpServer"/>
       <Reference name="log4net"/>
 
@@ -867,7 +867,7 @@
       <Reference name="OpenSim.Data" />
       <Reference name="OpenSim.Grid.AssetInventoryServer" />
       <Reference name="OpenMetaverseTypes"/>
-      <Reference name="OpenMetaverse.StructuredData2" />
+      <Reference name="OpenMetaverse.StructuredData"/>
       <Reference name="HttpServer"/>
       <Reference name="Nini.dll" />
       <Reference name="log4net"/>
-- 
cgit v1.1