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

Merge branch 'master' into uglysky 

# Conflicts:
#	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
#	bin/OpenMetaverse.Rendering.Meshmerizer.dll
#	bin/OpenMetaverse.StructuredData.dll
#	bin/OpenMetaverse.dll
#	bin/OpenMetaverseTypes.dll
master
UbitUmarov 2020-06-29 01:28:33 +01:00
parent d7fb822533 1c4300ff91
commit 7cf329c846
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/WebUtil.cs
View File

@ -794,19 +794,16 @@ namespace OpenSim.Framework
request.Method = verb; request.Method = verb;
MemoryStream buffer = null;
byte[] data = null; byte[] data = null;
try try
{ {
if (verb == "POST") if (verb == "POST")
{ {
request.ContentType = "text/xml"; request.ContentType = "text/xml";
buffer = new MemoryStream();
XmlWriterSettings settings = new XmlWriterSettings(); XmlWriterSettings settings = new XmlWriterSettings();
settings.Encoding = Encoding.UTF8; settings.Encoding = Encoding.UTF8;
using (MemoryStream buffer = new MemoryStream())
using (XmlWriter writer = XmlWriter.Create(buffer, settings)) using (XmlWriter writer = XmlWriter.Create(buffer, settings))
{ {
XmlSerializer serializer = new XmlSerializer(type); XmlSerializer serializer = new XmlSerializer(type);
@ -947,11 +944,7 @@ namespace OpenSim.Framework
reqnum, tickdiff, tickdata); reqnum, tickdiff, tickdata);
} }
} }
finally catch { }
{
if (buffer != null && buffer.CanRead)
buffer.Dispose();
}
} }
} }
@ -1010,7 +1003,7 @@ namespace OpenSim.Framework
try try
{ {
using(Stream requestStream = request.GetRequestStream()) using(Stream requestStream = request.GetRequestStream())
requestStream.Write(data,0,length); requestStream.Write(data, 0, length);
} }
catch (Exception e) catch (Exception e)
{ {
@ -1276,8 +1269,8 @@ namespace OpenSim.Framework
request.ContentType = "text/xml"; request.ContentType = "text/xml";
byte[] data; byte[] data;
XmlWriterSettings settings = new XmlWriterSettings(){CloseOutput = true, Encoding = Util.UTF8}; XmlWriterSettings settings = new XmlWriterSettings(){Encoding = Util.UTF8};
MemoryStream ms = new MemoryStream(); using (MemoryStream ms = new MemoryStream())
using (XmlWriter writer = XmlWriter.Create(ms, settings)) using (XmlWriter writer = XmlWriter.Create(ms, settings))
{ {
XmlSerializer serializer = new XmlSerializer(type); XmlSerializer serializer = new XmlSerializer(type);

4
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@ -180,8 +180,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport) if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
flags |= RegionFlags.ResetHomeOnTeleport; flags |= RegionFlags.ResetHomeOnTeleport;
if (Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
flags |= RegionFlags.AllowEnvironmentOverride;
// TODO: SkipUpdateInterestList // TODO: SkipUpdateInterestList
@ -426,8 +424,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
{ {
//uint sun = 0; //uint sun = 0;
//if (Scene.RegionInfo.EstateSettings.FixedSun)
// sun = (uint)(Scene.RegionInfo.EstateSettings.SunPosition * 1024.0) + 0x1800;
UUID estateOwner; UUID estateOwner;
estateOwner = Scene.RegionInfo.EstateSettings.EstateOwner; estateOwner = Scene.RegionInfo.EstateSettings.EstateOwner;