OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.6.3-post-fixes
Mike Mazur 2009-02-16 02:27:51 +00:00
parent 5277fc64c0
commit 7d9882c04d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
View File

@ -305,7 +305,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
{ {
try try
{ {
OSD osdata = OSDParser.DeserializeJson(httpRequest.InputStream); OSD osdata = OSDParser.DeserializeJson(new StreamReader(httpRequest.InputStream).ReadToEnd());
if (osdata.Type == OSDType.Map) if (osdata.Type == OSDType.Map)
{ {

8
prebuild.xml
View File

@ -768,7 +768,7 @@
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="log4net"/> <Reference name="log4net"/>
<Reference name="OpenMetaverseTypes"/> <Reference name="OpenMetaverseTypes"/>
<Reference name="OpenMetaverse.StructuredData2"/> <Reference name="OpenMetaverse.StructuredData"/>
<Reference name="HttpServer"/> <Reference name="HttpServer"/>
<Reference name="Nini.dll" /> <Reference name="Nini.dll" />
@ -804,7 +804,7 @@
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenMetaverse"/> <Reference name="OpenMetaverse"/>
<Reference name="OpenMetaverseTypes"/> <Reference name="OpenMetaverseTypes"/>
<Reference name="OpenMetaverse.StructuredData2"/> <Reference name="OpenMetaverse.StructuredData"/>
<Reference name="HttpServer"/> <Reference name="HttpServer"/>
<Reference name="log4net"/> <Reference name="log4net"/>
@ -834,7 +834,7 @@
<Reference name="OpenSim.Grid.AssetInventoryServer" /> <Reference name="OpenSim.Grid.AssetInventoryServer" />
<Reference name="OpenMetaverse"/> <Reference name="OpenMetaverse"/>
<Reference name="OpenMetaverseTypes"/> <Reference name="OpenMetaverseTypes"/>
<Reference name="OpenMetaverse.StructuredData2" /> <Reference name="OpenMetaverse.StructuredData"/>
<Reference name="HttpServer"/> <Reference name="HttpServer"/>
<Reference name="log4net"/> <Reference name="log4net"/>
@ -867,7 +867,7 @@
<Reference name="OpenSim.Data" /> <Reference name="OpenSim.Data" />
<Reference name="OpenSim.Grid.AssetInventoryServer" /> <Reference name="OpenSim.Grid.AssetInventoryServer" />
<Reference name="OpenMetaverseTypes"/> <Reference name="OpenMetaverseTypes"/>
<Reference name="OpenMetaverse.StructuredData2" /> <Reference name="OpenMetaverse.StructuredData"/>
<Reference name="HttpServer"/> <Reference name="HttpServer"/>
<Reference name="Nini.dll" /> <Reference name="Nini.dll" />
<Reference name="log4net"/> <Reference name="log4net"/>