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

Patch from jhurliman. Fixing the texture decoding issues in progressive 

texture sending. Grain of salt not included.
0.6.1-post-fixes
Melanie Thielker 2008-11-18 20:02:25 +00:00
parent 18b6250f40
commit 0abb762ecc
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Capabilities/LLSD.cs
View File

@ -561,7 +561,7 @@ namespace OpenSim.Framework.Communications.Capabilities
endPos = FindEnd(llsd, 1);
if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float,
Helpers.EnUsCulture.NumberFormat, out value))
Utils.EnUsCulture.NumberFormat, out value))
return value;
else
throw new LLSDParseException("Failed to parse double value type");

1
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
View File

@ -28,7 +28,6 @@
using System.Reflection;
using log4net;
using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces;

3
OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
View File

@ -27,7 +27,6 @@
using System;
using System.Reflection;
using OpenMetaverse.Packets;
using log4net;
using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces;
@ -198,7 +197,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
// See ITextureSender
public bool SendTexturePacket()
{
if (!m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket))
if (download != null && !m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket))
{
SendPacket();
return false;

1
OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
View File

@ -29,7 +29,6 @@ using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using OpenMetaverse;
using OpenMetaverse.Packets;
using log4net;
using Nini.Config;
using Nwc.XmlRpc;

1
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -31,7 +31,6 @@ using System.Reflection;
using System.Text;
using System.Timers;
using OpenMetaverse;
using OpenMetaverse.Packets;
using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;

BIN
bin/OpenMetaverse.dll
View File

Binary file not shown.

BIN
bin/OpenMetaverseTypes.dll
View File

Binary file not shown.

BIN
bin/openjpeg-dotnet.dll
View File

Binary file not shown.

14
prebuild.xml
View File

@ -461,7 +461,7 @@
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="XMLRPC.dll"/>
<Reference name="log4net.dll"/>
@ -706,7 +706,7 @@
<Reference name="System" localCopy="false"/>
<Reference name="System.Runtime.Remoting"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Files>
@ -739,6 +739,8 @@
<Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Interfaces"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code -->
<Reference name="OpenMetaverse.dll"/>
<Reference name="Nini.dll" />
<Reference name="XMLRPC.dll"/>
@ -832,6 +834,7 @@
<Reference name="System.Runtime.Remoting"/>
<Reference name="System.Web"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Data" />
@ -1137,6 +1140,7 @@
<Reference name="System.Xml"/>
<Reference name="Mono.Addins.dll" />
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Data"/>
@ -1942,7 +1946,7 @@
<Reference name="System.Web" localCopy="false"/>
<Reference name="System.Xml" localCopy="false"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="OpenSim" />
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Communications"/>
@ -1983,7 +1987,7 @@
<Reference name="System.Xml" localCopy="false"/>
<Reference name="System.Runtime.Remoting" localCopy="false"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="RAIL.dll"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
@ -2117,7 +2121,7 @@
<Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Grid.Communications.OGS1"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="XMLRPC.dll"/>
<Reference name="log4net.dll"/>