6 files changed, 45 insertions, 41 deletions

diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 5449757..3035a62 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -148,7 +148,8 @@ namespace OpenSim.Framework.Statistics
         /// cover situations where the inventory service accepts the request but never returns any data, since
         /// we do not yet timeout this situation.
         /// </summary>
-        public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } }
+        /// <remarks>Commented out because we do not cache inventory at this point</remarks>
+//        public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } }
 
         /// <summary>
         /// Retrieve the total frame time (in ms) of the last frame
@@ -219,10 +220,10 @@ namespace OpenSim.Framework.Statistics
             assetServiceRequestFailures++;
         }
 
-        public void AddInventoryServiceRetrievalFailure()
-        {
-            inventoryServiceRetrievalFailures++;
-        }
+//        public void AddInventoryServiceRetrievalFailure()
+//        {
+//            inventoryServiceRetrievalFailures++;
+//        }
 
         /// <summary>
         /// Register as a packet queue stats provider
@@ -328,13 +329,13 @@ Asset service request failures: {3}" + Environment.NewLine,
                     "Abnormal client thread terminations: {0}" + Environment.NewLine,
                     abnormalClientThreadTerminations));
 
-            sb.Append(Environment.NewLine);
-            sb.Append("INVENTORY STATISTICS");
-            sb.Append(Environment.NewLine);
-            sb.Append(
-                string.Format(
-                    "Initial inventory caching failures: {0}" + Environment.NewLine,
-                    InventoryServiceRetrievalFailures));
+//            sb.Append(Environment.NewLine);
+//            sb.Append("INVENTORY STATISTICS");
+//            sb.Append(Environment.NewLine);
+//            sb.Append(
+//                string.Format(
+//                    "Initial inventory caching failures: {0}" + Environment.NewLine,
+//                    InventoryServiceRetrievalFailures));
 
             sb.Append(Environment.NewLine);
             sb.Append("FRAME STATISTICS");
@@ -399,8 +400,8 @@ Asset service request failures: {3}" + Environment.NewLine,
                     AssetServiceRequestFailures));
             args["abnormalClientThreadTerminations"] = OSD.FromString (String.Format ("{0:0.##}",
                     abnormalClientThreadTerminations));
-            args["InventoryServiceRetrievalFailures"] = OSD.FromString (String.Format ("{0:0.##}",
-                    InventoryServiceRetrievalFailures));
+//            args["InventoryServiceRetrievalFailures"] = OSD.FromString (String.Format ("{0:0.##}",
+//                    InventoryServiceRetrievalFailures));
             args["Dilatn"] = OSD.FromString (String.Format ("{0:0.##}", timeDilation));
             args["SimFPS"] = OSD.FromString (String.Format ("{0:0.##}", simFps));
             args["PhyFPS"] = OSD.FromString (String.Format ("{0:0.##}", physicsFps));
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 5610c09..7b1aa2c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -492,6 +492,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if ((Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > 1000 * 60)
             {
                 m_log.Warn("[LLUDPSERVER]: Ack timeout, disconnecting " + udpClient.AgentID);
+                StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
 
                 RemoveClient(udpClient);
                 return;
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 1e2901b..1af8346 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -60,10 +60,6 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal event PhysicsCrash UnRecoverableError;
         private PhysicsCrash handlerPhysicsCrash = null;
 
-        public event ObjectDuplicateDelegate OnObjectDuplicate;
-        public event ObjectCreateDelegate OnObjectCreate;
-        public event ObjectDeleteDelegate OnObjectRemove;
-
         #endregion
 
         #region Fields
@@ -404,9 +400,6 @@ namespace OpenSim.Region.Framework.Scenes
             if (attachToBackup)
                 sceneObject.AttachToBackup();
 
-            if (OnObjectCreate != null)
-                OnObjectCreate(sceneObject);
-
             lock (SceneObjectGroupsByFullID)
                 SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
             
@@ -455,9 +448,6 @@ namespace OpenSim.Region.Framework.Scenes
                 if ((grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
                     RemovePhysicalPrim(grp.PrimCount);
             }
-
-            if (OnObjectRemove != null)
-                OnObjectRemove(Entities[uuid]);
             
             lock (SceneObjectGroupsByFullID)
                 SceneObjectGroupsByFullID.Remove(grp.UUID);
@@ -1979,9 +1969,6 @@ namespace OpenSim.Region.Framework.Scenes
                     // required for physics to update it's position
                     copy.AbsolutePosition = copy.AbsolutePosition;
 
-                    if (OnObjectDuplicate != null)
-                        OnObjectDuplicate(original, copy);
-
                     return copy;
                 }
             }
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 95aa864..261029c 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
                 (mod, cmd) => MainConsole.Instance.Output(HandleImageQueuesClear(cmd)));
 
             scene.AddCommand(
-                this, "show image queues",
+                this, "image queues show",
                 "image queues show <first-name> <last-name>",
                 "Show the image queues (textures downloaded via UDP) for a particular client.",
                 (mod, cmd) => MainConsole.Instance.Output(GetImageQueuesReport(cmd)));
