aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSD.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs1
-rw-r--r--bin/OpenMetaverse.dllbin1716224 -> 1622016 bytes
-rw-r--r--bin/OpenMetaverseTypes.dllbin60928 -> 69632 bytes
-rw-r--r--bin/openjpeg-dotnet.dllbin196608 -> 196608 bytes
-rw-r--r--prebuild.xml14
9 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index 44c4a05..e754256 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -561,7 +561,7 @@ namespace OpenSim.Framework.Communications.Capabilities
561 endPos = FindEnd(llsd, 1); 561 endPos = FindEnd(llsd, 1);
562 562
563 if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float, 563 if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float,
564 Helpers.EnUsCulture.NumberFormat, out value)) 564 Utils.EnUsCulture.NumberFormat, out value))
565 return value; 565 return value;
566 else 566 else
567 throw new LLSDParseException("Failed to parse double value type"); 567 throw new LLSDParseException("Failed to parse double value type");
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
index c064064..044ee76 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -28,7 +28,6 @@
28using System.Reflection; 28using System.Reflection;
29using log4net; 29using log4net;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenMetaverse.Packets;
32using OpenSim.Framework; 31using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
34 33
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index b177103..65ca854 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
@@ -27,7 +27,6 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using OpenMetaverse.Packets;
31using log4net; 30using log4net;
32using OpenSim.Framework; 31using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
@@ -198,7 +197,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
198 // See ITextureSender 197 // See ITextureSender
199 public bool SendTexturePacket() 198 public bool SendTexturePacket()
200 { 199 {
201 if (!m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket)) 200 if (download != null && !m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket))
202 { 201 {
203 SendPacket(); 202 SendPacket();
204 return false; 203 return false;
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index daff760..989f36c 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -29,7 +29,6 @@ using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenMetaverse.Packets;
33using log4net; 32using log4net;
34using Nini.Config; 33using Nini.Config;
35using Nwc.XmlRpc; 34using Nwc.XmlRpc;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index e46b13c..5bfa1eb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -31,7 +31,6 @@ using System.Reflection;
31using System.Text; 31using System.Text;
32using System.Timers; 32using System.Timers;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenMetaverse.Packets;
35using log4net; 34using log4net;
36using OpenSim.Framework; 35using OpenSim.Framework;
37using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 4c68e49..be1cd40 100644
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 836c95e..21004df 100644
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
Binary files differ
diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll
index 50a6b45..d5f71c1 100644
--- a/bin/openjpeg-dotnet.dll
+++ b/bin/openjpeg-dotnet.dll
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 9d66e9b..f5467df 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -461,7 +461,7 @@
461 <Reference name="OpenSim.Framework"/> 461 <Reference name="OpenSim.Framework"/>
462 <Reference name="OpenSim.Framework.Console"/> 462 <Reference name="OpenSim.Framework.Console"/>
463 <Reference name="OpenSim.Framework.Statistics"/> 463 <Reference name="OpenSim.Framework.Statistics"/>
464 <Reference name="OpenMetaverse.dll"/> 464 <Reference name="OpenMetaverse.StructuredData.dll"/>
465 <Reference name="OpenMetaverseTypes.dll"/> 465 <Reference name="OpenMetaverseTypes.dll"/>
466 <Reference name="XMLRPC.dll"/> 466 <Reference name="XMLRPC.dll"/>
467 <Reference name="log4net.dll"/> 467 <Reference name="log4net.dll"/>
@@ -706,7 +706,7 @@
706 <Reference name="System" localCopy="false"/> 706 <Reference name="System" localCopy="false"/>
707 <Reference name="System.Runtime.Remoting"/> 707 <Reference name="System.Runtime.Remoting"/>
708 <Reference name="OpenSim.Framework"/> 708 <Reference name="OpenSim.Framework"/>
709 <Reference name="OpenMetaverse.dll"/> 709 <Reference name="OpenMetaverse.StructuredData.dll"/>
710 <Reference name="OpenMetaverseTypes.dll"/> 710 <Reference name="OpenMetaverseTypes.dll"/>
711 711
712 <Files> 712 <Files>
@@ -739,6 +739,8 @@
739 <Reference name="OpenSim.Framework.Statistics"/> 739 <Reference name="OpenSim.Framework.Statistics"/>
740 <Reference name="OpenSim.Region.Interfaces"/> 740 <Reference name="OpenSim.Region.Interfaces"/>
741 <Reference name="OpenMetaverseTypes.dll"/> 741 <Reference name="OpenMetaverseTypes.dll"/>
742 <Reference name="OpenMetaverse.StructuredData.dll"/>
743 <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code -->
742 <Reference name="OpenMetaverse.dll"/> 744 <Reference name="OpenMetaverse.dll"/>
743 <Reference name="Nini.dll" /> 745 <Reference name="Nini.dll" />
744 <Reference name="XMLRPC.dll"/> 746 <Reference name="XMLRPC.dll"/>
@@ -832,6 +834,7 @@
832 <Reference name="System.Runtime.Remoting"/> 834 <Reference name="System.Runtime.Remoting"/>
833 <Reference name="System.Web"/> 835 <Reference name="System.Web"/>
834 <Reference name="OpenMetaverseTypes.dll"/> 836 <Reference name="OpenMetaverseTypes.dll"/>
837 <Reference name="OpenMetaverse.StructuredData.dll"/>
835 <Reference name="OpenMetaverse.dll"/> 838 <Reference name="OpenMetaverse.dll"/>
836 <Reference name="OpenSim.Framework"/> 839 <Reference name="OpenSim.Framework"/>
837 <Reference name="OpenSim.Data" /> 840 <Reference name="OpenSim.Data" />
@@ -1137,6 +1140,7 @@
1137 <Reference name="System.Xml"/> 1140 <Reference name="System.Xml"/>
1138 <Reference name="Mono.Addins.dll" /> 1141 <Reference name="Mono.Addins.dll" />
1139 <Reference name="OpenMetaverseTypes.dll"/> 1142 <Reference name="OpenMetaverseTypes.dll"/>
1143 <Reference name="OpenMetaverse.StructuredData.dll"/>
1140 <Reference name="OpenMetaverse.dll"/> 1144 <Reference name="OpenMetaverse.dll"/>
1141 <Reference name="OpenSim.Framework"/> 1145 <Reference name="OpenSim.Framework"/>
1142 <Reference name="OpenSim.Data"/> 1146 <Reference name="OpenSim.Data"/>
@@ -1942,7 +1946,7 @@
1942 <Reference name="System.Web" localCopy="false"/> 1946 <Reference name="System.Web" localCopy="false"/>
1943 <Reference name="System.Xml" localCopy="false"/> 1947 <Reference name="System.Xml" localCopy="false"/>
1944 <Reference name="OpenMetaverseTypes.dll"/> 1948 <Reference name="OpenMetaverseTypes.dll"/>
1945 <Reference name="OpenMetaverse.dll"/> 1949 <Reference name="OpenMetaverse.StructuredData.dll"/>
1946 <Reference name="OpenSim" /> 1950 <Reference name="OpenSim" />
1947 <Reference name="OpenSim.Framework"/> 1951 <Reference name="OpenSim.Framework"/>
1948 <Reference name="OpenSim.Framework.Communications"/> 1952 <Reference name="OpenSim.Framework.Communications"/>
@@ -1983,7 +1987,7 @@
1983 <Reference name="System.Xml" localCopy="false"/> 1987 <Reference name="System.Xml" localCopy="false"/>
1984 <Reference name="System.Runtime.Remoting" localCopy="false"/> 1988 <Reference name="System.Runtime.Remoting" localCopy="false"/>
1985 <Reference name="OpenMetaverseTypes.dll"/> 1989 <Reference name="OpenMetaverseTypes.dll"/>
1986 <Reference name="OpenMetaverse.dll"/> 1990 <Reference name="OpenMetaverse.StructuredData.dll"/>
1987 <Reference name="RAIL.dll"/> 1991 <Reference name="RAIL.dll"/>
1988 <Reference name="OpenSim.Framework"/> 1992 <Reference name="OpenSim.Framework"/>
1989 <Reference name="OpenSim.Framework.Console"/> 1993 <Reference name="OpenSim.Framework.Console"/>
@@ -2117,7 +2121,7 @@
2117 <Reference name="OpenSim.Framework.Statistics"/> 2121 <Reference name="OpenSim.Framework.Statistics"/>
2118 <Reference name="OpenSim.Grid.Communications.OGS1"/> 2122 <Reference name="OpenSim.Grid.Communications.OGS1"/>
2119 <Reference name="OpenMetaverseTypes.dll"/> 2123 <Reference name="OpenMetaverseTypes.dll"/>
2120 <Reference name="OpenMetaverse.dll"/> 2124 <Reference name="OpenMetaverse.StructuredData.dll"/>
2121 <Reference name="XMLRPC.dll"/> 2125 <Reference name="XMLRPC.dll"/>
2122 <Reference name="log4net.dll"/> 2126 <Reference name="log4net.dll"/>
2123 2127