2 files changed, 20 insertions, 12 deletions

diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index d126569..0adace1 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -319,7 +319,15 @@ namespace OpenSim.Region.Environment.Modules
                         int size = m_asset.Data.Length - 600 - (1000 * (PacketCounter - 1));
                         if (size > 1000) size = 1000;
                         im.ImageData.Data = new byte[size];
-                        Array.Copy(m_asset.Data, 600 + (1000 * (PacketCounter - 1)), im.ImageData.Data, 0, size);
+                        try
+                        {
+                            Array.Copy(m_asset.Data, 600 + (1000 * (PacketCounter - 1)), im.ImageData.Data, 0, size);
+                        }
+                        catch (System.ArgumentOutOfRangeException)
+                        {
+                            OpenSim.Framework.Console.MainLog.Instance.Warn("TEXTURE", "Unable to separate texture into multiple packets: Array bounds failure on asset:" + m_asset.FullID.ToString() + "- TextureDownloadModule.cs. line:328");
+                            return;
+                        }
                         RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
                         PacketCounter++;
                     }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 5570136..03f1a70 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -999,17 +999,17 @@ namespace OpenSim.Region.Environment.Scenes
             if (m_physicsActor.Flying)
             {
                 direc *= 4;
-                bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0));
-                bool colliding = (m_physicsActor.IsColliding==true);
-                if (controlland) 
-                    MainLog.Instance.Verbose("AGENT","landCommand");
-                if (colliding ) 
-                    MainLog.Instance.Verbose("AGENT","colliding");
-                if (m_physicsActor.Flying && colliding && controlland)
-                {
-                    StopFlying();
-                    MainLog.Instance.Verbose("AGENT", "Stop FLying");
-                }
+                //bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0));
+                //bool colliding = (m_physicsActor.IsColliding==true);
+                //if (controlland) 
+                //    MainLog.Instance.Verbose("AGENT","landCommand");
+                //if (colliding ) 
+                //    MainLog.Instance.Verbose("AGENT","colliding");
+                //if (m_physicsActor.Flying && colliding && controlland)
+                //{
+                //    StopFlying();
+                //    MainLog.Instance.Verbose("AGENT", "Stop FLying");
+                //}
             }
             else
             {