@@ -293,7 +293,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
         private string GetImageQueuesReport(string[] showParams)
         {
             if (showParams.Length < 5 || showParams.Length > 6)
-                return "Usage: show image queues <first-name> <last-name> [full]";
+                return "Usage: image queues show <first-name> <last-name> [full]";
 
             string firstName = showParams[3];
             string lastName = showParams[4];
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 68999fc..c6e8286 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -134,9 +134,18 @@ namespace OpenSim.Region.Physics.OdePlugin
                                                         | CollisionCategories.Body
                                                         | CollisionCategories.Character
                                                         | CollisionCategories.Land);
-        internal IntPtr Body = IntPtr.Zero;
+        /// <summary>
+        /// Body for dynamics simulation
+        /// </summary>
+        internal IntPtr Body { get; private set; }
+
         private OdeScene _parent_scene;
-        internal IntPtr Shell = IntPtr.Zero;
+
+        /// <summary>
+        /// Collision geometry
+        /// </summary>
+        internal IntPtr Shell { get; private set; }
+        
         private IntPtr Amotor = IntPtr.Zero;
         private d.Mass ShellMass;
 
@@ -1018,6 +1027,13 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// <param name="tensor"></param>
         private void CreateOdeStructures(float npositionX, float npositionY, float npositionZ, float tensor)
         {
+            if (!(Shell == IntPtr.Zero && Body == IntPtr.Zero && Amotor == IntPtr.Zero))
+            {
+                m_log.ErrorFormat(
+                    "[ODE CHARACTER]: Creating ODE structures for {0} even though some already exist.  Shell = {1}, Body = {2}, Amotor = {3}",
+                    Name, Shell, Body, Amotor);
+            }
+
             int dAMotorEuler = 1;
 //            _parent_scene.waitForSpaceUnlock(_parent_scene.space);
             if (CAPSULE_LENGTH <= 0)
@@ -1135,6 +1151,14 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// </summary>
         internal void DestroyOdeStructures()
         {
+            // Create avatar capsule and related ODE data
+            if (Shell == IntPtr.Zero || Body == IntPtr.Zero || Amotor == IntPtr.Zero)
+            {
+                m_log.ErrorFormat(
+                    "[ODE CHARACTER]: Destroying ODE structures for {0} even though some are already null.  Shell = {1}, Body = {2}, Amotor = {3}",
+                    Name, Shell, Body, Amotor);
+            }
+
             // destroy avatar capsule and related ODE data
             if (Amotor != IntPtr.Zero)
             {
@@ -1260,15 +1284,6 @@ namespace OpenSim.Region.Physics.OdePlugin
             {
                 if (m_tainted_isPhysical)
                 {
-                    // Create avatar capsule and related ODE data
-                    if (!(Shell == IntPtr.Zero && Body == IntPtr.Zero && Amotor == IntPtr.Zero))
-                    {
-                        m_log.Warn("[ODE CHARACTER]: re-creating the following avatar ODE data for " + Name + ", even though it already exists - "
-                            + (Shell!=IntPtr.Zero ? "Shell ":"")
-                            + (Body!=IntPtr.Zero ? "Body ":"")
-                            + (Amotor!=IntPtr.Zero ? "Amotor ":""));
-                    }
-
                     CreateOdeStructures(_position.X, _position.Y, _position.Z, m_tensor);
                     _parent_scene.AddCharacter(this);
                 }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 228eca9..37daf46 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -1525,7 +1525,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 chr.CollidingGround = false;
                 chr.CollidingObj = false;
                 
-                // test the avatar's geometry for collision with the space
+                // Test the avatar's geometry for collision with the space
                 // This will return near and the space that they are the closest to
                 // And we'll run this again against the avatar and the space segment
                 // This will return with a bunch of possible objects in the space segment