Merge branch 'master' into connector_plugin

Conflicts:
	OpenSim/Server/ServerMain.cs

OpenSim/Framework/Console/ConsoleUtil.cs

@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+
+public class ConsoleUtil
+{
+    private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+    public const string MinRawConsoleVectorValue = "-~";
+    public const string MaxRawConsoleVectorValue = "~";
+
+    public const string VectorSeparator = ",";
+    public static char[] VectorSeparatorChars = VectorSeparator.ToCharArray();
+
+    /// <summary>
+    /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3
+    /// </summary>
+    /// <param name='rawConsoleVector'>/param>
+    /// <param name='vector'></param>
+    /// <returns></returns>
+    public static bool TryParseConsoleMinVector(string rawConsoleVector, out Vector3 vector)
+    {
+        return TryParseConsoleVector(rawConsoleVector, c => float.MinValue.ToString(), out vector);
+    }
+
+    /// <summary>
+    /// Convert a maximum vector input from the console to an OpenMetaverse.Vector3
+    /// </summary>
+    /// <param name='rawConsoleVector'>/param>
+    /// <param name='vector'></param>
+    /// <returns></returns>
+    public static bool TryParseConsoleMaxVector(string rawConsoleVector, out Vector3 vector)
+    {
+        return TryParseConsoleVector(rawConsoleVector, c => float.MaxValue.ToString(), out vector);
+    }
+
+    /// <summary>
+    /// Convert a vector input from the console to an OpenMetaverse.Vector3
+    /// </summary>
+    /// <param name='rawConsoleVector'>
+    /// A string in the form <x>,<y>,<z> where there is no space between values.
+    /// Any component can be missing (e.g. ,,40).  blankComponentFunc is invoked to replace the blank with a suitable value
+    /// Also, if the blank component is at the end, then the comma can be missed off entirely (e.g. 40,30 or 40)
+    /// The strings "~" and "-~" are valid in components.  The first substitutes float.MaxValue whilst the second is float.MinValue
+    /// Other than that, component values must be numeric.
+    /// </param>
+    /// <param name='blankComponentFunc'></param>
+    /// <param name='vector'></param>
+    /// <returns></returns>
+    public static bool TryParseConsoleVector(
+        string rawConsoleVector, Func<string, string> blankComponentFunc, out Vector3 vector)
+    {
+        List<string> components = rawConsoleVector.Split(VectorSeparatorChars).ToList();
+
+        if (components.Count < 1 || components.Count > 3)
+        {
+            vector = Vector3.Zero;
+            return false;
+        }
+
+        for (int i = components.Count; i < 3; i++)
+            components.Add("");
+
+        List<string> semiDigestedComponents
+            = components.ConvertAll<string>(
+                c =>
+                {
+                    if (c == "")
+                        return blankComponentFunc.Invoke(c);
+                    else if (c == MaxRawConsoleVectorValue)
+                        return float.MaxValue.ToString();
+                    else if (c == MinRawConsoleVectorValue)
+                        return float.MinValue.ToString();
+                    else
+                        return c;
+                });
+
+        string semiDigestedConsoleVector = string.Join(VectorSeparator, semiDigestedComponents.ToArray());
+
+        m_log.DebugFormat("[CONSOLE UTIL]: Parsing {0} into OpenMetaverse.Vector3", semiDigestedConsoleVector);
+
+        return Vector3.TryParse(semiDigestedConsoleVector, out vector);
+    }
+}

OpenSim/Framework/GridInstantMessage.cs

@@ -44,7 +44,6 @@ namespace OpenSim.Framework
         public Vector3 Position;
         public byte[] binaryBucket;
 
-
         public uint ParentEstateID;
         public Guid RegionID;
         public uint timestamp;
@@ -58,7 +57,7 @@ namespace OpenSim.Framework
                 string _fromAgentName, UUID _toAgentID,
                 byte _dialog, bool _fromGroup, string _message,
                 UUID _imSessionID, bool _offline, Vector3 _position,
-                byte[] _binaryBucket)
+                byte[] _binaryBucket, bool addTimestamp)
         {
             fromAgentID = _fromAgentID.Guid;
             fromAgentName = _fromAgentName;
@@ -79,6 +78,8 @@ namespace OpenSim.Framework
                 ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID;
                 RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid;
             }
+
+            if (addTimestamp)
                 timestamp = (uint)Util.UnixTimeSinceEpoch();
         }
 
@@ -87,7 +88,7 @@ namespace OpenSim.Framework
                 string _message, bool _offline,
                 Vector3 _position) : this(scene, _fromAgentID, _fromAgentName,
                 _toAgentID, _dialog, false, _message,
-                _fromAgentID ^ _toAgentID, _offline, _position, new byte[0])
+                _fromAgentID ^ _toAgentID, _offline, _position, new byte[0], true)
         {
         }
     }

OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs

@@ -355,10 +355,19 @@ Asset service request failures: {3}" + Environment.NewLine,
             sb.Append(Environment.NewLine);
             sb.Append(
                 string.Format(
-                    "{0,6:0}  {1,6:0}  {2,6:0}  {3,6:0}  {4,6:0}  {5,6:0.0}  {6,6:0.0}  {7,6:0.0}  {8,6:0.0}  {9,6:0.0}  {10,6:0.0}",
+                    "{0,6:0}  {1,6:0}  {2,6:0}  {3,6:0}  {4,6:0}  {5,6:0.0}  {6,6:0.0}  {7,6:0.0}  {8,6:0.0}  {9,6:0.0}  {10,6:0.0}\n\n",
                     inPacketsPerSecond, outPacketsPerSecond, pendingDownloads, pendingUploads, unackedBytes, totalFrameTime,
                     netFrameTime, physicsFrameTime, otherFrameTime, agentFrameTime, imageFrameTime));
