Fix dependency on non-OpenSim version of OpenMetaverse.StructuredData.dll.

author: Mike Mazur 2009-02-16 02:27:51 +0000
committer: Mike Mazur 2009-02-16 02:27:51 +0000
commit: 7d9882c04df987cde58f399659e2b8894a5a45f9 (patch)
tree: 7556dcdb7519bdb7f7e199cc078b10081603a882
parent: - change AssetInventoryServer config from XML to INI (diff)
download: opensim-SC_OLD-7d9882c04df987cde58f399659e2b8894a5a45f9.zip
opensim-SC_OLD-7d9882c04df987cde58f399659e2b8894a5a45f9.tar.gz
opensim-SC_OLD-7d9882c04df987cde58f399659e2b8894a5a45f9.tar.bz2
opensim-SC_OLD-7d9882c04df987cde58f399659e2b8894a5a45f9.tar.xz
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"/>
author	Mike Mazur	2009-02-16 02:27:51 +0000
committer	Mike Mazur	2009-02-16 02:27:51 +0000
commit	7d9882c04df987cde58f399659e2b8894a5a45f9 (patch)
tree	7556dcdb7519bdb7f7e199cc078b10081603a882
parent	- change AssetInventoryServer config from XML to INI (diff)
download	opensim-SC_OLD-7d9882c04df987cde58f399659e2b8894a5a45f9.zip opensim-SC_OLD-7d9882c04df987cde58f399659e2b8894a5a45f9.tar.gz opensim-SC_OLD-7d9882c04df987cde58f399659e2b8894a5a45f9.tar.bz2 opensim-SC_OLD-7d9882c04df987cde58f399659e2b8894a5a45f9.tar.xz

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
305	{	305	{
306	try	306	try
307	{	307	{
308	OSD osdata = OSDParser.DeserializeJson(httpRequest.InputStream);	308	OSD osdata = OSDParser.DeserializeJson(new StreamReader(httpRequest.InputStream).ReadToEnd());
309		309
310	if (osdata.Type == OSDType.Map)	310	if (osdata.Type == OSDType.Map)
311	{	311	{


diff --git a/prebuild.xml b/prebuild.xml index 1e704c0..f5f410f 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -768,7 +768,7 @@
768	<Reference name="OpenSim.Framework.Servers"/>	768	<Reference name="OpenSim.Framework.Servers"/>
769	<Reference name="log4net"/>	769	<Reference name="log4net"/>
770	<Reference name="OpenMetaverseTypes"/>	770	<Reference name="OpenMetaverseTypes"/>
771	<Reference name="OpenMetaverse.StructuredData2"/>	771	<Reference name="OpenMetaverse.StructuredData"/>
772	<Reference name="HttpServer"/>	772	<Reference name="HttpServer"/>
773	<Reference name="Nini.dll" />	773	<Reference name="Nini.dll" />
774		774
@@ -804,7 +804,7 @@
804	<Reference name="OpenSim.Framework.Servers"/>	804	<Reference name="OpenSim.Framework.Servers"/>
805	<Reference name="OpenMetaverse"/>	805	<Reference name="OpenMetaverse"/>
806	<Reference name="OpenMetaverseTypes"/>	806	<Reference name="OpenMetaverseTypes"/>
807	<Reference name="OpenMetaverse.StructuredData2"/>	807	<Reference name="OpenMetaverse.StructuredData"/>
808	<Reference name="HttpServer"/>	808	<Reference name="HttpServer"/>
809	<Reference name="log4net"/>	809	<Reference name="log4net"/>
810		810
@@ -834,7 +834,7 @@
834	<Reference name="OpenSim.Grid.AssetInventoryServer" />	834	<Reference name="OpenSim.Grid.AssetInventoryServer" />
835	<Reference name="OpenMetaverse"/>	835	<Reference name="OpenMetaverse"/>
836	<Reference name="OpenMetaverseTypes"/>	836	<Reference name="OpenMetaverseTypes"/>
837	<Reference name="OpenMetaverse.StructuredData2" />	837	<Reference name="OpenMetaverse.StructuredData"/>
838	<Reference name="HttpServer"/>	838	<Reference name="HttpServer"/>
839	<Reference name="log4net"/>	839	<Reference name="log4net"/>
840		840
@@ -867,7 +867,7 @@
867	<Reference name="OpenSim.Data" />	867	<Reference name="OpenSim.Data" />
868	<Reference name="OpenSim.Grid.AssetInventoryServer" />	868	<Reference name="OpenSim.Grid.AssetInventoryServer" />
869	<Reference name="OpenMetaverseTypes"/>	869	<Reference name="OpenMetaverseTypes"/>
870	<Reference name="OpenMetaverse.StructuredData2" />	870	<Reference name="OpenMetaverse.StructuredData"/>
871	<Reference name="HttpServer"/>	871	<Reference name="HttpServer"/>
872	<Reference name="Nini.dll" />	872	<Reference name="Nini.dll" />
873	<Reference name="log4net"/>	873	<Reference name="log4net"/>