-            sb.Append(Environment.NewLine);
+
+            foreach (KeyValuePair<string, Stat> kvp in StatsManager.RegisteredStats)
+            {
+                Stat stat = kvp.Value;
+
+                if (stat.Category == "scene" && stat.Verbosity == StatVerbosity.Info)
+                {
+                    sb.AppendFormat("Slow frames ({0}): {1}\n", stat.Container, stat.Value);
+                }
+            }
 
             /*
             sb.Append(Environment.NewLine);

OpenSim/Framework/Monitoring/StatsManager.cs

@@ -25,6 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using System.Collections.Generic;
+
 namespace OpenSim.Framework.Monitoring
 {
     /// <summary>
@@ -32,6 +35,14 @@ namespace OpenSim.Framework.Monitoring
     /// </summary>
     public class StatsManager
     {
+        /// <summary>
+        /// Registered stats.
+        /// </summary>
+        /// <remarks>
+        /// Do not add or remove from this dictionary.
+        /// </remarks>
+        public static Dictionary<string, Stat> RegisteredStats = new Dictionary<string, Stat>();
+
         private static AssetStatsCollector assetStats;
         private static UserStatsCollector userStats;
         private static SimExtraStatsCollector simExtraStats = new SimExtraStatsCollector();
@@ -61,5 +72,139 @@ namespace OpenSim.Framework.Monitoring
 
             return userStats;
         }
+
+        public static bool RegisterStat(Stat stat)
+        {
+            lock (RegisteredStats)
+            {
+                if (RegisteredStats.ContainsKey(stat.UniqueName))
+                {
+                    // XXX: For now just return false.  This is to avoid problems in regression tests where all tests
+                    // in a class are run in the same instance of the VM.
+                    return false;
+
+//                    throw new Exception(
+//                        "StatsManager already contains stat with ShortName {0} in Category {1}", stat.ShortName, stat.Category);
+                }
+
+                // We take a replace-on-write approach here so that we don't need to generate a new Dictionary
+                Dictionary<string, Stat> newRegisteredStats = new Dictionary<string, Stat>(RegisteredStats);
+                newRegisteredStats[stat.UniqueName] = stat;
+                RegisteredStats = newRegisteredStats;
+            }
+
+            return true;
+        }
+
+        public static bool DeregisterStat(Stat stat)
+        {
+            lock (RegisteredStats)
+            {
+                if (!RegisteredStats.ContainsKey(stat.UniqueName))
+                    return false;
+
+                Dictionary<string, Stat> newRegisteredStats = new Dictionary<string, Stat>(RegisteredStats);
+                newRegisteredStats.Remove(stat.UniqueName);
+                RegisteredStats = newRegisteredStats;
+
+                return true;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Verbosity of stat.
+    /// </summary>
+    /// <remarks>
+    /// Info will always be displayed.
+    /// </remarks>
+    public enum StatVerbosity
+    {
+        Debug,
+        Info
+    }
+
+    /// <summary>
+    /// Holds individual static details
+    /// </summary>
+    public class Stat
+    {
+        /// <summary>
+        /// Unique stat name used for indexing.  Each ShortName in a Category must be unique.
+        /// </summary>
+        public string UniqueName { get; private set; }
+
+        /// <summary>
+        /// Category of this stat (e.g. cache, scene, etc).
+        /// </summary>
+        public string Category { get; private set; }
+
+        /// <summary>
+        /// Containing name for this stat.
+        /// FIXME: In the case of a scene, this is currently the scene name (though this leaves
+        /// us with a to-be-resolved problem of non-unique region names).
+        /// </summary>
+        /// <value>
+        /// The container.
+        /// </value>
+        public string Container { get; private set; }
+
+        public StatVerbosity Verbosity { get; private set; }
+        public string ShortName { get; private set; }
+        public string Name { get; private set; }
+        public string Description { get; private set; }
+        public virtual string UnitName { get; private set; }
+
+        public virtual double Value { get; set; }
+
+        public Stat(
+            string shortName, string name, string unitName, string category, string container, StatVerbosity verbosity, string description)
+        {
+            ShortName = shortName;
+            Name = name;
+            UnitName = unitName;
+            Category = category;
+            Container = container;
+            Verbosity = verbosity;
+            Description = description;
+
+            UniqueName = GenUniqueName(Container, Category, ShortName);
+        }
+
+        public static string GenUniqueName(string container, string category, string shortName)
+        {
+            return string.Format("{0}+{1}+{2}", container, category, shortName);
+        }
+    }
+
+    public class PercentageStat : Stat
+    {
+        public int Antecedent { get; set; }
+        public int Consequent { get; set; }
+
+        public override double Value
+        {
+            get
+            {
+                int c = Consequent;
+
+                // Avoid any chance of a multi-threaded divide-by-zero
+                if (c == 0)
+                    return 0;
+
+                return (double)Antecedent / c;
+            }
+
+            set
+            {
+                throw new Exception("Cannot set value on a PercentageStat");
+            }
+        }
+
+        public PercentageStat(
+            string shortName, string name, string category, string container, StatVerbosity verbosity, string description)
+            : base(shortName, name, " %", category, container, verbosity, description)
+        {
+        }
     }
 }

OpenSim/Framework/Util.cs

@@ -533,6 +533,19 @@ namespace OpenSim.Framework
             return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
         }
 
+        /// <summary>
+        /// Determines whether a point is inside a bounding box.
+        /// </summary>
+        /// <param name='v'>/param>
+        /// <param name='min'></param>
+        /// <param name='max'></param>
+        /// <returns></returns>
+        public static bool IsInsideBox(Vector3 v, Vector3 min, Vector3 max)
+        {
+            return v.X >= min.X & v.Y >= min.Y && v.Z >= min.Z
+                && v.X <= max.X && v.Y <= max.Y && v.Z <= max.Z;
+        }
+
         /// <summary>
         /// Are the co-ordinates of the new region visible from the old region?
         /// </summary>

OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs

@@ -5862,7 +5862,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         msgpack.MessageBlock.ID,
                         msgpack.MessageBlock.Offline != 0 ? true : false,
                         msgpack.MessageBlock.Position,
-                        msgpack.MessageBlock.BinaryBucket);
+                        msgpack.MessageBlock.BinaryBucket,
+                        true);
 
                 handlerInstantMessage(this, im);
             }

OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

@@ -222,6 +222,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 m_pausedAckTimeout = 1000 * 300; // 5 minutes
             }
 
+            // FIXME: This actually only needs to be done once since the PacketPool is shared across all servers.
+            // However, there is no harm in temporarily doing it multiple times.
+            IConfig packetConfig = configSource.Configs["PacketPool"];
+            if (packetConfig != null)
+            {
+                PacketPool.Instance.RecyclePackets = packetConfig.GetBoolean("RecyclePackets", true);
+                PacketPool.Instance.RecycleDataBlocks = packetConfig.GetBoolean("RecycleDataBlocks", true);
+            }
+
             #region BinaryStats
             config = configSource.Configs["Statistics.Binary"];
             m_shouldCollectStats = false;

OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs

@@ -32,9 +32,8 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using log4net;
 
-namespace OpenSim.Framework
+namespace OpenSim.Region.ClientStack.LindenUDP
 {
-
     public sealed class PacketPool
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -44,6 +43,9 @@ namespace OpenSim.Framework
         private bool packetPoolEnabled = true;
         private bool dataBlockPoolEnabled = true;
 
+        /// <summary>
+        /// Pool of packets available for reuse.
+        /// </summary>
         private readonly Dictionary<PacketType, Stack<Packet>> pool = new Dictionary<PacketType, Stack<Packet>>();
 
         private static Dictionary<Type, Stack<Object>> DataBlocks =

OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs

@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                         client.FirstName+" "+client.LastName,
                         destID, (byte)211, false,
                         String.Empty,
-                        transactionID, false, new Vector3(), new byte[0]),
+                        transactionID, false, new Vector3(), new byte[0], true),
                         delegate(bool success) {} );
             }
         }

OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs

@@ -297,6 +297,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         });
                 }
             }
+
+            // XXX: This code was placed here to try and accomdate RLV which moves given folders named #RLV/~<name>
+            // to a folder called name in #RLV.  However, this approach may not be ultimately correct - from analysis
+            // of Firestorm 4.2.2 on sending an InventoryOffered instead of TaskInventoryOffered (as was previously
+            // done), the viewer itself would appear to move and rename the folder, rather than the simulator doing it here.
             else if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
             {
                 UUID destinationFolderID = UUID.Zero;
@@ -308,6 +313,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
                 if (destinationFolderID != UUID.Zero)
                 {
+                    InventoryFolderBase destinationFolder = new InventoryFolderBase(destinationFolderID, client.AgentId);
+                    if (destinationFolder == null)
+                    {
+                        m_log.WarnFormat(
+                            "[INVENTORY TRANSFER]: TaskInventoryAccepted message from {0} in {1} specified folder {2} which does not exist",
+                            client.Name, scene.Name, destinationFolderID);
+
+                        return;
+                    }
+
                     IInventoryService invService = scene.InventoryService;
 
                     UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
@@ -315,9 +330,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId);
                     item = invService.GetItem(item);
                     InventoryFolderBase folder = null;
+                    UUID? previousParentFolderID = null;
 
                     if (item != null) // It's an item
                     {
+                        previousParentFolderID = item.Folder;
                         item.Folder = destinationFolderID;
 
                         invService.DeleteItems(item.Owner, new List<UUID>() { item.ID });
@@ -330,10 +347,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
                         if (folder != null) // It's a folder
                         {
+                            previousParentFolderID = folder.ParentID;
                             folder.ParentID = destinationFolderID;
                             invService.MoveFolder(folder);
                         }
                     }
+
+                    // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code).
+                    if (previousParentFolderID != null)
+                    {
+                        InventoryFolderBase previousParentFolder
+                            = new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId);
+                        previousParentFolder = invService.GetFolder(previousParentFolder);
+                        scene.SendInventoryUpdate(client, previousParentFolder, true, true);
+
+                        scene.SendInventoryUpdate(client, destinationFolder, true, true);
+                    }
                 }
             }
             else if (
@@ -354,9 +383,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId);
                 item = invService.GetItem(item);
                 InventoryFolderBase folder = null;
+                UUID? previousParentFolderID = null;
                 
                 if (item != null && trashFolder != null)
                 {
+                    previousParentFolderID = item.Folder;
                     item.Folder = trashFolder.ID;
 
                     // Diva comment: can't we just update this item???
@@ -372,6 +403,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     
                     if (folder != null & trashFolder != null)
                     {
+                        previousParentFolderID = folder.ParentID;
                         folder.ParentID = trashFolder.ID;
                         invService.MoveFolder(folder);
                     }
@@ -391,6 +423,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     client.SendAgentAlertMessage("Unable to delete "+
                             "received inventory" + reason, false);
                 }
+                // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code).
+                else if (previousParentFolderID != null)
+                {
+                    InventoryFolderBase previousParentFolder
+                        = new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId);
+                    previousParentFolder = invService.GetFolder(previousParentFolder);
+                    scene.SendInventoryUpdate(client, previousParentFolder, true, true);
+
+                    scene.SendInventoryUpdate(client, trashFolder, true, true);
+                }
 
                 ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
 

OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs

@@ -186,7 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                     client.FirstName+" "+client.LastName, targetid,
                     (byte)InstantMessageDialog.RequestTeleport, false,
                     message, sessionID, false, presence.AbsolutePosition,
-                    new Byte[0]);
+                    new Byte[0], true);
             m.RegionID = client.Scene.RegionInfo.RegionID.Guid;
 
             m_log.DebugFormat("[HG LURE MODULE]: RequestTeleport sessionID={0}, regionID={1}, message={2}", m.imSessionID, m.RegionID, m.message);

OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs

@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                     client.FirstName+" "+client.LastName, targetid,
                     (byte)InstantMessageDialog.RequestTeleport, false,
                     message, dest, false, presence.AbsolutePosition,
-                    new Byte[0]);
+                    new Byte[0], true);
                     
             if (m_TransferModule != null)
             {

OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

@@ -1068,6 +1068,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             Scene initiatingScene)
         {
             Thread.Sleep(10000);
+            
             IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>();
             if (im != null)
             {
@@ -1080,11 +1081,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     (uint)(int)position.X,
                     (uint)(int)position.Y,
                     (uint)(int)position.Z);
-                GridInstantMessage m = new GridInstantMessage(initiatingScene, UUID.Zero,
-                "Region", agent.UUID,
-                (byte)InstantMessageDialog.GodLikeRequestTeleport, false,
-                "", gotoLocation, false, new Vector3(127, 0, 0),
-                new Byte[0]);
+
+                GridInstantMessage m
+                    = new GridInstantMessage(
+                        initiatingScene,
+                        UUID.Zero,
+                        "Region",
+                        agent.UUID,
+                        (byte)InstantMessageDialog.GodLikeRequestTeleport,
+                        false,
+                        "",
+                        gotoLocation,
+                        false,
+                        new Vector3(127, 0, 0),
+                        new Byte[0],
+                        false);
+
                 im.SendInstantMessage(m, delegate(bool success)
                 {
                     m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Client Initiating Teleport sending IM success = {0}", success);

OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs

@@ -95,14 +95,14 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
         {
             foreach (IMonitor monitor in m_staticMonitors)
             {
-                m_log.InfoFormat(
+                MainConsole.Instance.OutputFormat(
                     "[MONITOR MODULE]: {0} reports {1} = {2}",
                     m_scene.RegionInfo.RegionName, monitor.GetFriendlyName(), monitor.GetFriendlyValue());
             }
 
             foreach (KeyValuePair<string, float> tuple in m_scene.StatsReporter.GetExtraSimStats())
             {
-                m_log.InfoFormat(
+                MainConsole.Instance.OutputFormat(
                     "[MONITOR MODULE]: {0} reports {1} = {2}",
                     m_scene.RegionInfo.RegionName, tuple.Key, tuple.Value);
             }

OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs

@@ -31,6 +31,7 @@ using System.Reflection;
 
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
+using OpenSim.Region.ClientStack.LindenUDP;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;

OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs

@@ -123,6 +123,25 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "If --regex is specified then the name is treatead as a regular expression",
                 HandleShowObjectByName);
 
+            m_console.Commands.AddCommand(
+                "Objects",
+                false,
+                "show object pos",
+                "show object pos <start-coord> to <end-coord>",
+                "Show details of scene objects within the given area.",
+                "Each component of the coord is comma separated.  There must be no spaces between the commas.\n"
+                    + "If you don't care about the z component you can simply omit it.\n"
+                    + "If you don't care about the x or y components then you can leave them blank (though a comma is still required)\n"
+                    + "If you want to specify the maxmimum value of a component then you can use ~ instead of a number\n"
+                    + "If you want to specify the minimum value of a component then you can use -~ instead of a number\n"
+                    + "e.g.\n"
+                    + "show object pos 20,20,20 to 40,40,40\n"
+                    + "show object pos 20,20 to 40,40\n"
+                    + "show object pos ,20,20 to ,40,40\n"
+                    + "show object pos ,,30 to ,,~\n"
+                    + "show object pos ,,-~ to ,,30",
+                HandleShowObjectByPos);
+
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
@@ -138,6 +157,25 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "Show details of scene object parts with the given name.",
                 "If --regex is specified then the name is treatead as a regular expression",
                 HandleShowPartByName);
+
+            m_console.Commands.AddCommand(
+                "Objects",
+                false,
+                "show part pos",
+                "show part pos <start-coord> to <end-coord>",
+                "Show details of scene object parts within the given area.",
+                "Each component of the coord is comma separated.  There must be no spaces between the commas.\n"
+                    + "If you don't care about the z component you can simply omit it.\n"
+                    + "If you don't care about the x or y components then you can leave them blank (though a comma is still required)\n"
+                    + "If you want to specify the maxmimum value of a component then you can use ~ instead of a number\n"
+                    + "If you want to specify the minimum value of a component then you can use -~ instead of a number\n"
+                    + "e.g.\n"
+                    + "show object pos 20,20,20 to 40,40,40\n"
+                    + "show object pos 20,20 to 40,40\n"
+                    + "show object pos ,20,20 to ,40,40\n"
+                    + "show object pos ,,30 to ,,~\n"
+                    + "show object pos ,,-~ to ,,30",
+                HandleShowPartByPos);
         }
 
         public void RemoveRegion(Scene scene)
@@ -150,6 +188,43 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 //            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
         }
 
+        private void OutputSogsToConsole(Predicate<SceneObjectGroup> searchPredicate)
+        {
+            List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups().FindAll(searchPredicate);
+
+            StringBuilder sb = new StringBuilder();
+
+            foreach (SceneObjectGroup so in sceneObjects)
+            {
+                AddSceneObjectReport(sb, so);
+                sb.Append("\n");
+            }
+
+            sb.AppendFormat("{0} object(s) found in {1}\n", sceneObjects.Count, m_scene.Name);
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private void OutputSopsToConsole(Predicate<SceneObjectPart> searchPredicate)
+        {
+            List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups();
+            List<SceneObjectPart> parts = new List<SceneObjectPart>();
+
+            sceneObjects.ForEach(so => parts.AddRange(Array.FindAll<SceneObjectPart>(so.Parts, searchPredicate)));
+
+            StringBuilder sb = new StringBuilder();
+
+            foreach (SceneObjectPart part in parts)
+            {
+                AddScenePartReport(sb, part);
+                sb.Append("\n");
+            }
+
+            sb.AppendFormat("{0} parts found in {1}\n", parts.Count, m_scene.Name);
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
         private void HandleShowObjectByUuid(string module, string[] cmd)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
@@ -200,36 +275,54 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             string name = mainParams[3];
 
-            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
-            Action<SceneObjectGroup> searchAction;
+            Predicate<SceneObjectGroup> searchPredicate;
 
             if (useRegex)
             {
                 Regex nameRegex = new Regex(name);
-                searchAction = so => { if (nameRegex.IsMatch(so.Name)) { sceneObjects.Add(so); }};
+                searchPredicate = so => nameRegex.IsMatch(so.Name);
             }
             else
             {
-                searchAction = so => { if (so.Name == name) { sceneObjects.Add(so); }};
+                searchPredicate = so => so.Name == name;
             }
 
-            m_scene.ForEachSOG(searchAction);
+            OutputSogsToConsole(searchPredicate);
+        }
 
-            if (sceneObjects.Count == 0)
+        private void HandleShowObjectByPos(string module, string[] cmdparams)
         {
-                m_console.OutputFormat("No objects with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmdparams.Length < 5)
+            {
+                m_console.OutputFormat("Usage: show object pos <start-coord> to <end-coord>");
                 return;
             }
 
-            StringBuilder sb = new StringBuilder();
+            string rawConsoleStartVector = cmdparams[3];
+            Vector3 startVector;
 
-            foreach (SceneObjectGroup so in sceneObjects)
+            if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
             {
-                AddSceneObjectReport(sb, so);
-                sb.Append("\n");
+                m_console.OutputFormat("Error: Start vector {0} does not have a valid format", rawConsoleStartVector);
+                return;
             }
 
-            m_console.OutputFormat(sb.ToString());
+            string rawConsoleEndVector = cmdparams[5];
+            Vector3 endVector;
+
+            if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
+            {
+                m_console.OutputFormat("Error: End vector {0} does not have a valid format", rawConsoleEndVector);
+                return;
+            }
+
+            Predicate<SceneObjectGroup> searchPredicate
+                = so => Util.IsInsideBox(so.AbsolutePosition, startVector, endVector);
+
+            OutputSogsToConsole(searchPredicate);
         }
 
         private void HandleShowPartByUuid(string module, string[] cmd)
@@ -264,6 +357,38 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.OutputFormat(sb.ToString());
         }
 
+        private void HandleShowPartByPos(string module, string[] cmdparams)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            if (cmdparams.Length < 5)
+            {
+                m_console.OutputFormat("Usage: show part pos <start-coord> to <end-coord>");
+                return;
+            }
+
+            string rawConsoleStartVector = cmdparams[3];
+            Vector3 startVector;
+
+            if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
+            {
+                m_console.OutputFormat("Error: Start vector {0} does not have a valid format", rawConsoleStartVector);
+                return;
+            }
+
+            string rawConsoleEndVector = cmdparams[5];
+            Vector3 endVector;
+
+            if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
+            {
+                m_console.OutputFormat("Error: End vector {0} does not have a valid format", rawConsoleEndVector);
+                return;
+            }
+
+            OutputSopsToConsole(sop => Util.IsInsideBox(sop.AbsolutePosition, startVector, endVector));
+        }
+
         private void HandleShowPartByName(string module, string[] cmdparams)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
@@ -282,37 +407,19 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             string name = mainParams[3];
 
-            List<SceneObjectPart> parts = new List<SceneObjectPart>();
-
-            Action<SceneObjectGroup> searchAction;
+            Predicate<SceneObjectPart> searchPredicate;
 
             if (useRegex)
             {
                 Regex nameRegex = new Regex(name);
-                searchAction = so => so.ForEachPart(sop => { if (nameRegex.IsMatch(sop.Name)) { parts.Add(sop); } });
+                searchPredicate = sop => nameRegex.IsMatch(sop.Name);
             }
             else
             {
-                searchAction = so => so.ForEachPart(sop => { if (sop.Name == name) { parts.Add(sop); } });
+                searchPredicate = sop => sop.Name == name;
             }
 
-            m_scene.ForEachSOG(searchAction);
-
-            if (parts.Count == 0)
-            {
-                m_console.OutputFormat("No parts with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
-                return;
-            }
-
-            StringBuilder sb = new StringBuilder();
-
-            foreach (SceneObjectPart part in parts)
-            {
-                AddScenePartReport(sb, part);
-                sb.Append("\n");
-            }
-
-            m_console.OutputFormat(sb.ToString());
+            OutputSopsToConsole(searchPredicate);
         }
 
         private StringBuilder AddSceneObjectReport(StringBuilder sb, SceneObjectGroup so)

OpenSim/Region/Framework/Interfaces/IUserManagement.cs

@@ -1,4 +1,31 @@
-using System;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
 using System.Collections.Generic;
 
 using OpenMetaverse;

OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs

@@ -87,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             {
                 if (m_defaultAnimation.AnimID == animID)
                 {
-                    ResetDefaultAnimation();
+                    m_defaultAnimation = new OpenSim.Framework.Animation(UUID.Zero, 1, UUID.Zero);
                 }
                 else if (HasAnimation(animID))
                 {
@@ -149,19 +149,26 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         {
             lock (m_animations)
             {
-                animIDs = new UUID[m_animations.Count + 1];
-                sequenceNums = new int[m_animations.Count + 1];
-                objectIDs = new UUID[m_animations.Count + 1];
+                int defaultSize = 0;
+                if (m_defaultAnimation.AnimID != UUID.Zero)
+                    defaultSize++;
 
+                animIDs = new UUID[m_animations.Count + defaultSize];
+                sequenceNums = new int[m_animations.Count + defaultSize];
+                objectIDs = new UUID[m_animations.Count + defaultSize];
+
+                if (m_defaultAnimation.AnimID != UUID.Zero)
+                {
                     animIDs[0] = m_defaultAnimation.AnimID;
                     sequenceNums[0] = m_defaultAnimation.SequenceNum;
                     objectIDs[0] = m_defaultAnimation.ObjectID;
+                }
 
                 for (int i = 0; i < m_animations.Count; ++i)
                 {
-                    animIDs[i + 1] = m_animations[i].AnimID;
-                    sequenceNums[i + 1] = m_animations[i].SequenceNum;
-                    objectIDs[i + 1] = m_animations[i].ObjectID;
+                    animIDs[i + defaultSize] = m_animations[i].AnimID;
+                    sequenceNums[i + defaultSize] = m_animations[i].SequenceNum;
+                    objectIDs[i + defaultSize] = m_animations[i].ObjectID;
                 }
             }
         }

OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs

@@ -407,6 +407,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         public void UpdateMovementAnimations()
         {
             lock (m_animations)
+            {
+                string newMovementAnimation = DetermineMovementAnimation();
+                if (CurrentMovementAnimation != newMovementAnimation)
                 {
                     CurrentMovementAnimation = DetermineMovementAnimation();
 
@@ -414,9 +417,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 //                        "[SCENE PRESENCE ANIMATOR]: Determined animation {0} for {1} in UpdateMovementAnimations()",
 //                        CurrentMovementAnimation, m_scenePresence.Name);
 
+                    // Only set it if it's actually changed, give a script
+                    // a chance to stop a default animation
                     TrySetMovementAnimation(CurrentMovementAnimation);
                 }
             }
+        }
 
         public UUID[] GetAnimationArray()
         {

OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

@@ -1424,7 +1424,7 @@ namespace OpenSim.Region.Framework.Scenes
             return newFolderID;
         }
 
-        private void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems)
+        public void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems)
         {
             if (folder == null)
                 return;

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -801,13 +801,6 @@ namespace OpenSim.Region.Framework.Scenes
                 SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
                 TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
 
-                IConfig packetConfig = m_config.Configs["PacketPool"];
-                if (packetConfig != null)
-                {
-                    PacketPool.Instance.RecyclePackets = packetConfig.GetBoolean("RecyclePackets", true);
-                    PacketPool.Instance.RecycleDataBlocks = packetConfig.GetBoolean("RecycleDataBlocks", true);
-                }
-
                 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
 
                 m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true);

OpenSim/Region/Framework/Scenes/SimStatsReporter.cs

@@ -47,6 +47,7 @@ namespace OpenSim.Region.Framework.Scenes
             = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         public const string LastReportedObjectUpdateStatName = "LastReportedObjectUpdates";
+        public const string SlowFramesStatName = "SlowFrames";
 
         public delegate void SendStatResult(SimStats stats);
 
@@ -128,6 +129,16 @@ namespace OpenSim.Region.Framework.Scenes
             get { return lastReportedSimStats; }
         }
 
+        /// <summary>
+        /// Number of frames that have taken longer to process than Scene.MIN_FRAME_TIME
+        /// </summary>
+        public Stat SlowFramesStat { get; private set; }
+
+        /// <summary>
+        /// The threshold at which we log a slow frame.
+        /// </summary>
+        public int SlowFramesStatReportThreshold { get; private set; }
+
         /// <summary>
         /// Extra sim statistics that are used by monitors but not sent to the client.
         /// </summary>
@@ -225,6 +236,22 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (StatsManager.SimExtraStats != null)
                 OnSendStatsResult += StatsManager.SimExtraStats.ReceiveClassicSimStatsPacket;
+
+            /// At the moment, we'll only report if a frame is over 120% of target, since commonly frames are a bit
+            /// longer than ideal (which in itself is a concern).
+            SlowFramesStatReportThreshold = (int)Math.Ceiling(m_scene.MinFrameTime * 1000 * 1.2);
+
+            SlowFramesStat
+                = new Stat(
+                    "SlowFrames",
+                    "Slow Frames",
+                    " frames",
+                    "scene",
+                    m_scene.Name,
+                    StatVerbosity.Info,
+                    "Number of frames where frame time has been significantly longer than the desired frame time.");
+
+            StatsManager.RegisterStat(SlowFramesStat);
         }
 
         public void Close()
@@ -418,6 +445,7 @@ namespace OpenSim.Region.Framework.Scenes
                 lock (m_lastReportedExtraSimStats)
                 {
                     m_lastReportedExtraSimStats[LastReportedObjectUpdateStatName] = m_objectUpdates / m_statsUpdateFactor;
+                    m_lastReportedExtraSimStats[SlowFramesStat.ShortName] = (float)SlowFramesStat.Value;
 
                     Dictionary<string, float> physicsStats = m_scene.PhysicsScene.GetStats();
     
@@ -535,6 +563,11 @@ namespace OpenSim.Region.Framework.Scenes
         public void addFrameMS(int ms)
         {
             m_frameMS += ms;
+
+            // At the moment, we'll only report if a frame is over 120% of target, since commonly frames are a bit
+            // longer than ideal due to the inaccuracy of the Sleep in Scene.Update() (which in itself is a concern).
+            if (ms > SlowFramesStatReportThreshold)
+                SlowFramesStat.Value++;
         }
 
         public void AddSpareMS(int ms)

OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs

@@ -148,7 +148,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             OnInstantMessage(this, new GridInstantMessage(m_scene,
                     m_uuid, m_firstname + " " + m_lastname,
                     target, 0, false, message,
-                    UUID.Zero, false, Position, new byte[0]));
+                    UUID.Zero, false, Position, new byte[0], true));
         }
 
         public void SendAgentOffline(UUID[] agentIDs)

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -3978,7 +3978,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             World.RegionInfo.RegionName+" "+
                             m_host.AbsolutePosition.ToString(),
                             agentItem.ID, true, m_host.AbsolutePosition,
-                            bucket);
+                            bucket, true); // TODO: May actually send no timestamp
 
                     m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
                 }
@@ -6453,15 +6453,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 byte[] bucket = new byte[] { (byte)AssetType.Folder };
 
+                Vector3 pos = m_host.AbsolutePosition;
+
                 GridInstantMessage msg = new GridInstantMessage(World,
-                        m_host.UUID, m_host.Name + ", an object owned by " +
-                        resolveName(m_host.OwnerID) + ",", destID,
+                        m_host.OwnerID, m_host.Name, destID,
                         (byte)InstantMessageDialog.TaskInventoryOffered,
-                        false, category + "\n" + m_host.Name + " is located at " +
-                        World.RegionInfo.RegionName + " " +
-                        m_host.AbsolutePosition.ToString(),
-                        folderID, true, m_host.AbsolutePosition,
-                        bucket);
+                        false, string.Format("'{0}'"),
+// We won't go so far as to add a SLURL, but this is the format used by LL as of 2012-10-06                                       
+// false, string.Format("'{0}'  ( http://slurl.com/secondlife/{1}/{2}/{3}/{4} )", category, World.Name, (int)pos.X, (int)pos.Y, (int)pos.Z),
+                        folderID, false, pos,
+                        bucket, false);
 
                 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
             }

OpenSim/Region/UserStatistics/WebStatsModule.cs

@@ -61,7 +61,7 @@ namespace OpenSim.Region.UserStatistics
         /// <summary>
         /// User statistics sessions keyed by agent ID
         /// </summary>
-        private Dictionary<UUID, UserSessionID> m_sessions = new Dictionary<UUID, UserSessionID>();
+        private Dictionary<UUID, UserSession> m_sessions = new Dictionary<UUID, UserSession>();
 
         private List<Scene> m_scenes = new List<Scene>();
         private Dictionary<string, IStatsController> reports = new Dictionary<string, IStatsController>();
@@ -319,14 +319,18 @@ namespace OpenSim.Region.UserStatistics
 
         private void OnMakeRootAgent(ScenePresence agent)
         {
+//            m_log.DebugFormat(
+//                "[WEB STATS MODULE]: Looking for session {0} for {1} in {2}",
+//                agent.ControllingClient.SessionId, agent.Name, agent.Scene.Name);
+
             lock (m_sessions)
             {
-                UserSessionID uid;
+                UserSession uid;
 
                 if (!m_sessions.ContainsKey(agent.UUID))
                 {
                     UserSessionData usd = UserSessionUtil.newUserSessionData();
-                    uid = new UserSessionID();
+                    uid = new UserSession();
                     uid.name_f = agent.Firstname;
                     uid.name_l = agent.Lastname;
                     uid.session_data = usd;
@@ -411,9 +415,9 @@ namespace OpenSim.Region.UserStatistics
             return String.Empty;
         }
 
-        private UserSessionID ParseViewerStats(string request, UUID agentID)
+        private UserSession ParseViewerStats(string request, UUID agentID)
         {
-            UserSessionID uid = new UserSessionID();
+            UserSession uid = new UserSession();
             UserSessionData usd;
             OSD message = OSDParser.DeserializeLLSDXml(request);
             OSDMap mmap;
@@ -425,22 +429,25 @@ namespace OpenSim.Region.UserStatistics
                     if (!m_sessions.ContainsKey(agentID))
                     {
                         m_log.WarnFormat("[WEB STATS MODULE]: no session for stat disclosure for agent {0}", agentID);
-                        return new UserSessionID();
+                        return new UserSession();
                     }
+
                     uid = m_sessions[agentID];
+
+//                    m_log.DebugFormat("[WEB STATS MODULE]: Got session {0} for {1}", uid.session_id, agentID);
                 }
                 else
                 {
                     // parse through the beginning to locate the session
                     if (message.Type != OSDType.Map)
-                        return new UserSessionID();
+                        return new UserSession();
 
                     mmap = (OSDMap)message;
                     {
                         UUID sessionID = mmap["session_id"].AsUUID();
 
                         if (sessionID == UUID.Zero)
-                            return new UserSessionID();
+                            return new UserSession();
 
 
                         // search through each session looking for the owner
@@ -459,7 +466,7 @@ namespace OpenSim.Region.UserStatistics
                         // can't find a session
                         if (agentID == UUID.Zero)
                         {
-                            return new UserSessionID();
+                            return new UserSession();
                         }
                     }
                 }
@@ -468,12 +475,12 @@ namespace OpenSim.Region.UserStatistics
             usd = uid.session_data;
 
             if (message.Type != OSDType.Map)
-                return new UserSessionID();
+                return new UserSession();
 
             mmap = (OSDMap)message;
             {
                 if (mmap["agent"].Type != OSDType.Map)
-                    return new UserSessionID();
+                    return new UserSession();
                 OSDMap agent_map = (OSDMap)mmap["agent"];
                 usd.agent_id = agentID;
                 usd.name_f = uid.name_f;
@@ -493,17 +500,18 @@ namespace OpenSim.Region.UserStatistics
                                                  (float)agent_map["fps"].AsReal());
 
                 if (mmap["downloads"].Type != OSDType.Map)
-                    return new UserSessionID();
+                    return new UserSession();
                 OSDMap downloads_map = (OSDMap)mmap["downloads"];
                 usd.d_object_kb = (float)downloads_map["object_kbytes"].AsReal();
                 usd.d_texture_kb = (float)downloads_map["texture_kbytes"].AsReal();
                 usd.d_world_kb = (float)downloads_map["workd_kbytes"].AsReal();
 
+//                m_log.DebugFormat("[WEB STATS MODULE]: mmap[\"session_id\"] = [{0}]", mmap["session_id"].AsUUID());
 
                 usd.session_id = mmap["session_id"].AsUUID();
 
                 if (mmap["system"].Type != OSDType.Map)
-                    return new UserSessionID();
+                    return new UserSession();
                 OSDMap system_map = (OSDMap)mmap["system"];
 
                 usd.s_cpu = system_map["cpu"].AsString();
@@ -512,13 +520,13 @@ namespace OpenSim.Region.UserStatistics
                 usd.s_ram = system_map["ram"].AsInteger();
 
                 if (mmap["stats"].Type != OSDType.Map)
-                    return new UserSessionID();
+                    return new UserSession();
 
                 OSDMap stats_map = (OSDMap)mmap["stats"];
                 {
 
                     if (stats_map["failures"].Type != OSDType.Map)
-                        return new UserSessionID();
+                        return new UserSession();
                     OSDMap stats_failures = (OSDMap)stats_map["failures"];
                     usd.f_dropped = stats_failures["dropped"].AsInteger();
                     usd.f_failed_resends = stats_failures["failed_resends"].AsInteger();
@@ -527,18 +535,18 @@ namespace OpenSim.Region.UserStatistics
                     usd.f_send_packet = stats_failures["send_packet"].AsInteger();
 
                     if (stats_map["net"].Type != OSDType.Map)
-                        return new UserSessionID();
+                        return new UserSession();
                     OSDMap stats_net = (OSDMap)stats_map["net"];
                     {
                         if (stats_net["in"].Type != OSDType.Map)
-                            return new UserSessionID();
+                            return new UserSession();
 
                         OSDMap net_in = (OSDMap)stats_net["in"];
                         usd.n_in_kb = (float)net_in["kbytes"].AsReal();
                         usd.n_in_pk = net_in["packets"].AsInteger();
 
                         if (stats_net["out"].Type != OSDType.Map)
-                            return new UserSessionID();
+                            return new UserSession();
                         OSDMap net_out = (OSDMap)stats_net["out"];
 
                         usd.n_out_kb = (float)net_out["kbytes"].AsReal();
@@ -549,11 +557,18 @@ namespace OpenSim.Region.UserStatistics
 
             uid.session_data = usd;
             m_sessions[agentID] = uid;
+
+//            m_log.DebugFormat(
+//                "[WEB STATS MODULE]: Parse data for {0} {1}, session {2}", uid.name_f, uid.name_l, uid.session_id);
+
             return uid;
         }
 
-        private void UpdateUserStats(UserSessionID uid, SqliteConnection db)
+        private void UpdateUserStats(UserSession uid, SqliteConnection db)
         {
+//            m_log.DebugFormat(
+//                "[WEB STATS MODULE]: Updating user stats for {0} {1}, session {2}", uid.name_f, uid.name_l, uid.session_id);
+
             if (uid.session_id == UUID.Zero)
                 return;
 
@@ -740,7 +755,6 @@ VALUES
             s.min_ping = ArrayMin_f(__ping);
             s.max_ping = ArrayMax_f(__ping);
             s.mode_ping = ArrayMode_f(__ping);
-
         }
 
         #region Statistics
@@ -985,7 +999,7 @@ VALUES
     }
     #region structs
 
-    public struct UserSessionID
+    public class UserSession
     {
         public UUID session_id;
         public UUID region_id;

OpenSim/Server/ServerMain.cs

@@ -65,10 +65,29 @@ namespace OpenSim.Server
             }
 
             string connList = serverConfig.GetString("ServiceConnectors", String.Empty);
-            string[] conns = connList.Split(new char[] {',', ' '});
             
             registryLocation = serverConfig.GetString("RegistryLocation",".");
 
+            IConfig servicesConfig = m_Server.Config.Configs["ServiceList"];
+            if (servicesConfig != null)
+            {
+                List<string> servicesList = new List<string>();
+                if (connList != String.Empty)
+                    servicesList.Add(connList);
+
+                foreach (string k in servicesConfig.GetKeys())
+                {
+                    string v = servicesConfig.GetString(k);
+                    if (v != String.Empty)
+                        servicesList.Add(v);
+                }
+
+                connList = String.Join(",", servicesList.ToArray());
+            }
+
+            string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'});
+>>>>>>> master
+
 //            int i = 0;
             foreach (string c in conns)
             {

OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs

@@ -47,6 +47,7 @@ namespace OpenSim.Services.Connectors
 
         private string m_ServerURI = String.Empty;
         private IImprovedAssetCache m_Cache = null;
+        private int m_maxAssetRequestConcurrency = 30;
         
         private delegate void AssetRetrievedEx(AssetBase asset);
 
@@ -71,6 +72,10 @@ namespace OpenSim.Services.Connectors
 
         public virtual void Initialise(IConfigSource source)
         {
+            IConfig netconfig = source.Configs["Network"];
+            if (netconfig != null)
+                m_maxAssetRequestConcurrency = netconfig.GetInt("MaxRequestConcurrency",m_maxAssetRequestConcurrency);
+
             IConfig assetConfig = source.Configs["AssetService"];
             if (assetConfig == null)
             {
@@ -108,7 +113,7 @@ namespace OpenSim.Services.Connectors
             if (asset == null)
             {
                 asset = SynchronousRestObjectRequester.
-                        MakeRequest<int, AssetBase>("GET", uri, 0, 30);
+                        MakeRequest<int, AssetBase>("GET", uri, 0, m_maxAssetRequestConcurrency);
 
                 if (m_Cache != null)
                     m_Cache.Cache(asset);
@@ -221,7 +226,7 @@ namespace OpenSim.Services.Connectors
                                 m_AssetHandlers.Remove(id);
                             }
                             handlers.Invoke(a);
-                        }, 30);
+                        }, m_maxAssetRequestConcurrency);
                     
                     success = true;
                 }

OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs

@@ -207,7 +207,7 @@ namespace OpenSim.Services.Connectors
                     if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
                     {
                         if (replyData["result"] is Dictionary<string, object>)
-                            guinfo = new GridUserInfo((Dictionary<string, object>)replyData["result"]);
+                            guinfo = Create((Dictionary<string, object>)replyData["result"]);
                     }
 
                     return guinfo;
@@ -273,7 +273,7 @@ namespace OpenSim.Services.Connectors
                 {
                     if (griduser is Dictionary<string, object>)
                     {
-                        GridUserInfo pinfo = new GridUserInfo((Dictionary<string, object>)griduser);
+                        GridUserInfo pinfo = Create((Dictionary<string, object>)griduser);
                         rinfos.Add(pinfo);
                     }
                     else
@@ -286,5 +286,10 @@ namespace OpenSim.Services.Connectors
 
             return rinfos.ToArray();
         }
+
+        protected virtual GridUserInfo Create(Dictionary<string, object> griduser)
+        {
+            return new GridUserInfo(griduser);
+        }
     }
 }

bin/OpenSimDefaults.ini

@@ -427,6 +427,10 @@
     ; " (Mozilla Compatible)" to the text where there are problems with a web server
     ;user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+    ; OpenSim can send multiple simultaneous requests for services such as asset
+    ; retrieval. However, some versions of mono appear to hang when there are too
+    ; many simultaneous requests, default is 30 and is currently applied only to assets
+    ;MaxRequestConcurrency = 30
 
 [XMLRPC]
     ; ##

bin/Robust.ini.example

@@ -13,7 +13,23 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector,8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
+
+[ServiceList]
+AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
+VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
+GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
+GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
+AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
+OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
+AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
+LLLoginServiceInConnector = "8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector"
+PresenceServiceConnector = "8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
+UserAccountServiceConnector = "8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
+GridUserServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector"
+FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
+MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
+MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
 
 ; Plugin Registry Location
 ; Set path to directory for plugin registry. Information

prebuild.xml

@@ -1382,110 +1382,6 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-          <AllowUnsafe>true</AllowUnsafe>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-          <AllowUnsafe>true</AllowUnsafe>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Core"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Xml.Linq"/>
-      <Reference name="System.Drawing"/>
-      <Reference name="System.Web"/>
-      <Reference name="NDesk.Options" path="../../../bin/"/>
-      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
-      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
-      <Reference name="OpenMetaverse" path="../../../bin/"/>
-      <Reference name="CSJ2K" path="../../../bin/"/>
-      <Reference name="Warp3D" path="../../../bin/"/>
-      <Reference name="OpenSim.Capabilities"/>
-      <Reference name="OpenSim.Data"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Monitoring"/>
-      <Reference name="OpenSim.Framework.Serialization"/>
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Region.Framework"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Server.Base"/>
-      <Reference name="OpenSim.Server.Handlers"/>
-      <Reference name="OpenSim.Services.Connectors"/>
-      <Reference name="OpenSim.Services.Base"/>
-      <Reference name="OpenSim.Services.Interfaces"/>
-      <Reference name="Ionic.Zip" path="../../../bin/"/>
-
-      <Reference name="GlynnTucker.Cache" path="../../../bin/"/>
-
-      <!-- For scripting in funny languages by default -->
-      <Reference name="XMLRPC" path="../../../bin/"/>
-      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="Nini" path="../../../bin/"/>
-      <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
-
-      <!-- To allow regions to have mono addins -->
-      <Reference name="Mono.Addins" path="../../../bin/"/>
-
-      <Files>
-        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
-        <Match pattern="*.cs" recurse="true">
-          <Exclude name="Tests" pattern="Tests"/>
-        </Match>
-        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
-      </Files>
-    </Project>
-
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Xml"/>
-      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
-      <Reference name="OpenMetaverse" path="../../../bin/"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Region.Framework"/>
-      <Reference name="OpenSim.Server.Base"/>
-      <Reference name="OpenSim.Server.Handlers"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Region.CoreModules"/>
-      <Reference name="Nini" path="../../../bin/"/>
-      <Reference name="log4net" path="../../../bin/"/>
-
-      <!-- To allow regions to have mono addins -->
-      <Reference name="Mono.Addins" path="../../../bin/"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
-      </Files>
-    </Project>
-
     <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -1606,6 +1502,111 @@
       </Files>
     </Project>
 
+    <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+          <AllowUnsafe>true</AllowUnsafe>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+          <AllowUnsafe>true</AllowUnsafe>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Core"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Xml.Linq"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="System.Web"/>
+      <Reference name="NDesk.Options" path="../../../bin/"/>
+      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="CSJ2K" path="../../../bin/"/>
+      <Reference name="Warp3D" path="../../../bin/"/>
+      <Reference name="OpenSim.Capabilities"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
+      <Reference name="OpenSim.Framework.Serialization"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Server.Base"/>
+      <Reference name="OpenSim.Server.Handlers"/>
+      <Reference name="OpenSim.Services.Connectors"/>
+      <Reference name="OpenSim.Services.Base"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="Ionic.Zip" path="../../../bin/"/>
+
+      <Reference name="GlynnTucker.Cache" path="../../../bin/"/>
+
+      <!-- For scripting in funny languages by default -->
+      <Reference name="XMLRPC" path="../../../bin/"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="Nini" path="../../../bin/"/>
+      <Reference name="log4net" path="../../../bin/"/>
+      <Reference name="DotNetOpenMail" path="../../../bin/"/>
+
+      <!-- To allow regions to have mono addins -->
+      <Reference name="Mono.Addins" path="../../../bin/"/>
+
+      <Files>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude name="Tests" pattern="Tests"/>
+        </Match>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
+      </Files>
+    </Project>
+
+    <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Server.Base"/>
+      <Reference name="OpenSim.Server.Handlers"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Region.CoreModules"/>
+      <Reference name="Nini" path="../../../bin/"/>
+      <Reference name="log4net" path="../../../bin/"/>
+
+      <!-- To allow regions to have mono addins -->
+      <Reference name="Mono.Addins" path="../../../bin/"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
+      </Files>
+    </Project>
+
     <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
       <Configuration name="Debug">
         <Options>