Escape and unescape xml element names if necessary in ServerUtils.BuildXmlData() and ParseElement()

If AvatarService appearance data is retrieved over the network, then ServerUtils was attempting to transfer names such as "Wearable 0:0" directly to xml element names, resulting in an exception.
Space is not valid in xml element names.  Neither is : in this case since the intention is not to namespace.  Using names directly as keys is not a good idea.
To get around this problem this patch escapes and unescapes the element names as appropriate.
This has no impact on existing xml (since it had to be valid in the first place) but allows AvatarService data to be used over the network.
Setting appearance (from simulator to AvatarService) did not suffer this problem since the values are passed in the query string which is already properly escaped.

.gitignore

@@ -1,6 +1,5 @@
 .project
 .settings
-.gitignore
 *.csproj
 *.csproj.user
 *.build
@@ -11,7 +10,6 @@
 *.pidb
 *.dll.build
 *.dll
-*.log
 *.VisualState.xml
 */*/obj
 */*/*/obj
@@ -25,7 +23,6 @@
 */*/*/*/*/bin
 */*/*/*/*/*/bin
 */*/*/*/*/*/*/bin
-addon-modules/
 bin/Debug/*.dll
 bin/*.dll.mdb
 bin/*.db

.nant/local.include

@@ -2,13 +2,37 @@
 <!-- please leave the top comment for us emacs folks -->
 <property name="nunitcmd" value="nunit-console" />
 
-<!-- For safety/laziness sake, we're going to take the approach of deleting known extraneous files here rather than
-     trying to copy across only the essential ones -->
-<property name="distbindir" value="distbin" />
-<target name="distbin">
+<!-- This target produces a source distribution of OpenSimulator -->
+<!-- TODO: A few parameters still need to be tweaked after running this - need to do this automatically with sed or similar -->
+<target name="distsrc">
   <copy file="bin/OpenSim.ini.example" tofile="bin/OpenSim.ini"/>
   <copy file="bin/config-include/StandaloneCommon.ini.example" tofile="bin/config-include/StandaloneCommon.ini"/>
   <copy file="bin/config-include/FlotsamCache.ini.example" tofile="bin/config-include/FlotsamCache.ini"/>
+  <!-- delete files generated by runprebuild.sh which had to be run in order to generate the build file for this target-->
+  <delete>
+    <fileset basedir="OpenSim">
+      <include name="**/*.build"/>
+      <include name="**/*.csproj*"/>
+      <include name="**/*.dll.build"/>
+      <include name="**/*.pidb"/>
+      <exclude name="Tools/OpenSim.32BitLaunch/**"/>
+      <exclude name="Tools/Robust.32BitLaunch/**"/>
+      <exclude name="Tools/LaunchSLClient/**"/>
+    </fileset>
+  </delete>
+  <delete>
+    <fileset>
+      <include name="OpenSim.build"/>
+      <include name="OpenSim.sln"/>
+    </fileset>
+  </delete>
+</target>
+
+<property name="distbindir" value="distbin" />
+<!-- This target produces a binary directory called distbin/ in OpenSim/bin which contains everything needed for binary distribution -->
+<!-- For safety/laziness sake, we're going to take the approach of deleting known extraneous files here rather than
+     trying to copy across only the essential ones -->
+<target name="distbin">
   <delete dir="${distbindir}"/>
   <copy todir="${distbindir}">
     <fileset>

CONTRIBUTORS.txt

@@ -1,4 +1,4 @@
-The following people have contributed to OpenSim (Thank you 
+   <<<>>>>The following people have contributed to OpenSim (Thank you 
 for your effort!)
 
 = Current OpenSim Developers (in very rough order of appearance) =

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -131,7 +131,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     availableMethods["admin_region_query"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcRegionQueryMethod);
                     availableMethods["admin_shutdown"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcShutdownMethod);
                     availableMethods["admin_broadcast"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAlertMethod);
-                    availableMethods["admin_dialog"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcDialogMethod);
                     availableMethods["admin_restart"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcRestartMethod);
                     availableMethods["admin_load_heightmap"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcLoadHeightmapMethod);
                     availableMethods["admin_save_heightmap"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcSaveHeightmapMethod);
@@ -263,70 +262,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 Scene rebootedScene = null;
                 GetSceneFromRegionParams(requestData, responseData, out rebootedScene);
 
-                IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
-
                 responseData["success"] = false;
                 responseData["accepted"] = true;
                 responseData["rebooting"] = true;
 
-                string message;
-                List<int> times = new List<int>();
-
-                if (requestData.ContainsKey("alerts"))
-                {
-                    string[] alertTimes = requestData["alerts"].ToString().Split( new char[] {','});
-                    if (alertTimes.Length == 1 && Convert.ToInt32(alertTimes[0]) == -1)
-                    {
-                        if (restartModule != null)
-                        {
-                            message = "Restart has been cancelled";
-
-                            if (requestData.ContainsKey("message"))
-                                message = requestData["message"].ToString();
-
-                            restartModule.AbortRestart(message);
-
-                            responseData["success"] = true;
-                            responseData["rebooting"] = false;
-
-                            return;
-                        }
-                    }
-                    foreach (string a in alertTimes)
-                        times.Add(Convert.ToInt32(a));
-                }
-                else
-                {
-                    int timeout = 30;
-                    if (requestData.ContainsKey("milliseconds"))
-                        timeout = Int32.Parse(requestData["milliseconds"].ToString()) / 1000;
-                    while (timeout > 0)
-                    {
-                        times.Add(timeout);
-                        if (timeout > 300)
-                            timeout -= 120;
-                        else if (timeout > 30)
-                            timeout -= 30;
-                        else
-                            timeout -= 15;
-                    }
-                }
-
-                message = "Region is restarting in {0}. Please save what you are doing and log out.";
-
-                if (requestData.ContainsKey("message"))
-                    message = requestData["message"].ToString();
-
-                bool notice = true;
-                if (requestData.ContainsKey("noticetype")
-                    && ((string)requestData["noticetype"] == "dialog"))
-                {
-                    notice = false;
-                }
-
+                IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
                 if (restartModule != null)
                 {
-                    restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice);
+                    List<int> times = new List<int> { 30, 15 };
+
+                    restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
                     responseData["success"] = true;
                 }
             }
@@ -365,32 +310,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             m_log.Info("[RADMIN]: Alert request complete");
         }
 
-        public void XmlRpcDialogMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
-        {
-            Hashtable responseData = (Hashtable)response.Value;
-
-            m_log.Info("[RADMIN]: Dialog request started");
-
-            Hashtable requestData = (Hashtable)request.Params[0];
-
-            string message = (string)requestData["message"];
-            string fromuuid = (string)requestData["from"];
-            m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
-
-            responseData["accepted"] = true;
-            responseData["success"] = true;
-
-            m_application.SceneManager.ForEachScene(
-                delegate(Scene scene)
-                {
-                    IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
-                    if (dialogModule != null)
-                        dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message);
-                });
-
-            m_log.Info("[RADMIN]: Dialog request complete");
-        }
-
         private void XmlRpcLoadHeightmapMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
         {
             m_log.Info("[RADMIN]: Load height maps request started");
@@ -479,32 +398,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 message = "Region is going down now.";
             }
 
-            if (requestData.ContainsKey("noticetype")
-                && ((string) requestData["noticetype"] == "dialog"))
-            {
-                m_application.SceneManager.ForEachScene(
-
+            m_application.SceneManager.ForEachScene(
                 delegate(Scene scene)
-                {
-                    IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
-                    if (dialogModule != null)
-                            dialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message);
-                });
-            }
-            else
-            {
-                if (!requestData.ContainsKey("noticetype")
-                    || ((string)requestData["noticetype"] != "none"))
-                {
-                    m_application.SceneManager.ForEachScene(
-                    delegate(Scene scene)
                     {
                         IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
                         if (dialogModule != null)
                             dialogModule.SendGeneralAlert(message);
                     });
-                }
-            }
 
             // Perform shutdown
             System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing
@@ -1670,22 +1570,21 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private void XmlRpcRegionQueryMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
         {
+            m_log.Info("[RADMIN]: Received Query XML Administrator Request");
+
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
 
-            responseData["success"] = true;
-
             CheckRegionParams(requestData, responseData);
 
             Scene scene = null;
             GetSceneFromRegionParams(requestData, responseData, out scene);
 
-            int flags;
-            string text;
-            int health = scene.GetHealth(out flags, out text);
+            int health = scene.GetHealth();
             responseData["health"] = health;
-            responseData["flags"] = flags;
-            responseData["message"] = text;
+
+            responseData["success"] = true;
+            m_log.Info("[RADMIN]: Query XML Administrator Request complete");
         }
 
         private void XmlRpcConsoleCommandMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)

OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs

@@ -63,7 +63,8 @@ namespace OpenSim.Capabilities.Handlers
 
             FetchInventory2Handler fiHandler = new FetchInventory2Handler(m_InventoryService);
             IRequestHandler reqHandler
-                = new RestStreamHandler("POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest);
+                = new RestStreamHandler(
+                    "POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest, "FetchInventory", null);
             server.AddStreamHandler(reqHandler);
         }
     }

OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs

@@ -66,13 +66,14 @@ namespace OpenSim.Capabilities.Handlers
                 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
 
             GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService);
-            IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(),
-                                                       delegate(Hashtable m_dhttpMethod)
-                                                       {
-                                                           return gmeshHandler.ProcessGetMesh(m_dhttpMethod, UUID.Zero, null);
-                                                       });
+            IRequestHandler reqHandler
+                = new RestHTTPHandler(
+                    "GET",
+                    "/CAPS/" + UUID.Random(),
+                    httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
+                    "GetMesh",
+                    null);
             server.AddStreamHandler(reqHandler);
         }
-
     }
-}
+}

OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs

@@ -58,8 +58,8 @@ namespace OpenSim.Capabilities.Handlers
         // TODO: Change this to a config option
         const string REDIRECT_URL = null;
 
-        public GetTextureHandler(string path, IAssetService assService) :
-                base("GET", path)
+        public GetTextureHandler(string path, IAssetService assService, string name, string description)
+            : base("GET", path, name, description)
         {
             m_assetService = assService;
         }

OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs

@@ -62,8 +62,8 @@ namespace OpenSim.Capabilities.Handlers
             if (m_AssetService == null)
                 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
 
-            server.AddStreamHandler(new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService));
+            server.AddStreamHandler(
+                new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService, "GetTexture", null));
         }
-
     }
-}
+}

OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs

@@ -50,9 +50,9 @@ namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
             TestHelpers.InMethod();
 
             // Overkill - we only really need the asset service, not a whole scene.
-            Scene scene = SceneHelpers.SetupScene();
+            Scene scene = new SceneHelpers().SetupScene();
 
-            GetTextureHandler handler = new GetTextureHandler(null, scene.AssetService);
+            GetTextureHandler handler = new GetTextureHandler(null, scene.AssetService, "TestGetTexture", null);
             TestOSHttpRequest req = new TestOSHttpRequest();
             TestOSHttpResponse resp = new TestOSHttpResponse();
             req.Url = new Uri("http://localhost/?texture_id=00000000-0000-1111-9999-000000000012");

OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs

@@ -85,8 +85,8 @@ namespace OpenSim.Capabilities.Handlers
                 uploader.OnUpLoad += BakedTextureUploaded;
 
                 m_HostCapsObj.HttpListener.AddStreamHandler(
-                        new BinaryStreamHandler("POST", capsBase + uploaderPath,
-                        uploader.uploaderCaps));
+                    new BinaryStreamHandler(
+                        "POST", capsBase + uploaderPath, uploader.uploaderCaps, "UploadBakedTexture", null));
 
                 string protocol = "http://";
 

OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescServerConnector.cs

@@ -68,7 +68,13 @@ namespace OpenSim.Capabilities.Handlers
                     ServerUtils.LoadPlugin<ILibraryService>(libService, args);
 
             WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
-            IRequestHandler reqHandler = new RestStreamHandler("POST", "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/, webFetchHandler.FetchInventoryDescendentsRequest);
+            IRequestHandler reqHandler
+                = new RestStreamHandler(
+                    "POST",
+                    "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
+                    webFetchHandler.FetchInventoryDescendentsRequest,
+                    "WebFetchInvDesc",
+                    null);
             server.AddStreamHandler(reqHandler);
         }
 

OpenSim/Capabilities/LLSDStreamHandler.cs

@@ -39,7 +39,11 @@ namespace OpenSim.Framework.Capabilities
         private LLSDMethod<TRequest, TResponse> m_method;
 
         public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
-            : base(httpMethod, path)
+            : this(httpMethod, path, method, null, null) {}
+
+        public LLSDStreamhandler(
+            string httpMethod, string path, LLSDMethod<TRequest, TResponse> method, string name, string description)
+            : base(httpMethod, path, name, description)
         {
             m_method = method;
         }

OpenSim/Data/AssetDataBase.cs

@@ -38,7 +38,7 @@ namespace OpenSim.Data
     {
         public abstract AssetBase GetAsset(UUID uuid);
         
-        public abstract bool StoreAsset(AssetBase asset);
+        public abstract void StoreAsset(AssetBase asset);
         public abstract bool ExistsAsset(UUID uuid);
 
         public abstract List<AssetMetadata> FetchAssetMetadataSet(int start, int count);

OpenSim/Data/IAssetData.cs

@@ -34,7 +34,7 @@ namespace OpenSim.Data
     public interface IAssetDataPlugin : IPlugin
     {
         AssetBase GetAsset(UUID uuid);
-        bool StoreAsset(AssetBase asset);
+        void StoreAsset(AssetBase asset);
         bool ExistsAsset(UUID uuid);
         List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
         void Initialise(string connect);

OpenSim/Data/IUserAccountData.cs

@@ -50,6 +50,5 @@ namespace OpenSim.Data
         bool Store(UserAccountData data);
         bool Delete(string field, string val);
         UserAccountData[] GetUsers(UUID scopeID, string query);
-        UserAccountData[] GetUsersWhere(UUID scopeID, string where);
     }
 }

OpenSim/Data/MSSQL/MSSQLAssetData.cs

@@ -143,7 +143,7 @@ namespace OpenSim.Data.MSSQL
         /// Create asset in m_database
         /// </summary>
         /// <param name="asset">the asset</param>
-        override public bool StoreAsset(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
            
             string sql =
@@ -192,12 +192,10 @@ namespace OpenSim.Data.MSSQL
                 try
                 {
                     command.ExecuteNonQuery();
-                    return true;
                 }
                 catch(Exception e)
                 {
                     m_log.Error("[ASSET DB]: Error storing item :" + e.Message);
-                    return false;
                 }
             }
         }

OpenSim/Data/MSSQL/MSSQLAvatarData.cs

@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
     public class MSSQLAvatarData : MSSQLGenericTableHandler<AvatarBaseData>,
             IAvatarData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         public MSSQLAvatarData(string connectionString, string realm) :
                 base(connectionString, realm, "Avatar")

OpenSim/Data/MSSQL/MSSQLFriendsData.cs

@@ -89,5 +89,11 @@ namespace OpenSim.Data.MSSQL
                 return DoQuery(cmd);
             }
         }
+
+        public FriendsData[] GetFriends(Guid principalID)
+        {
+            return GetFriends(principalID.ToString());
+        }
+ 
     }
 }

OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs

@@ -40,8 +40,8 @@ namespace OpenSim.Data.MSSQL
 {
     public class MSSQLGenericTableHandler<T> where T : class, new()
     {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log =
+//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected string m_ConnectionString;
         protected MSSQLManager m_database; //used for parameter type translation

OpenSim/Data/MSSQL/MSSQLGridUserData.cs

@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
     public class MSSQLGridUserData : MSSQLGenericTableHandler<GridUserData>,
             IGridUserData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public MSSQLGridUserData(string connectionString, string realm) :
             base(connectionString, realm, "GridUserStore")

OpenSim/Data/MSSQL/MSSQLInventoryData.cs

@@ -813,7 +813,7 @@ namespace OpenSim.Data.MSSQL
         {
             try
             {
-                using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID", connection))
+                using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID and type=-1", connection))
                 {
                     command.Parameters.Add(database.CreateParameter("folderID", folderID));
 

OpenSim/Data/MSSQL/MSSQLManager.cs

@@ -41,7 +41,7 @@ namespace OpenSim.Data.MSSQL
     /// </summary>
     public class MSSQLManager
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// Connection string for ADO.net
@@ -180,8 +180,6 @@ namespace OpenSim.Data.MSSQL
             return parameter;
         }
 
-        private static readonly Dictionary<string, string> emptyDictionary = new Dictionary<string, string>();
-
         /// <summary>
         /// Checks if we need to do some migrations to the database
         /// </summary>

OpenSim/Data/MSSQL/MSSQLPresenceData.cs

@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
     public class MSSQLPresenceData : MSSQLGenericTableHandler<PresenceData>,
             IPresenceData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public MSSQLPresenceData(string connectionString, string realm) :
                 base(connectionString, realm, "Presence")

OpenSim/Data/MSSQL/MSSQLSimulationData.cs

@@ -675,7 +675,7 @@ VALUES
                 cmd.ExecuteNonQuery();
             }
 
-            sql = "INSERT INTO [landaccesslist] ([LandUUID],[AccessUUID],[Flags]) VALUES (@LandUUID,@AccessUUID,@Flags)";
+            sql = "INSERT INTO [landaccesslist] ([LandUUID],[AccessUUID],[Flags],[Expires]) VALUES (@LandUUID,@AccessUUID,@Flags,@Expires)";
 
             using (SqlConnection conn = new SqlConnection(m_connectionString))
             using (SqlCommand cmd = new SqlCommand(sql, conn))
@@ -1215,6 +1215,8 @@ VALUES
             //Store new values
             StoreNewRegionSettings(regionSettings);
 
+            LoadSpawnPoints(regionSettings);
+
             return regionSettings;
         }
 
@@ -1252,7 +1254,7 @@ VALUES
 ,[elevation_1_ne] = @elevation_1_ne ,[elevation_2_ne] = @elevation_2_ne ,[elevation_1_se] = @elevation_1_se ,[elevation_2_se] = @elevation_2_se 
 ,[elevation_1_sw] = @elevation_1_sw ,[elevation_2_sw] = @elevation_2_sw ,[water_height] = @water_height ,[terrain_raise_limit] = @terrain_raise_limit 
 ,[terrain_lower_limit] = @terrain_lower_limit ,[use_estate_sun] = @use_estate_sun ,[fixed_sun] = @fixed_sun ,[sun_position] = @sun_position 
-,[covenant] = @covenant ,[covenant_datetime] = @covenant_datetime, [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id
+,[covenant] = @covenant ,[covenant_datetime] = @covenant_datetime, [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id, [map_tile_id] = @TerrainImageID, [telehubobject] = @telehubobject, [parcel_tile_id] = @ParcelImageID
  WHERE [regionUUID] = @regionUUID";
 
                 using (SqlConnection conn = new SqlConnection(m_connectionString))
@@ -1263,6 +1265,7 @@ VALUES
                     cmd.ExecuteNonQuery();
                 }
             }
+            SaveSpawnPoints(regionSettings);
         }
 
         public void Shutdown()
@@ -1383,6 +1386,11 @@ VALUES
                 newSettings.LoadedCreationID = "";
             else
                 newSettings.LoadedCreationID = (String)row["loaded_creation_id"];
+
+            newSettings.TerrainImageID = new UUID((string)row["map_tile_ID"]);
+            newSettings.ParcelImageID = new UUID((Guid)row["parcel_tile_ID"]);
+            newSettings.TelehubObject = new UUID((Guid)row["TelehubObject"]);
+
             return newSettings;
         }
 
@@ -1454,6 +1462,13 @@ VALUES
             }
 
             newData.ParcelAccessList = new List<LandAccessEntry>();
+            newData.MediaDescription = (string)row["MediaDescription"];
+            newData.MediaType = (string)row["MediaType"];
+            newData.MediaWidth = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[0]);
+            newData.MediaHeight = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[1]);
+            newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]);
+            newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
+            newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
 
             return newData;
         }
@@ -1468,7 +1483,7 @@ VALUES
             LandAccessEntry entry = new LandAccessEntry();
             entry.AgentID = new UUID((Guid)row["AccessUUID"]);
             entry.Flags = (AccessList)Convert.ToInt32(row["Flags"]);
-            entry.Expires = 0;
+            entry.Expires = Convert.ToInt32(row["Expires"]);
             return entry;
         }
 
@@ -1497,7 +1512,8 @@ VALUES
             prim.TouchName = (string)primRow["TouchName"];
             // permissions
             prim.Flags = (PrimFlags)Convert.ToUInt32(primRow["ObjectFlags"]);
-            prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);
+            //prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);
+            prim.CreatorIdentification = (string)primRow["CreatorID"];
             prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);
             prim.GroupID = new UUID((Guid)primRow["GroupID"]);
             prim.LastOwnerID = new UUID((Guid)primRow["LastOwnerID"]);
@@ -1691,7 +1707,8 @@ VALUES
             taskItem.Name = (string)inventoryRow["name"];
             taskItem.Description = (string)inventoryRow["description"];
             taskItem.CreationDate = Convert.ToUInt32(inventoryRow["creationDate"]);
-            taskItem.CreatorID = new UUID((Guid)inventoryRow["creatorID"]);
+            //taskItem.CreatorID = new UUID((Guid)inventoryRow["creatorID"]);
+            taskItem.CreatorIdentification = (string)inventoryRow["creatorID"];
             taskItem.OwnerID = new UUID((Guid)inventoryRow["ownerID"]);
             taskItem.LastOwnerID = new UUID((Guid)inventoryRow["lastOwnerID"]);
             taskItem.GroupID = new UUID((Guid)inventoryRow["groupID"]);
@@ -1792,6 +1809,9 @@ VALUES
             parameters.Add(_Database.CreateParameter("covenant_datetime", settings.CovenantChangedDateTime));
             parameters.Add(_Database.CreateParameter("Loaded_Creation_DateTime", settings.LoadedCreationDateTime));
             parameters.Add(_Database.CreateParameter("Loaded_Creation_ID", settings.LoadedCreationID));
+            parameters.Add(_Database.CreateParameter("TerrainImageID", settings.TerrainImageID));
+            parameters.Add(_Database.CreateParameter("ParcelImageID", settings.ParcelImageID));
+            parameters.Add(_Database.CreateParameter("TelehubObject", settings.TelehubObject));
 
             return parameters.ToArray();
         }
@@ -1859,6 +1879,7 @@ VALUES
             parameters.Add(_Database.CreateParameter("LandUUID", parcelID));
             parameters.Add(_Database.CreateParameter("AccessUUID", parcelAccessEntry.AgentID));
             parameters.Add(_Database.CreateParameter("Flags", parcelAccessEntry.Flags));
+            parameters.Add(_Database.CreateParameter("Expires", parcelAccessEntry.Expires));
 
             return parameters.ToArray();
         }
@@ -2063,5 +2084,57 @@ VALUES
         #endregion
 
         #endregion
+
+        private void LoadSpawnPoints(RegionSettings rs)
+        {
+            rs.ClearSpawnPoints();
+
+            string sql = "SELECT Yaw, Pitch, Distance FROM spawn_points WHERE RegionUUID = @RegionUUID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID.ToString()));
+                conn.Open();
+                using (SqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        SpawnPoint sp = new SpawnPoint();
+
+                        sp.Yaw = (float)reader["Yaw"];
+                        sp.Pitch = (float)reader["Pitch"];
+                        sp.Distance = (float)reader["Distance"];
+
+                        rs.AddSpawnPoint(sp);
+                    }
+                }
+            }
+        }
+
+        private void SaveSpawnPoints(RegionSettings rs)
+        {
+            string sql = "DELETE FROM spawn_points WHERE RegionUUID = @RegionUUID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+            foreach (SpawnPoint p in rs.SpawnPoints())
+            {
+                sql = "INSERT INTO spawn_points (RegionUUID, Yaw, Pitch, Distance) VALUES (@RegionUUID, @Yaw, @Pitch, @Distance)";
+                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID));
+                    cmd.Parameters.Add(_Database.CreateParameter("@Yaw", p.Yaw));
+                    cmd.Parameters.Add(_Database.CreateParameter("@Pitch", p.Pitch));
+                    cmd.Parameters.Add(_Database.CreateParameter("@Distance", p.Distance));
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+                }
+            }
+        }
     }
 }

OpenSim/Data/MSSQL/MSSQLUserAccountData.cs

@@ -242,10 +242,5 @@ namespace OpenSim.Data.MSSQL
                 return DoQuery(cmd);
             }
         }
-
-        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
-        {
-            return null;
-        }
     }
 }

OpenSim/Data/MSSQL/MSSQLXInventoryData.cs

@@ -40,8 +40,8 @@ namespace OpenSim.Data.MSSQL
 {
     public class MSSQLXInventoryData : IXInventoryData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
 
         private MSSQLGenericTableHandler<XInventoryFolder> m_Folders;
         private MSSQLItemHandler m_Items;

OpenSim/Data/MSSQL/Resources/GridStore.migrations

@@ -235,4 +235,11 @@ CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions
 	regionName
 	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 
-COMMIT
+COMMIT
+
+:VERSION 9
+
+BEGIN TRANSACTION
+ALTER TABLE regions ADD parcelMapTexture uniqueidentifier NULL;
+
+COMMIT

OpenSim/Data/MSSQL/Resources/RegionStore.migrations

@@ -1044,10 +1044,93 @@ ALTER TABLE primitems ALTER COLUMN CreatorID uniqueidentifier NOT NULL
 
 COMMIT
 
-:VERSION 29         #---------------------
+:VERSION 29         #----------------- Region Covenant changed time
 
 BEGIN TRANSACTION
 
 ALTER TABLE regionsettings ADD covenant_datetime int NOT NULL default 0
 
 COMMIT
+
+:VERSION 30         #------------------Migrate creatorID storage to varchars instead of UUIDs for HG support
+
+BEGIN TRANSACTION
+
+EXECUTE sp_rename N'dbo.prims.creatorid', N'creatoridold', 'COLUMN'
+EXECUTE sp_rename N'dbo.primitems.creatorid', N'creatoridold', 'COLUMN'
+
+COMMIT
+
+:VERSION 31        #---------------------
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD CreatorID varchar(255)
+ALTER TABLE primitems ADD CreatorID varchar(255)
+
+COMMIT
+
+:VERSION 32        #---------------------
+
+BEGIN TRANSACTION
+
+UPDATE prims SET prims.CreatorID = CONVERT(varchar(255), creatoridold)
+UPDATE primitems SET primitems.CreatorID = CONVERT(varchar(255), creatoridold)
+
+COMMIT
+
+:VERSION 33       #---------------------
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims 
+ADD CONSTRAINT DF_prims_CreatorIDNew 
+DEFAULT '00000000-0000-0000-0000-000000000000' 
+FOR CreatorID
+
+ALTER TABLE prims ALTER COLUMN CreatorID varchar(255) NOT NULL
+
+ALTER TABLE primitems
+ADD CONSTRAINT DF_primitems_CreatorIDNew
+DEFAULT '00000000-0000-0000-0000-000000000000' 
+FOR CreatorID
+
+ALTER TABLE primitems ALTER COLUMN CreatorID varchar(255) NOT NULL
+
+COMMIT
+
+:VERSION 34		  #--------------- Telehub support
+
+BEGIN TRANSACTION
+
+CREATE TABLE [dbo].[Spawn_Points](
+	[RegionUUID] [uniqueidentifier] NOT NULL,
+	[Yaw] [float] NOT NULL,
+	[Pitch] [float] NOT NULL,
+	[Distance] [float] NOT NULL,
+	PRIMARY KEY CLUSTERED 
+	(
+		[RegionUUID] ASC
+	)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+
+ALTER TABLE regionsettings ADD TelehubObject uniqueidentifier NOT NULL  DEFAULT '00000000-0000-0000-0000-000000000000';
+
+COMMIT
+
+:VERSION 35       #---------------- Parcels for sale
+
+BEGIN TRANSACTION
+
+ALTER TABLE regionsettings ADD parcel_tile_ID uniqueidentifier NOT NULL  DEFAULT '00000000-0000-0000-0000-000000000000';
+
+COMMIT
+
+:VERSION 36       #---------------- Timed bans/access
+
+BEGIN TRANSACTION
+
+ALTER TABLE landaccesslist ADD Expires integer NOT NULL  DEFAULT 0;
+
+COMMIT
+

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -155,7 +155,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="asset">Asset UUID to create</param>
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
-        override public bool StoreAsset(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
             lock (m_dbLock)
             {
@@ -203,14 +203,12 @@ namespace OpenSim.Data.MySQL
                             cmd.Parameters.AddWithValue("?data", asset.Data);
                             cmd.ExecuteNonQuery();
                             cmd.Dispose();
-                            return true;
                         }
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
                             asset.FullID, asset.Name, e.Message);
-                        return false;
                     }
                 }
             }

OpenSim/Data/MySQL/MySQLGenericTableHandler.cs

@@ -173,11 +173,6 @@ namespace OpenSim.Data.MySQL
                                 int v = Convert.ToInt32(reader[name]);
                                 m_Fields[name].SetValue(row, v);
                             }
-                            else if (m_Fields[name].FieldType == typeof(uint))
-                            {
-                                uint v = Convert.ToUInt32(reader[name]);
-                                m_Fields[name].SetValue(row, v);
-                            }
                             else
                             {
                                 m_Fields[name].SetValue(row, reader[name]);
@@ -299,4 +294,4 @@ namespace OpenSim.Data.MySQL
             }
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -66,7 +66,7 @@ namespace OpenSim.Data.MySQL
             Initialise(connectionString);
         }
 
-        public virtual void Initialise(string connectionString)
+        public void Initialise(string connectionString)
         {
             m_connectionString = connectionString;
 
@@ -113,7 +113,7 @@ namespace OpenSim.Data.MySQL
 
         public void Dispose() {}
 
-        public virtual void StoreObject(SceneObjectGroup obj, UUID regionUUID)
+        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
             uint flags = obj.RootPart.GetEffectiveObjectFlags();
 
@@ -241,7 +241,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual void RemoveObject(UUID obj, UUID regionUUID)
+        public void RemoveObject(UUID obj, UUID regionUUID)
         {
 //            m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID);
             
@@ -390,7 +390,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual List<SceneObjectGroup> LoadObjects(UUID regionID)
+        public List<SceneObjectGroup> LoadObjects(UUID regionID)
         {
             const int ROWS_PER_QUERY = 5000;
 
@@ -559,51 +559,36 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual void StoreTerrain(double[,] ter, UUID regionID)
+        public void StoreTerrain(double[,] ter, UUID regionID)
         {
-            Util.FireAndForget(delegate(object x)
+            m_log.Info("[REGION DB]: Storing terrain");
+
+            lock (m_dbLock)
             {
-                double[,] oldTerrain = LoadTerrain(regionID);
-
-                m_log.Info("[REGION DB]: Storing terrain");
-
-                lock (m_dbLock)
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
-                    using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                    dbcon.Open();
+
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
                     {
-                        dbcon.Open();
+                        cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
+                        cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
 
-                        using (MySqlCommand cmd = dbcon.CreateCommand())
-                        {
-                            cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
-                            cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                        ExecuteNonQuery(cmd);
 
-                            using (MySqlCommand cmd2 = dbcon.CreateCommand())
-                            {
-                                try
-                                {
-                                    cmd2.CommandText = "insert into terrain (RegionUUID, " +
-                                            "Revision, Heightfield) values (?RegionUUID, " +
-                                            "1, ?Heightfield)";
+                        cmd.CommandText = "insert into terrain (RegionUUID, " +
+                            "Revision, Heightfield) values (?RegionUUID, " +
+                            "1, ?Heightfield)";
 
-                                    cmd2.Parameters.AddWithValue("RegionUUID", regionID.ToString());
-                                    cmd2.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter, oldTerrain));
+                        cmd.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter));
 
-                                    ExecuteNonQuery(cmd);
-                                    ExecuteNonQuery(cmd2);
-                                }
-                                catch (Exception e)
-                                {
-                                    m_log.ErrorFormat(e.ToString());
-                                }
-                            }
-                        }
+                        ExecuteNonQuery(cmd);
                     }
                 }
-            });
+            }
         }
 
-        public virtual double[,] LoadTerrain(UUID regionID)
+        public double[,] LoadTerrain(UUID regionID)
         {
             double[,] terrain = null;
 
@@ -653,7 +638,7 @@ namespace OpenSim.Data.MySQL
             return terrain;
         }
 
-        public virtual void RemoveLandObject(UUID globalID)
+        public void RemoveLandObject(UUID globalID)
         {
             lock (m_dbLock)
             {
@@ -672,7 +657,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual void StoreLandObject(ILandObject parcel)
+        public void StoreLandObject(ILandObject parcel)
         {
             lock (m_dbLock)
             {
@@ -729,7 +714,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
+        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
             RegionLightShareData nWP = new RegionLightShareData();
             nWP.OnSave += StoreRegionWindlightSettings;
@@ -751,7 +736,7 @@ namespace OpenSim.Data.MySQL
                     {
                         //No result, so store our default windlight profile and return it
                         nWP.regionID = regionUUID;
-                        // StoreRegionWindlightSettings(nWP);
+                        StoreRegionWindlightSettings(nWP);
                         return nWP;
                     }
                     else
@@ -826,7 +811,7 @@ namespace OpenSim.Data.MySQL
             return nWP;
         }
 
-        public virtual RegionSettings LoadRegionSettings(UUID regionUUID)
+        public RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             RegionSettings rs = null;
 
@@ -866,7 +851,7 @@ namespace OpenSim.Data.MySQL
             return rs;
         }
 
-        public virtual void StoreRegionWindlightSettings(RegionLightShareData wl)
+        public void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -969,7 +954,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual void RemoveRegionWindlightSettings(UUID regionID)
+        public void RemoveRegionWindlightSettings(UUID regionID)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -984,7 +969,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual void StoreRegionSettings(RegionSettings rs)
+        public void StoreRegionSettings(RegionSettings rs)
         {
             lock (m_dbLock)
             {
@@ -1011,7 +996,7 @@ namespace OpenSim.Data.MySQL
                             "use_estate_sun, fixed_sun, sun_position, " +
                             "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
                             "sunvectorz, loaded_creation_datetime, " +
-                            "loaded_creation_id, map_tile_ID, block_search, casino, " +
+                            "loaded_creation_id, map_tile_ID, " +
                             "TelehubObject, parcel_tile_ID) " +
                              "values (?RegionUUID, ?BlockTerraform, " +
                             "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
@@ -1028,8 +1013,7 @@ namespace OpenSim.Data.MySQL
                             "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
                             "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                             "?LoadedCreationDateTime, ?LoadedCreationID, " +
-                            "?TerrainImageID, ?block_search, ?casino, " +
-                            "?TelehubObject, ?ParcelImageID)";
+                            "?TerrainImageID, ?TelehubObject, ?ParcelImageID) ";
 
                         FillRegionSettingsCommand(cmd, rs);
 
@@ -1040,7 +1024,7 @@ namespace OpenSim.Data.MySQL
             SaveSpawnPoints(rs);
         }
 
-        public virtual List<LandData> LoadLandObjects(UUID regionUUID)
+        public List<LandData> LoadLandObjects(UUID regionUUID)
         {
             List<LandData> landData = new List<LandData>();
 
@@ -1320,9 +1304,6 @@ namespace OpenSim.Data.MySQL
             newSettings.ParcelImageID = DBGuid.FromDB(row["parcel_tile_ID"]);
             newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]);
 
-            newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
-            newSettings.Casino = Convert.ToBoolean(row["casino"]);
-
             return newSettings;
         }
 
@@ -1420,7 +1401,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="val"></param>
         /// <returns></returns>
-        private static Array SerializeTerrain(double[,] val, double[,] oldTerrain)
+        private static Array SerializeTerrain(double[,] val)
         {
             MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) *sizeof (double));
             BinaryWriter bw = new BinaryWriter(str);
@@ -1429,11 +1410,7 @@ namespace OpenSim.Data.MySQL
             for (int x = 0; x < (int)Constants.RegionSize; x++)
                 for (int y = 0; y < (int)Constants.RegionSize; y++)
                 {
-                    double height = 20.0;
-                    if (oldTerrain != null)
-                        height = oldTerrain[x, y];
-                    if (!double.IsNaN(val[x, y]))
-                        height = val[x, y];
+                    double height = val[x, y];
                     if (height == 0.0)
                         height = double.Epsilon;
 
@@ -1657,9 +1634,6 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime);
             cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID);
             cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID);
-            cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch);
-            cmd.Parameters.AddWithValue("casino", settings.Casino);
-
             cmd.Parameters.AddWithValue("ParcelImageID", settings.ParcelImageID);
             cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject);
         }
@@ -1820,7 +1794,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
         }
 
-        public virtual void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
+        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
             lock (m_dbLock)
             {

OpenSim/Data/MySQL/MySQLUserAccountData.cs

@@ -46,21 +46,17 @@ namespace OpenSim.Data.MySQL
         {
             string[] words = query.Split(new char[] {' '});
 
-            bool valid = false;
-
             for (int i = 0 ; i < words.Length ; i++)
             {
-                if (words[i].Length > 2)
-                    valid = true;
-//                if (words[i].Length < 3)
-//                {
-//                    if (i != words.Length - 1)
-//                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
-//                    Array.Resize(ref words, words.Length - 1);
-//                }
+                if (words[i].Length < 3)
+                {
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+                    Array.Resize(ref words, words.Length - 1);
+                }
             }
 
-            if ((!valid) || words.Length == 0)
+            if (words.Length == 0)
                 return new UserAccountData[0];
 
             if (words.Length > 2)
@@ -70,34 +66,19 @@ namespace OpenSim.Data.MySQL
 
             if (words.Length == 1)
             {
-                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm);
-                cmd.Parameters.AddWithValue("?search", words[0] + "%");
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search)", m_Realm);
+                cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
                 cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
             }
             else
             {
-                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast) and active=1", m_Realm);
-                cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%");
-                cmd.Parameters.AddWithValue("?searchLast", words[1] + "%");
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst or LastName like ?searchLast)", m_Realm);
+                cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
+                cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
                 cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
             }
 
             return DoQuery(cmd);
         }
-
-        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
-        {
-            MySqlCommand cmd = new MySqlCommand();
-
-            if (scopeID != UUID.Zero)
-            {
-                where = "(ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (" + where + ")";
-                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-            }
-
-            cmd.CommandText = String.Format("select * from {0} where " + where, m_Realm);
-
-            return DoQuery(cmd);
-        }
     }
 }

OpenSim/Data/MySQL/Resources/RegionStore.migrations

@@ -717,7 +717,7 @@ ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT
 
 COMMIT;
 
-:VERSION 32			#---------------------
+:VERSION 32
 
 BEGIN;
 CREATE TABLE `regionwindlight` (
@@ -883,3 +883,4 @@ ALTER TABLE `regionsettings` MODIFY COLUMN `TelehubObject` VARCHAR(36) NOT NULL
 
 COMMIT;
 
+

OpenSim/Data/Null/NullFriendsData.cs

@@ -28,6 +28,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Data;
@@ -36,12 +39,26 @@ namespace OpenSim.Data.Null
 {
     public class NullFriendsData : IFriendsData
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private static List<FriendsData> m_Data = new List<FriendsData>();
 
         public NullFriendsData(string connectionString, string realm)
         {
         }
 
+        /// <summary>
+        /// Clear all friends data
+        /// </summary>
+        /// <remarks>
+        /// This is required by unit tests to clear the static data between test runs.
+        /// </remarks>
+        public static void Clear()
+        {
+            lock (m_Data)
+                m_Data.Clear();
+        }
+
         public FriendsData[] GetFriends(UUID principalID)
         {
             return GetFriends(principalID.ToString());
@@ -56,20 +73,30 @@ namespace OpenSim.Data.Null
         /// <returns></returns>
         public FriendsData[] GetFriends(string userID)
         {
-            List<FriendsData> lst = m_Data.FindAll(fdata =>
+            lock (m_Data)
             {
-                return fdata.PrincipalID == userID.ToString();
-            });
-
-            if (lst != null)
-            {
-                lst.ForEach(f =>
+                List<FriendsData> lst = m_Data.FindAll(fdata =>
                 {
-                    FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID);
-                    if (f2 != null) { f.Data["TheirFlags"] = f2.Data["Flags"]; }
+                    return fdata.PrincipalID == userID.ToString();
                 });
-
-                return lst.ToArray();
+    
+                if (lst != null)
+                {
+                    lst.ForEach(f =>
+                    {
+                        FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID);
+                        if (f2 != null)
+                            f.Data["TheirFlags"] = f2.Data["Flags"];
+    
+    //                    m_log.DebugFormat(
+    //                        "[NULL FRIENDS DATA]: Got {0} {1} {2} for {3}",
+    //                        f.Friend, f.Data["Flags"], f2 != null ? f.Data["TheirFlags"] : "not found!", f.PrincipalID);
+                    });
+    
+    //                m_log.DebugFormat("[NULL FRIENDS DATA]: Got {0} friends for {1}", lst.Count, userID);
+    
+                    return lst.ToArray();
+                }
             }
 
             return new FriendsData[0];
@@ -80,7 +107,11 @@ namespace OpenSim.Data.Null
             if (data == null)
                 return false;
 
-            m_Data.Add(data);
+//            m_log.DebugFormat(
+//                "[NULL FRIENDS DATA]: Storing {0} {1} {2}", data.PrincipalID, data.Friend, data.Data["Flags"]);
+
+            lock (m_Data)
+                m_Data.Add(data);
 
             return true;
         }
@@ -92,14 +123,21 @@ namespace OpenSim.Data.Null
 
         public bool Delete(string userID, string friendID)
         {
-            List<FriendsData> lst = m_Data.FindAll(delegate(FriendsData fdata) { return fdata.PrincipalID == userID.ToString(); });
-            if (lst != null)
+            lock (m_Data)
             {
-                FriendsData friend = lst.Find(delegate(FriendsData fdata) { return fdata.Friend == friendID; });
-                if (friendID != null)
+                List<FriendsData> lst = m_Data.FindAll(delegate(FriendsData fdata) { return fdata.PrincipalID == userID.ToString(); });
+                if (lst != null)
                 {
-                    m_Data.Remove(friend);
-                    return true;
+                    FriendsData friend = lst.Find(delegate(FriendsData fdata) { return fdata.Friend == friendID; });
+                    if (friendID != null)
+                    {
+    //                    m_log.DebugFormat(
+    //                        "[NULL FRIENDS DATA]: Deleting friend {0} {1} for {2}",
+    //                        friend.Friend, friend.Data["Flags"], friend.PrincipalID);
+    
+                        m_Data.Remove(friend);
+                        return true;
+                    }
                 }
             }
 

OpenSim/Data/Null/NullPresenceData.cs

@@ -110,7 +110,6 @@ namespace OpenSim.Data.Null
             return false;
         }
 
-
         public PresenceData[] Get(string field, string data)
         {
             if (Instance != this)

OpenSim/Data/Null/NullUserAccountData.cs

@@ -193,10 +193,5 @@ namespace OpenSim.Data.Null
 
             return false;
         }
-
-        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
-        {
-            return null;
-        }
     }
 }

OpenSim/Data/SQLite/Resources/RegionStore.migrations

@@ -472,3 +472,95 @@ COMMIT;
 BEGIN;
 ALTER TABLE regionsettings ADD COLUMN covenant_datetime INTEGER NOT NULL default 0;
 COMMIT;
+
+:VERSION 23
+BEGIN;
+CREATE TABLE regionwindlight (
+  region_id VARCHAR(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000' PRIMARY KEY,
+  water_color_r FLOAT NOT NULL DEFAULT '4.000000',
+  water_color_g FLOAT NOT NULL DEFAULT '38.000000',
+  water_color_b FLOAT NOT NULL DEFAULT '64.000000',
+  water_color_i FLOAT NOT NULL DEFAULT '1.000000',
+  water_fog_density_exponent FLOAT NOT NULL DEFAULT '4.0',
+  underwater_fog_modifier FLOAT NOT NULL DEFAULT '0.25',
+  reflection_wavelet_scale_1 FLOAT NOT NULL DEFAULT '2.0',
+  reflection_wavelet_scale_2 FLOAT NOT NULL DEFAULT '2.0',
+  reflection_wavelet_scale_3 FLOAT NOT NULL DEFAULT '2.0',
+  fresnel_scale FLOAT NOT NULL DEFAULT '0.40',
+  fresnel_offset FLOAT NOT NULL DEFAULT '0.50',
+  refract_scale_above FLOAT NOT NULL DEFAULT '0.03',
+  refract_scale_below FLOAT NOT NULL DEFAULT '0.20',
+  blur_multiplier FLOAT NOT NULL DEFAULT '0.040',
+  big_wave_direction_x FLOAT NOT NULL DEFAULT '1.05',
+  big_wave_direction_y FLOAT NOT NULL DEFAULT '-0.42',
+  little_wave_direction_x FLOAT NOT NULL DEFAULT '1.11',
+  little_wave_direction_y FLOAT NOT NULL DEFAULT '-1.16',
+  normal_map_texture VARCHAR(36) NOT NULL DEFAULT '822ded49-9a6c-f61c-cb89-6df54f42cdf4',
+  horizon_r FLOAT NOT NULL DEFAULT '0.25',
+  horizon_g FLOAT NOT NULL DEFAULT '0.25',
+  horizon_b FLOAT NOT NULL DEFAULT '0.32',
+  horizon_i FLOAT NOT NULL DEFAULT '0.32',
+  haze_horizon FLOAT NOT NULL DEFAULT '0.19',
+  blue_density_r FLOAT NOT NULL DEFAULT '0.12',
+  blue_density_g FLOAT NOT NULL DEFAULT '0.22',
+  blue_density_b FLOAT NOT NULL DEFAULT '0.38',
+  blue_density_i FLOAT NOT NULL DEFAULT '0.38',
+  haze_density FLOAT NOT NULL DEFAULT '0.70',
+  density_multiplier FLOAT NOT NULL DEFAULT '0.18',
+  distance_multiplier FLOAT NOT NULL DEFAULT '0.8',
+  max_altitude INTEGER NOT NULL DEFAULT '1605',
+  sun_moon_color_r FLOAT NOT NULL DEFAULT '0.24',
+  sun_moon_color_g FLOAT NOT NULL DEFAULT '0.26',
+  sun_moon_color_b FLOAT NOT NULL DEFAULT '0.30',
+  sun_moon_color_i FLOAT NOT NULL DEFAULT '0.30',
+  sun_moon_position FLOAT NOT NULL DEFAULT '0.317',
+  ambient_r FLOAT NOT NULL DEFAULT '0.35',
+  ambient_g FLOAT NOT NULL DEFAULT '0.35',
+  ambient_b FLOAT NOT NULL DEFAULT '0.35',
+  ambient_i FLOAT NOT NULL DEFAULT '0.35',
+  east_angle FLOAT NOT NULL DEFAULT '0.00',
+  sun_glow_focus FLOAT NOT NULL DEFAULT '0.10',
+  sun_glow_size FLOAT NOT NULL DEFAULT '1.75',
+  scene_gamma FLOAT NOT NULL DEFAULT '1.00',
+  star_brightness FLOAT NOT NULL DEFAULT '0.00',
+  cloud_color_r FLOAT NOT NULL DEFAULT '0.41',
+  cloud_color_g FLOAT NOT NULL DEFAULT '0.41',
+  cloud_color_b FLOAT NOT NULL DEFAULT '0.41',
+  cloud_color_i FLOAT NOT NULL DEFAULT '0.41',
+  cloud_x FLOAT NOT NULL DEFAULT '1.00',
+  cloud_y FLOAT NOT NULL DEFAULT '0.53',
+  cloud_density FLOAT NOT NULL DEFAULT '1.00',
+  cloud_coverage FLOAT NOT NULL DEFAULT '0.27',
+  cloud_scale FLOAT NOT NULL DEFAULT '0.42',
+  cloud_detail_x FLOAT NOT NULL DEFAULT '1.00',
+  cloud_detail_y FLOAT NOT NULL DEFAULT '0.53',
+  cloud_detail_density FLOAT NOT NULL DEFAULT '0.12',
+  cloud_scroll_x FLOAT NOT NULL DEFAULT '0.20',
+  cloud_scroll_x_lock INTEGER NOT NULL DEFAULT '0',
+  cloud_scroll_y FLOAT NOT NULL DEFAULT '0.01',
+  cloud_scroll_y_lock INTEGER NOT NULL DEFAULT '0',
+  draw_classic_clouds INTEGER NOT NULL DEFAULT '1');
+
+COMMIT;
+
+
+:VERSION 24
+
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS `spawn_points` (
+  `RegionID` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000',
+  `Yaw` float NOT NULL,
+  `Pitch` float NOT NULL,
+  `Distance` float NOT NULL
+);
+
+ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+
+:VERSION 25
+
+BEGIN;
+ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+COMMIT;

OpenSim/Data/SQLite/SQLiteAssetData.cs

@@ -81,6 +81,9 @@ namespace OpenSim.Data.SQLite
         /// <param name="dbconnect">connect string</param>
         override public void Initialise(string dbconnect)
         {
+            if (Util.IsWindows())
+                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
+
             if (dbconnect == string.Empty)
             {
                 dbconnect = "URI=file:Asset.db,version=3";
@@ -128,7 +131,7 @@ namespace OpenSim.Data.SQLite
         /// Create an asset
         /// </summary>
         /// <param name="asset">Asset Base</param>
-        override public bool StoreAsset(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
             //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
             if (ExistsAsset(asset.FullID))
@@ -150,7 +153,6 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
-                        return true;
                     }
                 }
             }
@@ -171,7 +173,6 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
-                        return true;
                     }
                 }
             }

OpenSim/Data/SQLite/SQLiteAuthenticationData.cs

@@ -65,6 +65,9 @@ namespace OpenSim.Data.SQLite
 
             if (!m_initialized)
             {
+                if (Util.IsWindows())
+                    Util.LoadArchSpecificWindowsDll("sqlite3.dll");
+
                 m_Connection = new SqliteConnection(connectionString);
                 m_Connection.Open();
 

OpenSim/Data/SQLite/SQLiteEstateData.cs

@@ -69,6 +69,9 @@ namespace OpenSim.Data.SQLite
 
         public void Initialise(string connectionString)
         {
+            if (Util.IsWindows())
+                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
+
             m_connectionString = connectionString;
 
             m_log.Info("[ESTATE DB]: Sqlite - connecting: "+m_connectionString);

OpenSim/Data/SQLite/SQLiteFramework.cs

@@ -48,6 +48,8 @@ namespace OpenSim.Data.SQLite
 
         protected SQLiteFramework(string connectionString)
         {
+            if (Util.IsWindows())
+                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
         }
 
         //////////////////////////////////////////////////////////////

OpenSim/Data/SQLite/SQLiteInventoryStore.cs

@@ -77,6 +77,9 @@ namespace OpenSim.Data.SQLite
             {
                 m_Initialized = true;
 
+                if (Util.IsWindows())
+                    Util.LoadArchSpecificWindowsDll("sqlite3.dll");
+
                 if (dbconnect == string.Empty)
                 {
                     dbconnect = "URI=file:inventoryStore.db,version=3";

OpenSim/Data/SQLite/SQLiteUserAccountData.cs

@@ -81,10 +81,5 @@ namespace OpenSim.Data.SQLite
 
             return DoQuery(cmd);
         }
-
-        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
-        {
-            return null;
-        }
     }
 }

OpenSim/Data/SQLite/SQLiteXInventoryData.cs

@@ -52,6 +52,9 @@ namespace OpenSim.Data.SQLite
 
         public SQLiteXInventoryData(string conn, string realm)
         {
+            if (Util.IsWindows())
+                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
+
             m_Folders = new SQLiteGenericTableHandler<XInventoryFolder>(
                     conn, "inventoryfolders", "XInventoryStore");
             m_Items = new SqliteItemHandler(

OpenSim/Framework/AssetBase.cs

@@ -60,8 +60,6 @@ namespace OpenSim.Framework
         /// </summary>
         private AssetMetadata m_metadata;
 
-        private int m_uploadAttempts;
-
         // This is needed for .NET serialization!!!
         // Do NOT "Optimize" away!
         public AssetBase()
@@ -200,12 +198,6 @@ namespace OpenSim.Framework
             set { m_metadata.Type = value; }
         }
 
-        public int UploadAttempts
-        {
-            get { return m_uploadAttempts; }
-            set { m_uploadAttempts = value; }
-        }
-
         /// <summary>
         /// Is this a region only asset, or does this exist on the asset server also
         /// </summary>

OpenSim/Framework/AvatarAppearance.cs

@@ -240,21 +240,6 @@ namespace OpenSim.Framework
 //            }
         }
 
-        /// <summary>
-        /// Invalidate all of the baked textures in the appearance, useful
-        /// if you know that none are valid
-        /// </summary>
-        public virtual void ResetBakedTextures()
-        {
-            SetDefaultTexture();
-            
-            //for (int i = 0; i < BAKE_INDICES.Length; i++)
-            // {
-            //     int idx = BAKE_INDICES[i];
-            //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
-            // }
-        }
-        
         protected virtual void SetDefaultTexture()
         {
             m_texture = new Primitive.TextureEntry(new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
@@ -405,18 +390,19 @@ namespace OpenSim.Framework
         /// </remarks>
         public List<AvatarAttachment> GetAttachments()
         {
-            
+            List<AvatarAttachment> alist = new List<AvatarAttachment>();
 
             lock (m_attachments)
             {
-				List<AvatarAttachment> alist = new List<AvatarAttachment>();
                 foreach (KeyValuePair<int, List<AvatarAttachment>> kvp in m_attachments)
                 {
                     foreach (AvatarAttachment attach in kvp.Value)
                         alist.Add(new AvatarAttachment(attach));
                 }
-				return alist;
-			}        }
+            }
+
+            return alist;
+        }
 
         internal void AppendAttachment(AvatarAttachment attach)
         {
@@ -545,6 +531,7 @@ namespace OpenSim.Framework
                         return kvp.Key;
                 }
             }
+
             return 0;
         }
 
@@ -611,14 +598,12 @@ namespace OpenSim.Framework
             OSDBinary visualparams = new OSDBinary(m_visualparams);
             data["visualparams"] = visualparams;
 
-            lock (m_attachments)
-            {
-                // Attachments
-                OSDArray attachs = new OSDArray(m_attachments.Count);
-                foreach (AvatarAttachment attach in GetAttachments())
-                    attachs.Add(attach.Pack());
-                data["attachments"] = attachs;
-            }
+            // Attachments
+            List<AvatarAttachment> attachments = GetAttachments();
+            OSDArray attachs = new OSDArray(attachments.Count);
+            foreach (AvatarAttachment attach in GetAttachments())
+                attachs.Add(attach.Pack());
+            data["attachments"] = attachs;
 
             return data;
         }

OpenSim/Framework/Client/IClientInventory.cs

@@ -27,22 +27,14 @@
 
 using System;
 using OpenMetaverse;
-using Ode.NET;
 using OpenSim.Framework;
-using OpenSim.Region.Physics.Manager;
-using OpenSim.Region.Physics.OdePlugin;
 
-namespace OpenSim.Region.Physics.OdePlugin
+namespace OpenSim.Framework.Client
 {
-    class OdePhysicsJoint : PhysicsJoint
+    public interface IClientInventory
     {
-        public override bool IsInPhysicsEngine
-        {
-            get
-            {
-                return (jointID != IntPtr.Zero);
-            }
-        }
-        public IntPtr jointID;
+        void SendRemoveInventoryFolders(UUID[] folders);
+        void SendRemoveInventoryItems(UUID[] folders);
+        void SendBulkUpdateInventory(InventoryFolderBase[] folders, InventoryItemBase[] items);
     }
 }

OpenSim/Framework/Communications/RestClient.cs

@@ -363,7 +363,7 @@ namespace OpenSim.Framework.Communications
             _request = (HttpWebRequest) WebRequest.Create(buildUri());
             _request.KeepAlive = false;
             _request.ContentType = "application/xml";
-            _request.Timeout = 30000;
+            _request.Timeout = 900000;
             _request.Method = RequestMethod;
             _asyncException = null;
             _request.ContentLength = src.Length;

OpenSim/Framework/Console/CommandConsole.cs

@@ -29,6 +29,7 @@ using System;
 using System.Xml;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -40,6 +41,8 @@ namespace OpenSim.Framework.Console
 {
     public class Commands : ICommands
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>
         /// Encapsulates a command that can be invoked from the console
         /// </summary>
@@ -76,12 +79,23 @@ namespace OpenSim.Framework.Console
             public List<CommandDelegate> fn;
         }
 
+        public const string GeneralHelpText
+            = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n";
+
+        public const string ItemHelpText
+                = "For more information, type 'help <item>' where <item> is one of the following:";
+
         /// <value>
         /// Commands organized by keyword in a tree
         /// </value>
         private Dictionary<string, object> tree =
                 new Dictionary<string, object>();
 
+        /// <summary>
+        /// Commands organized by module
+        /// </summary>
+        private Dictionary<string, List<CommandInfo>> m_modulesCommands = new Dictionary<string, List<CommandInfo>>();
+
         /// <summary>
         /// Get help for the given help string
         /// </summary>
@@ -98,8 +112,10 @@ namespace OpenSim.Framework.Console
             // General help
             if (helpParts.Count == 0)
             {
-                help.AddRange(CollectHelp(tree));
-                help.Sort();
+                help.Add(""); // Will become a newline.
+                help.Add(GeneralHelpText);
+                help.Add(ItemHelpText);
+                help.AddRange(CollectModulesHelp(tree));
             }
             else
             {
@@ -118,6 +134,13 @@ namespace OpenSim.Framework.Console
         {
             string originalHelpRequest = string.Join(" ", helpParts.ToArray());
             List<string> help = new List<string>();
+
+            // Check modules first to see if we just need to display a list of those commands
+            if (TryCollectModuleHelp(originalHelpRequest, help))
+            {
+                help.Insert(0, ItemHelpText);
+                return help;
+            }
             
             Dictionary<string, object> dict = tree;
             while (helpParts.Count > 0)
@@ -161,25 +184,63 @@ namespace OpenSim.Framework.Console
             return help;
         }
 
-        private List<string> CollectHelp(Dictionary<string, object> dict)
+        /// <summary>
+        /// Try to collect help for the given module if that module exists.
+        /// </summary>
+        /// <param name="moduleName"></param>
+        /// <param name="helpText">/param>
+        /// <returns>true if there was the module existed, false otherwise.</returns>
+        private bool TryCollectModuleHelp(string moduleName, List<string> helpText)
         {
-            List<string> result = new List<string>();
-
-            foreach (KeyValuePair<string, object> kvp in dict)
+            lock (m_modulesCommands)
             {
-                if (kvp.Value is Dictionary<string, Object>)
+                foreach (string key in m_modulesCommands.Keys)
                 {
-                    result.AddRange(CollectHelp((Dictionary<string, Object>)kvp.Value));
-                }
-                else
-                {
-                    if (((CommandInfo)kvp.Value).long_help != String.Empty)
-                        result.Add(((CommandInfo)kvp.Value).help_text+" - "+
-                                ((CommandInfo)kvp.Value).long_help);
+                    // Allow topic help requests to succeed whether they are upper or lowercase.
+                    if (moduleName.ToLower() == key.ToLower())
+                    {
+                        List<CommandInfo> commands = m_modulesCommands[key];
+                        var ourHelpText = commands.ConvertAll(c => string.Format("{0} - {1}", c.help_text, c.long_help));
+                        ourHelpText.Sort();
+                        helpText.AddRange(ourHelpText);
+
+                        return true;
+                    }
                 }
+
+                return false;
             }
-            return result;
         }
+
+        private List<string> CollectModulesHelp(Dictionary<string, object> dict)
+        {
+            lock (m_modulesCommands)
+            {
+                List<string> helpText = new List<string>(m_modulesCommands.Keys);
+                helpText.Sort();
+                return helpText;
+            }
+        }
+
+//        private List<string> CollectHelp(Dictionary<string, object> dict)
+//        {
+//            List<string> result = new List<string>();
+//
+//            foreach (KeyValuePair<string, object> kvp in dict)
+//            {
+//                if (kvp.Value is Dictionary<string, Object>)
+//                {
+//                    result.AddRange(CollectHelp((Dictionary<string, Object>)kvp.Value));
+//                }
+//                else
+//                {
+//                    if (((CommandInfo)kvp.Value).long_help != String.Empty)
+//                        result.Add(((CommandInfo)kvp.Value).help_text+" - "+
+//                                ((CommandInfo)kvp.Value).long_help);
+//                }
+//            }
+//            return result;
+//        }
         
         /// <summary>
         /// Add a command to those which can be invoked from the console.
@@ -212,21 +273,19 @@ namespace OpenSim.Framework.Console
 
             Dictionary<string, Object> current = tree;
             
-            foreach (string s in parts)
+            foreach (string part in parts)
             {
-                if (current.ContainsKey(s))
+                if (current.ContainsKey(part))
                 {
-                    if (current[s] is Dictionary<string, Object>)
-                    {
-                        current = (Dictionary<string, Object>)current[s];
-                    }
+                    if (current[part] is Dictionary<string, Object>)
+                        current = (Dictionary<string, Object>)current[part];
                     else
                         return;
                 }
                 else
                 {
-                    current[s] = new Dictionary<string, Object>();
-                    current = (Dictionary<string, Object>)current[s];
+                    current[part] = new Dictionary<string, Object>();
+                    current = (Dictionary<string, Object>)current[part];
                 }
             }
 
@@ -250,6 +309,24 @@ namespace OpenSim.Framework.Console
             info.fn = new List<CommandDelegate>();
             info.fn.Add(fn);
             current[String.Empty] = info;
+
+            // Now add command to modules dictionary
+            lock (m_modulesCommands)
+            {
+                List<CommandInfo> commands;
+                if (m_modulesCommands.ContainsKey(module))
+                {
+                    commands = m_modulesCommands[module];
+                }
+                else
+                {
+                    commands = new List<CommandInfo>();
+                    m_modulesCommands[module] = commands;
+                }
+
+//                m_log.DebugFormat("[COMMAND CONSOLE]: Adding to category {0} command {1}", module, command);
+                commands.Add(info);
+            }
         }
 
         public string[] FindNextOption(string[] cmd, bool term)
@@ -607,8 +684,9 @@ namespace OpenSim.Framework.Console
         {
             Commands = new Commands();
 
-            Commands.AddCommand("console", false, "help", "help [<command>]", 
-                    "Get general command list or more detailed help on a specific command", Help);
+            Commands.AddCommand(
+                "Help", false, "help", "help [<item>]",
+                "Display help on a particular command or on a list of commands in a category", Help);
         }
 
         private void Help(string module, string[] cmd)

OpenSim/Framework/Console/MockConsole.cs

@@ -29,6 +29,7 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 using System.Text;
+using System.Xml;
 
 namespace OpenSim.Framework.Console
 {
@@ -37,28 +38,42 @@ namespace OpenSim.Framework.Console
     /// Don't use this except for Unit Testing or you're in for a world of hurt when the 
     /// sim gets to ReadLine
     /// </summary>
-    public class MockConsole : CommandConsole
+    public class MockConsole : ICommandConsole
     {
-        public MockConsole(string defaultPrompt) : base(defaultPrompt)
-        {
-        }
-        public override void Output(string text)
-        {
-        }
-        public override void Output(string text, string level)
-        {
-        }
+        private MockCommands m_commands = new MockCommands();
 
-        public override string ReadLine(string p, bool isCommand, bool e)
-        {
-            //Thread.CurrentThread.Join(1000);
-            return string.Empty;
-        }
-        public override void UnlockOutput()
-        {
-        }
-        public override void LockOutput()
-        {
-        }
+        public ICommands Commands { get { return m_commands; } }
+
+        public void Prompt() {}
+
+        public void RunCommand(string cmd) {}
+
+        public string ReadLine(string p, bool isCommand, bool e) { return ""; }
+
+        public object ConsoleScene { get { return null; } }
+
+        public void Output(string text, string level) {}
+        public void Output(string text) {}
+        public void OutputFormat(string format, params object[] components) {}
+
+        public string CmdPrompt(string p) { return ""; }
+        public string CmdPrompt(string p, string def) { return ""; }
+        public string CmdPrompt(string p, List<char> excludedCharacters) { return ""; }
+        public string CmdPrompt(string p, string def, List<char> excludedCharacters) { return ""; }
+
+        public string CmdPrompt(string prompt, string defaultresponse, List<string> options) { return ""; }
+
+        public string PasswdPrompt(string p) { return ""; }
     }
-}
+
+    public class MockCommands : ICommands
+    {
+        public void FromXml(XmlElement root, CommandDelegate fn) {}
+        public List<string> GetHelp(string[] cmd) { return null; }
+        public void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn) {}
+        public void AddCommand(string module, bool shared, string command, string help, string longhelp, string descriptivehelp, CommandDelegate fn) {}
+        public string[] FindNextOption(string[] cmd, bool term) { return null; }
+        public string[] Resolve(string[] cmd) { return null; }
+        public XmlElement GetXml(XmlDocument doc) { return null; }
+    }
+}

OpenSim/Framework/EstateSettings.cs

@@ -58,30 +58,6 @@ namespace OpenSim.Framework
             set { m_EstateName = value; }
         }
 
-        private bool m_AllowLandmark = true;
-
-        public bool AllowLandmark
-        {
-            get { return m_AllowLandmark; }
-            set { m_AllowLandmark = value; }
-        }
-
-        private bool m_AllowParcelChanges = true;
-
-        public bool AllowParcelChanges
-        {
-            get { return m_AllowParcelChanges; }
-            set { m_AllowParcelChanges = value; }
-        }
-
-        private bool m_AllowSetHome = true;
-
-        public bool AllowSetHome
-        {
-            get { return m_AllowSetHome; }
-            set { m_AllowSetHome = value; }
-        }
-
         private uint m_ParentEstateID = 1;
 
         public uint ParentEstateID
@@ -362,30 +338,11 @@ namespace OpenSim.Framework
             return false;
         }
 
-        public bool IsBanned(UUID avatarID, int userFlags)
+        public bool IsBanned(UUID avatarID)
         {
             foreach (EstateBan ban in l_EstateBans)
                 if (ban.BannedUserID == avatarID)
                     return true;
-
-            if (!IsEstateManager(avatarID) && !HasAccess(avatarID))
-            {
-                if (DenyMinors)
-                {
-                    if ((userFlags & 32) == 0)
-                    {
-                        return true;
-                    }
-                }
-                if (DenyAnonymous)
-                {
-                    if ((userFlags & 4) == 0)
-                    {
-                        return true;
-                    }
-                }
-            }
-
             return false;
         }
 
@@ -393,7 +350,7 @@ namespace OpenSim.Framework
         {
             if (ban == null)
                 return;
-            if (!IsBanned(ban.BannedUserID, 32)) //Ignore age-based bans
+            if (!IsBanned(ban.BannedUserID))
                 l_EstateBans.Add(ban);
         }
 
@@ -417,15 +374,6 @@ namespace OpenSim.Framework
             return l_EstateAccess.Contains(user);
         }
 
-        public void SetFromFlags(ulong regionFlags)
-        {
-            ResetHomeOnTeleport = ((regionFlags & (ulong)RegionFlags.ResetHomeOnTeleport) == (ulong)RegionFlags.ResetHomeOnTeleport);
-            BlockDwell = ((regionFlags & (ulong)RegionFlags.BlockDwell) == (ulong)RegionFlags.BlockDwell);
-            AllowLandmark = ((regionFlags & (ulong)RegionFlags.AllowLandmark) == (ulong)RegionFlags.AllowLandmark);
-            AllowParcelChanges = ((regionFlags & (ulong)RegionFlags.AllowParcelChanges) == (ulong)RegionFlags.AllowParcelChanges);
-            AllowSetHome = ((regionFlags & (ulong)RegionFlags.AllowSetHome) == (ulong)RegionFlags.AllowSetHome);
-        }
-
         public bool GroupAccess(UUID groupID)
         {
             return l_EstateGroups.Contains(groupID);

OpenSim/Framework/GcNotify.cs

@@ -25,34 +25,38 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Reflection;
-using System.Runtime.InteropServices;
+using log4net;
 
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
+public class GcNotify
+{
+    private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-[assembly : AssemblyTitle("OdePlugin")]
-[assembly : AssemblyDescription("")]
-[assembly : AssemblyConfiguration("")]
-[assembly : AssemblyCompany("http://opensimulator.org")]
-[assembly : AssemblyProduct("OdePlugin")]
-[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
-[assembly : AssemblyTrademark("")]
-[assembly : AssemblyCulture("")]
+    public static bool Enabled
+    {
+        get { return s_initialized; }
+        set
+        {
+            if (!s_initialized && value)
+                new GcNotify();
 
-// This sets the default COM visibility of types in the assembly to invisible.
-// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+            s_initialized = value;
+        }
+    }
 
-[assembly : ComVisible(false)]
+    private static bool s_initialized = false;
 
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
+    private GcNotify() {}
 
-[assembly : AssemblyVersion("0.6.5.*")]
+    ~GcNotify()
+    {
+        if (!Environment.HasShutdownStarted && !AppDomain.CurrentDomain.IsFinalizingForUnload())
+        {
+            m_log.DebugFormat("[GC NOTIFY]: Garbage collection triggered.");
+
+            if (Enabled)
+                new GcNotify();
+        }
+    }
+}

OpenSim/Framework/ICallingCardModule.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Framework
-{
-    public interface ICallingCardModule
-    {
-        UUID CreateCallingCard(UUID userID, UUID creatorID, UUID folderID);
-    }
-}

OpenSim/Framework/IClientAPI.cs

@@ -266,9 +266,6 @@ namespace OpenSim.Framework
     public delegate void MoveInventoryItem(
         IClientAPI remoteClient, List<InventoryItemBase> items);
 
-    public delegate void MoveItemsAndLeaveCopy(
-        IClientAPI remoteClient, List<InventoryItemBase> items, UUID destFolder);
-
     public delegate void RemoveInventoryItem(
         IClientAPI remoteClient, List<UUID> itemIDs);
 
@@ -299,9 +296,9 @@ namespace OpenSim.Framework
     public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID);
 
     public delegate void FriendActionDelegate(
-        IClientAPI remoteClient, UUID agentID, UUID transactionID, List<UUID> callingCardFolders);
+        IClientAPI remoteClient, UUID transactionID, List<UUID> callingCardFolders);
 
-    public delegate void FriendshipTermination(IClientAPI remoteClient, UUID agentID, UUID ExID);
+    public delegate void FriendshipTermination(IClientAPI remoteClient, UUID ExID);
 
     public delegate void MoneyTransferRequest(
         UUID sourceID, UUID destID, int amount, int transactionType, string description);
@@ -444,7 +441,6 @@ namespace OpenSim.Framework
     public delegate void ClassifiedInfoRequest(UUID classifiedID, IClientAPI client);
     public delegate void ClassifiedInfoUpdate(UUID classifiedID, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, Vector3 globalPos, byte classifiedFlags, int price, IClientAPI client);
     public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client);
-    public delegate void ClassifiedGodDelete(UUID classifiedID, UUID queryID, IClientAPI client);
 
     public delegate void EventNotificationAddRequest(uint EventID, IClientAPI client);
     public delegate void EventNotificationRemoveRequest(uint EventID, IClientAPI client);
@@ -462,14 +458,14 @@ namespace OpenSim.Framework
     public delegate void AvatarNotesUpdate(IClientAPI client, UUID targetID, string notes);
     public delegate void MuteListRequest(IClientAPI client, uint muteCRC);
     public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
-    public delegate void GrantUserFriendRights(IClientAPI client, UUID requester, UUID target, int rights);
+    public delegate void GrantUserFriendRights(IClientAPI client, UUID target, int rights);
     public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client);
 
     public delegate void AgentFOV(IClientAPI client, float verticalAngle);
     
-    public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int type, uint flags);
+    public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int Flags,UUID AgentID);
     
-    public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name);
+    public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name, UUID AgentID);
     
     public delegate void AvatarInterestReply(IClientAPI client,UUID target, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
     
@@ -507,7 +503,6 @@ namespace OpenSim.Framework
     public delegate void SimWideDeletesDelegate(IClientAPI client,UUID agentID, int flags, UUID targetID);
     
     public delegate void SendPostcard(IClientAPI client);
-    public delegate void ChangeInventoryItemFlags(IClientAPI client, UUID itemID, uint flags);
 
     #endregion
 
@@ -715,7 +710,7 @@ namespace OpenSim.Framework
         /// The scene agent for this client.  This will only be set if the client has an agent in a scene (i.e. if it
         /// is connected).
         /// </summary>
-        ISceneAgent SceneAgent { get; }
+        ISceneAgent SceneAgent { get; set; }
 
         UUID SessionId { get; }
 
@@ -862,7 +857,6 @@ namespace OpenSim.Framework
         event RequestTaskInventory OnRequestTaskInventory;
         event UpdateInventoryItem OnUpdateInventoryItem;
         event CopyInventoryItem OnCopyInventoryItem;
-        event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
         event MoveInventoryItem OnMoveInventoryItem;
         event RemoveInventoryFolder OnRemoveInventoryFolder;
         event RemoveInventoryItem OnRemoveInventoryItem;
@@ -981,7 +975,7 @@ namespace OpenSim.Framework
         event ClassifiedInfoRequest OnClassifiedInfoRequest;
         event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
         event ClassifiedDelete OnClassifiedDelete;
-        event ClassifiedGodDelete OnClassifiedGodDelete;
+        event ClassifiedDelete OnClassifiedGodDelete;
 
         event EventNotificationAddRequest OnEventNotificationAddRequest;
         event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -1020,7 +1014,6 @@ namespace OpenSim.Framework
         event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         event SimWideDeletesDelegate OnSimWideDeletes;
         event SendPostcard OnSendPostcard;
-        event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
         event MuteListEntryUpdate OnUpdateMuteListEntry;
         event MuteListEntryRemove OnRemoveMuteListEntry;
         event GodlikeMessage onGodlikeMessage;
@@ -1034,7 +1027,6 @@ namespace OpenSim.Framework
         void InPacket(object NewPack);
         void ProcessInPacket(Packet NewPack);
         void Close();
-        void Close(bool sendStop);
         void Kick(string message);
         
         /// <summary>

OpenSim/Framework/ICommandConsole.cs

@@ -40,7 +40,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// Get help for the given help string
         /// </summary>
-        /// <param name="helpParts">Parsed parts of the help string.  If empty then general help is returned.</param>
+        /// <param name="cmd">Parsed parts of the help string.  If empty then general help is returned.</param>
         /// <returns></returns>
         List<string> GetHelp(string[] cmd);
 

OpenSim/Framework/ILandObject.cs

@@ -71,6 +71,7 @@ namespace OpenSim.Framework
         bool IsEitherBannedOrRestricted(UUID avatar);
         bool IsBannedFromLand(UUID avatar);
         bool IsRestrictedFromLand(UUID avatar);
+        bool IsInLandAccessList(UUID avatar);
         void SendLandUpdateToClient(IClientAPI remote_client);
         void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client);
         List<LandAccessEntry> CreateAccessListArrayByFlag(AccessList flag);

OpenSim/Framework/IMoneyModule.cs

@@ -40,7 +40,6 @@ namespace OpenSim.Framework
         bool AmountCovered(UUID agentID, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
         void ApplyUploadCharge(UUID agentID, int amount, string text);
-        void MoveMoney(UUID fromUser, UUID toUser, int amount, string text);
 
         int UploadCharge { get; }
         int GroupCreationCharge { get; }

OpenSim/Framework/LandData.cs

@@ -67,9 +67,9 @@ namespace OpenSim.Framework
 
         private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark |
                                 (uint) ParcelFlags.AllowAPrimitiveEntry |
-                                (uint) ParcelFlags.AllowDeedToGroup |
+                                (uint) ParcelFlags.AllowDeedToGroup | (uint) ParcelFlags.AllowTerraform |
                                 (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts |
-                                (uint) ParcelFlags.SoundLocal;
+                                (uint) ParcelFlags.SoundLocal | (uint) ParcelFlags.AllowVoiceChat;
 
         private byte _landingType = 0;
         private string _name = "Your Parcel";

OpenSim/Framework/ParcelMediaCommandEnum.cs

@@ -27,7 +27,7 @@
 
 namespace OpenSim.Framework
 {
-    public enum ParcelMediaCommandEnum : int
+    public enum ParcelMediaCommandEnum
     {
         Stop = 0,
         Pause = 1,

OpenSim/Framework/PluginLoader.cs

@@ -244,22 +244,13 @@ namespace OpenSim.Framework
             // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0)
             // occasionally seems to corrupt its addin cache
             // Hence, as a temporary solution we'll remove it before each startup
-
-            string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_REGISTRY");
-            string v0 = "addin-db-000";
-            string v1 = "addin-db-001";
-            if (customDir != null && customDir != String.Empty)
-            {
-                v0 = Path.Combine(customDir, v0);
-                v1 = Path.Combine(customDir, v1);
-            }
             try
             {
-                if (Directory.Exists(v0))
-                    Directory.Delete(v0, true);
+                if (Directory.Exists("addin-db-000"))
+                    Directory.Delete("addin-db-000", true);
 
-                if (Directory.Exists(v1))
-                    Directory.Delete(v1, true);
+                if (Directory.Exists("addin-db-001"))
+                    Directory.Delete("addin-db-001", true);
             }
             catch (IOException)
             {

OpenSim/Framework/PrimitiveBaseShape.cs

@@ -720,12 +720,7 @@ namespace OpenSim.Framework
                 return _lightColorR;
             }
             set {
-                if (value < 0)
-                    _lightColorR = 0;
-                else if (value > 1.0f)
-                    _lightColorR = 1.0f;
-                else
-                    _lightColorR = value;
+                _lightColorR = value;
             }
         }
 
@@ -734,12 +729,7 @@ namespace OpenSim.Framework
                 return _lightColorG;
             }
             set {
-                if (value < 0)
-                    _lightColorG = 0;
-                else if (value > 1.0f)
-                    _lightColorG = 1.0f;
-                else
-                    _lightColorG = value;
+                _lightColorG = value;
             }
         }
 
@@ -748,12 +738,7 @@ namespace OpenSim.Framework
                 return _lightColorB;
             }
             set {
-                if (value < 0)
-                    _lightColorB = 0;
-                else if (value > 1.0f)
-                    _lightColorB = 1.0f;
-                else
-                    _lightColorB = value;
+                _lightColorB = value;
             }
         }
 
@@ -762,12 +747,7 @@ namespace OpenSim.Framework
                 return _lightColorA;
             }
             set {
-                if (value < 0)
-                    _lightColorA = 0;
-                else if (value > 1.0f)
-                    _lightColorA = 1.0f;
-                else
-                    _lightColorA = value;
+                _lightColorA = value;
             }
         }
 
@@ -1430,7 +1410,7 @@ namespace OpenSim.Framework
             prim.Textures = this.Textures;
 
             prim.Properties = new Primitive.ObjectProperties();
-            prim.Properties.Name = "Object";
+            prim.Properties.Name = "Primitive";
             prim.Properties.Description = "";
             prim.Properties.CreatorID = UUID.Zero;
             prim.Properties.GroupID = UUID.Zero;

OpenSim/Framework/RegionInfo.cs

@@ -40,7 +40,6 @@ using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Framework
 {
-    [Serializable]
     public class RegionLightShareData : ICloneable
     {
         public bool valid = false;
@@ -103,7 +102,6 @@ namespace OpenSim.Framework
 
         public bool commFailTF = false;
         public ConfigurationMember configMember;
-        public string DataStore = String.Empty;
         public string RegionFile = String.Empty;
         public bool isSandbox = false;
         public bool Persistent = true;
@@ -645,9 +643,6 @@ namespace OpenSim.Framework
             string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
             config.Set("Location", location);
 
-            if (DataStore != String.Empty)
-                config.Set("Datastore", DataStore);
-
             config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
             config.Set("InternalPort", m_internalEndPoint.Port);
 
@@ -833,9 +828,6 @@ namespace OpenSim.Framework
                 case "sim_location_y":
                     m_regionLocY = (uint) configuration_result;
                     break;
-                case "datastore":
-                    DataStore = (string) configuration_result;
-                    break;
                 case "internal_ip_address":
                     IPAddress address = (IPAddress) configuration_result;
                     m_internalEndPoint = new IPEndPoint(address, 0);
@@ -986,11 +978,6 @@ namespace OpenSim.Framework
             return regionInfo;
         }
 
-        public int getInternalEndPointPort()
-        {
-            return m_internalEndPoint.Port;
-        }
-
         public Dictionary<string, object> ToKeyValuePairs()
         {
             Dictionary<string, object> kvp = new Dictionary<string, object>();
@@ -1009,4 +996,4 @@ namespace OpenSim.Framework
             return kvp;
         }
     }
-}
+}

OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs

@@ -48,9 +48,6 @@ namespace OpenSim.Framework.RegionLoader.Web
 
         public RegionInfo[] LoadRegions()
         {
-            int tries = 3;
-            int wait = 2000;
-
             if (m_configSource == null)
             {
                 m_log.Error("[WEBLOADER]: Unable to load configuration source!");
@@ -69,72 +66,63 @@ namespace OpenSim.Framework.RegionLoader.Web
                 }
                 else
                 {
-					while(tries > 0)
-					{
-						RegionInfo[] regionInfos = new RegionInfo[] {};
-						int regionCount = 0;
-						HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
-						webRequest.Timeout = 30000; //30 Second Timeout
-						m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
+                    RegionInfo[] regionInfos = new RegionInfo[] {};
+                    int regionCount = 0;
+                    HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
+                    webRequest.Timeout = 30000; //30 Second Timeout
+                    m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
 
-						try
-						{
-							HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
-							m_log.Debug("[WEBLOADER]: Downloading region information...");
-							StreamReader reader = new StreamReader(webResponse.GetResponseStream());
-							string xmlSource = String.Empty;
-							string tempStr = reader.ReadLine();
-							while (tempStr != null)
-							{
-								xmlSource = xmlSource + tempStr;
-								tempStr = reader.ReadLine();
-							}
-							m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
-										xmlSource.Length);
-							XmlDocument xmlDoc = new XmlDocument();
-							xmlDoc.LoadXml(xmlSource);
-							if (xmlDoc.FirstChild.Name == "Regions")
-							{
-								regionCount = xmlDoc.FirstChild.ChildNodes.Count;
-		
-								if (regionCount > 0)
-								{
-									regionInfos = new RegionInfo[regionCount];
-									int i;
-									for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
-									{
-										m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
-										regionInfos[i] =
-											new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
-									}
-								}
-							}
-						}
-						catch (WebException ex)
-						{
-							if (((HttpWebResponse)ex.Response).StatusCode == HttpStatusCode.NotFound)
-							{
-								if (!allowRegionless)
-									throw ex;
-							}
-							else
-								throw ex;
-						}
-
-						if (regionCount > 0 | allowRegionless)
-							return regionInfos;
-
-                        m_log.Debug("[WEBLOADER]: Request yielded no regions.");
-                        tries--;
-                        if (tries > 0)
+                    try
+                    {
+                        HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
+                        m_log.Debug("[WEBLOADER]: Downloading region information...");
+                        StreamReader reader = new StreamReader(webResponse.GetResponseStream());
+                        string xmlSource = String.Empty;
+                        string tempStr = reader.ReadLine();
+                        while (tempStr != null)
                         {
-                            m_log.Debug("[WEBLOADER]: Retrying");
-                            System.Threading.Thread.Sleep(wait);
+                            xmlSource = xmlSource + tempStr;
+                            tempStr = reader.ReadLine();
                         }
-					}
+                        m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
+                                    xmlSource.Length);
+                        XmlDocument xmlDoc = new XmlDocument();
+                        xmlDoc.LoadXml(xmlSource);
+                        if (xmlDoc.FirstChild.Name == "Regions")
+                        {
+                            regionCount = xmlDoc.FirstChild.ChildNodes.Count;
+    
+                            if (regionCount > 0)
+                            {
+                                regionInfos = new RegionInfo[regionCount];
+                                int i;
+                                for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
+                                {
+                                    m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
+                                    regionInfos[i] =
+                                        new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
+                                }
+                            }
+                        }
+                    }
+                    catch (WebException ex)
+                    {
+                        if (((HttpWebResponse)ex.Response).StatusCode == HttpStatusCode.NotFound)
+                        {
+                            if (!allowRegionless)
+                                throw ex;
+                        }
+                        else
+                            throw ex;
+                    }
 
-					m_log.Error("[WEBLOADER]: No region configs were available.");
-					return null;
+                    if (regionCount > 0 | allowRegionless)
+                        return regionInfos;
+                    else
+                    {
+                        m_log.Error("[WEBLOADER]: No region configs were available.");
+                        return null;
+                    }
                 }
             }
         }

OpenSim/Framework/RegionSettings.cs

@@ -455,28 +455,6 @@ namespace OpenSim.Framework
             set { m_LoadedCreationID = value; }
         }
 
-        private bool m_GodBlockSearch = false;
-        public bool GodBlockSearch
-        {
-            get { return m_GodBlockSearch; }
-            set { m_GodBlockSearch = value; }
-        }
-
-        private bool m_Casino = false;
-        public bool Casino
-        {
-            get { return m_Casino; }
-            set { m_Casino = value; }
-        }
-
-        // Telehub support
-        private bool m_TelehubEnabled = false;
-        public bool HasTelehub
-        {
-            get { return m_TelehubEnabled; }
-            set { m_TelehubEnabled = value; }
-        }
-
         // Connected Telehub object
         private UUID m_TelehubObject;
         public UUID TelehubObject

OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs

@@ -49,15 +49,16 @@ namespace OpenSim.Framework.Serialization.External
         /// <param name="nodeToFill"></param>
         /// <param name="processors">/param>
         /// <param name="xtr"></param>
-        public static void ExecuteReadProcessors<NodeType>(
+        /// <returns>true on successful, false if there were any processing failures</returns>
+        public static bool ExecuteReadProcessors<NodeType>(
             NodeType nodeToFill, Dictionary<string, Action<NodeType, XmlTextReader>> processors, XmlTextReader xtr)
         {
-            ExecuteReadProcessors(
+            return ExecuteReadProcessors(
                 nodeToFill,
                 processors,
                 xtr,
                 (o, name, e)
-                    => m_log.ErrorFormat(
+                    => m_log.DebugFormat(
                         "[ExternalRepresentationUtils]: Exception while parsing element {0}, continuing.  Exception {1}{2}",
                         name, e.Message, e.StackTrace));
         }
@@ -71,12 +72,15 @@ namespace OpenSim.Framework.Serialization.External
         /// <param name="parseExceptionAction">
         /// Action to take if there is a parsing problem.  This will usually just be to log the exception
         /// </param>
-        public static void ExecuteReadProcessors<NodeType>(
+        /// <returns>true on successful, false if there were any processing failures</returns>
+        public static bool ExecuteReadProcessors<NodeType>(
             NodeType nodeToFill,
             Dictionary<string, Action<NodeType, XmlTextReader>> processors,
             XmlTextReader xtr,
             Action<NodeType, string, Exception> parseExceptionAction)
         {
+            bool errors = false;
+
             string nodeName = string.Empty;
             while (xtr.NodeType != XmlNodeType.EndElement)
             {
@@ -95,6 +99,7 @@ namespace OpenSim.Framework.Serialization.External
                     }
                     catch (Exception e)
                     {
+                        errors = true;
                         parseExceptionAction(nodeToFill, nodeName, e);
 
                         if (xtr.NodeType == XmlNodeType.EndElement)
@@ -107,6 +112,8 @@ namespace OpenSim.Framework.Serialization.External
                     xtr.ReadOuterXml(); // ignore
                 }
             }
+
+            return errors;
         }
 
         /// <summary>
@@ -140,6 +147,7 @@ namespace OpenSim.Framework.Serialization.External
                         UUID.TryParse(node.InnerText, out uuid);
                         creator = userService.GetUserAccount(scopeID, uuid);
                     }
+
                     if (node.Name == "CreatorData" && node.InnerText != null && node.InnerText != string.Empty)
                         hasCreatorData = true;
 
@@ -163,7 +171,6 @@ namespace OpenSim.Framework.Serialization.External
                 doc.Save(wr);
                 return wr.ToString();
             }
-
         }
     }
-}
+}

OpenSim/Framework/Servers/BaseOpenSimServer.cs

@@ -161,43 +161,43 @@ namespace OpenSim.Framework.Servers
                     Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
                 }
                 
-                m_console.Commands.AddCommand("base", false, "quit",
+                m_console.Commands.AddCommand("General", false, "quit",
                         "quit",
                         "Quit the application", HandleQuit);
 
-                m_console.Commands.AddCommand("base", false, "shutdown",
+                m_console.Commands.AddCommand("General", false, "shutdown",
                         "shutdown",
                         "Quit the application", HandleQuit);
 
-                m_console.Commands.AddCommand("base", false, "set log level",
+                m_console.Commands.AddCommand("General", false, "set log level",
                         "set log level <level>",
                         "Set the console logging level", HandleLogLevel);
 
-                m_console.Commands.AddCommand("base", false, "show info",
+                m_console.Commands.AddCommand("General", false, "show info",
                         "show info",
                         "Show general information about the server", HandleShow);
 
-                m_console.Commands.AddCommand("base", false, "show stats",
+                m_console.Commands.AddCommand("General", false, "show stats",
                         "show stats",
                         "Show statistics", HandleShow);
 
-                m_console.Commands.AddCommand("base", false, "show threads",
+                m_console.Commands.AddCommand("General", false, "show threads",
                         "show threads",
                         "Show thread status", HandleShow);
 
-                m_console.Commands.AddCommand("base", false, "show uptime",
+                m_console.Commands.AddCommand("General", false, "show uptime",
                         "show uptime",
                         "Show server uptime", HandleShow);
 
-                m_console.Commands.AddCommand("base", false, "show version",
+                m_console.Commands.AddCommand("General", false, "show version",
                         "show version",
                         "Show server version", HandleShow);
 
-                m_console.Commands.AddCommand("base", false, "threads abort",
+                m_console.Commands.AddCommand("General", false, "threads abort",
                         "threads abort <thread-id>",
                         "Abort a managed thread.  Use \"show threads\" to find possible threads.", HandleThreadsAbort);
 
-                m_console.Commands.AddCommand("base", false, "threads show",
+                m_console.Commands.AddCommand("General", false, "threads show",
                         "threads show",
                         "Show thread status.  Synonym for \"show threads\"",
                         (string module, string[] args) => Notice(GetThreadsReport()));
@@ -247,7 +247,7 @@ namespace OpenSim.Framework.Servers
             string reportFormat = "{0,6}   {1,35}   {2,16}   {3,13}   {4,10}   {5,30}";
 
             StringBuilder sb = new StringBuilder();
-            Watchdog.ThreadWatchdogInfo[] threads = Watchdog.GetThreads();
+            Watchdog.ThreadWatchdogInfo[] threads = Watchdog.GetThreadsInfo();
 
             sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine);
 
@@ -269,15 +269,19 @@ namespace OpenSim.Framework.Servers
                     t.Priority,
                     t.ThreadState);
 
-                sb.Append(Environment.NewLine);
+                sb.Append("\n");
             }
 
-            int workers = 0, ports = 0, maxWorkers = 0, maxPorts = 0;
-            ThreadPool.GetAvailableThreads(out workers, out ports);
-            ThreadPool.GetMaxThreads(out maxWorkers, out maxPorts);
+            sb.Append("\n");
 
-            sb.Append(Environment.NewLine + "*** ThreadPool threads ***"  + Environment.NewLine);
-            sb.Append("workers: " + (maxWorkers - workers) + " (" + maxWorkers + "); ports: " + (maxPorts - ports) + " (" + maxPorts + ")" + Environment.NewLine);
+            // For some reason mono 2.6.7 returns an empty threads set!  Not going to confuse people by reporting
+            // zero active threads.
+            int totalThreads = Process.GetCurrentProcess().Threads.Count;
+            if (totalThreads > 0)
+                sb.AppendFormat("Total threads active: {0}\n\n", totalThreads);
+
+            sb.Append("Main threadpool (excluding script engine pools)\n");
+            sb.Append(Util.GetThreadPoolReport());
 
             return sb.ToString();
         }
@@ -304,11 +308,13 @@ namespace OpenSim.Framework.Servers
 
             EnhanceVersionInformation();
             
-            m_log.Info("[STARTUP]: Careminster version: " + m_version + Environment.NewLine);
+            m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine);
             // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
             // the clr version number doesn't match the project version number under Mono.
             //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
-            m_log.Info("[STARTUP]: Operating system version: " + Environment.OSVersion + Environment.NewLine);
+            m_log.InfoFormat(
+                "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
+                Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
             
             StartupSpecific();
             

OpenSim/Framework/Servers/HttpServer/BaseHTTPHandler.cs

@@ -33,9 +33,9 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         public abstract Hashtable Handle(string path, Hashtable Request);
 
-        protected BaseHTTPHandler(string httpMethod, string path)
-            : base(httpMethod, path)
-        {
-        }
+        protected BaseHTTPHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
+
+        protected BaseHTTPHandler(string httpMethod, string path, string name, string description)
+            : base(httpMethod, path, name, description) {}
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs

@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
-        public List<string>  GetStreamHandlerKeys()
+        public List<string> GetStreamHandlerKeys()
         {
             lock (m_streamHandlers)
                 return new List<string>(m_streamHandlers.Keys);
@@ -356,7 +356,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: OnRequest() failed: {0} ", e.Message), e);
             }
         }
 
@@ -410,6 +410,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 //            string reqnum = "unknown";
             int tickstart = Environment.TickCount;
 
+            IRequestHandler requestHandler = null;
+
             try
             {
                 // OpenSim.Framework.WebUtil.OSHeaderRequestID
@@ -438,8 +440,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                 //response.KeepAlive = true;
                 response.SendChunked = false;
 
-                IRequestHandler requestHandler;
-
                 string path = request.RawUrl;
                 string handlerKey = GetHandlerKey(request.HttpMethod, path);
 
@@ -551,11 +551,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                     catch (SocketException e)
                     {
                         // This has to be here to prevent a Linux/Mono crash
-                        m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                        m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                     }
                     catch (IOException e)
                     {
-                        m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                        m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}. ", e.Message), e);
                     }
 
                     return;
@@ -658,15 +658,15 @@ namespace OpenSim.Framework.Servers.HttpServer
                 //
                 // An alternative may be to turn off all response write exceptions on the HttpListener, but let's go
                 // with the minimum first
-                m_log.WarnFormat("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux", e);
+                m_log.Warn(String.Format("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux ", e.Message), e);
             }
             catch (IOException e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw ", e);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw " + e.ToString());
+                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
                 SendHTML500(response);
             }
             finally
@@ -675,8 +675,16 @@ namespace OpenSim.Framework.Servers.HttpServer
                 // since its just for reporting, tickdiff limit can be adjusted
                 int tickdiff = Environment.TickCount - tickstart;
                 if (tickdiff > 3000)
+                {
                     m_log.InfoFormat(
-                        "[BASE HTTP SERVER]: slow {0} request for {1} from {2} took {3} ms", requestMethod, uriString, request.RemoteIPEndPoint.ToString(), tickdiff);
+                        "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} from {4} took {5}ms",
+                        requestMethod,
+                        uriString,
+                        requestHandler != null ? requestHandler.Name : "",
+                        requestHandler != null ? requestHandler.Description : "",
+                        request.RemoteIPEndPoint.ToString(),
+                        tickdiff);
+                }
             }
         }
 
@@ -925,11 +933,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                         catch (SocketException e)
                         {
                             // This has to be here to prevent a Linux/Mono crash
-                            m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                            m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                         }
                         catch (IOException e)
                         {
-                            m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                            m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                         }
                     }
                     return;
@@ -962,11 +970,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
                 catch (IOException e)
                 {
-                    m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                 }
             }
         }
@@ -1077,12 +1085,12 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 catch (IOException e)
                 {
-                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD IOException {0}.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD IOException {0} ", e.Message), e);
                 }
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
             }
         }
@@ -1334,8 +1342,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                     catch (SocketException f)
                     {
                         // This has to be here to prevent a Linux/Mono crash
-                        m_log.WarnFormat(
-                            "[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", f);
+                        m_log.Warn(
+                            String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", f.Message), f);
                     }
                 }
                 catch(Exception)
@@ -1539,34 +1547,11 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         internal void DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response)
         {
-            int responsecode;
-            string responseString;
-            string contentType;
+            //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
+            int responsecode = (int)responsedata["int_response_code"];
+            string responseString = (string)responsedata["str_response_string"];
+            string contentType = (string)responsedata["content_type"];
 
-            if (responsedata == null)
-            {
-                responsecode = 500;
-                responseString = "No response could be obtained";
-                contentType = "text/plain";
-                responsedata = new Hashtable();
-            }
-            else
-            {
-                try
-                {
-                    //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
-                    responsecode = (int)responsedata["int_response_code"];
-                    responseString = (string)responsedata["str_response_string"];
-                    contentType = (string)responsedata["content_type"];
-                }
-                catch
-                {
-                    responsecode = 500;
-                    responseString = "No response could be obtained";
-                    contentType = "text/plain";
-                    responsedata = new Hashtable();
-                }
-            }
 
             if (responsedata.ContainsKey("error_status_text"))
             {
@@ -1653,11 +1638,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
                 catch (IOException e)
                 {
-                    m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
                 }
             }
         }
@@ -1694,7 +1679,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
             }
         }
@@ -1730,7 +1715,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 catch (SocketException e)
                 {
                     // This has to be here to prevent a Linux/Mono crash
-                    m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    m_log.Warn(String.Format("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
                 }
             }
         }
@@ -1809,7 +1794,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public void httpServerException(object source, Exception exception)
         {
-            m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
+            m_log.Error(String.Format("[BASE HTTP SERVER]: {0} had an exception: {1} ", source.ToString(), exception.Message), exception);
            /*
             if (HTTPDRunning)// && NotSocketErrors > 5)
             {

OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs

@@ -45,8 +45,16 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private readonly string m_path;
 
-        protected BaseRequestHandler(string httpMethod, string path)
+        public string Name { get; private set; }
+
+        public string Description { get; private set; }
+
+        protected BaseRequestHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
+
+        protected BaseRequestHandler(string httpMethod, string path, string name, string description)
         {
+            Name = name;
+            Description = description;
             m_httpMethod = httpMethod;
             m_path = path;
         }

OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs

@@ -34,8 +34,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         public abstract byte[] Handle(string path, Stream request,
                                       IOSHttpRequest httpRequest, IOSHttpResponse httpResponse);
 
-        protected BaseStreamHandler(string httpMethod, string path) : base(httpMethod, path)
-        {
-        }
+        protected BaseStreamHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
+
+        protected BaseStreamHandler(string httpMethod, string path, string name, string description)
+            : base(httpMethod, path, name, description) {}
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs

@@ -36,6 +36,15 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         private BinaryMethod m_method;
 
+        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod)
+            : this(httpMethod, path, binaryMethod, null, null) {}
+
+        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod, string name, string description)
+            : base(httpMethod, path, name, description)
+        {
+            m_method = binaryMethod;
+        }
+
         public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             byte[] data = ReadFully(request);
@@ -45,12 +54,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             return Encoding.UTF8.GetBytes(responseString);
         }
 
-        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod)
-            : base(httpMethod, path)
-        {
-            m_method = binaryMethod;
-        }
-
         private static byte[] ReadFully(Stream stream)
         {
             byte[] buffer = new byte[1024];
@@ -70,4 +73,4 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs

@@ -32,6 +32,25 @@ namespace OpenSim.Framework.Servers.HttpServer
 {
     public interface IRequestHandler
     {
+
+        /// <summary>
+        /// Name for this handler.
+        /// </summary>
+        /// <remarks>
+        /// Used for diagnostics.  The path doesn't always describe what the handler does.  Can be null if none
+        /// specified.
+        /// </remarks>
+        string Name { get; }
+
+        /// <summary>
+        /// Description for this handler.
+        /// </summary>
+        /// <remarks>
+        /// Used for diagnostics.  The path doesn't always describe what the handler does.  Can be null if none
+        /// specified.
+        /// </remarks>
+        string Description { get; }
+
         // Return response content type
         string ContentType { get; }
 
@@ -58,4 +77,4 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         Hashtable Handle(string path, Hashtable request);
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs

@@ -65,6 +65,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         String.Format("PollServiceWorkerThread{0}", i),
                         ThreadPriority.Normal,
                         false,
+                        true,
                         int.MaxValue);
             }
 
@@ -73,6 +74,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 "PollServiceWatcherThread",
                 ThreadPriority.Normal,
                 false,
+                true,
                 1000 * 60 * 10);
         }
 

OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs

@@ -39,7 +39,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         private RestDeserialiseMethod<TRequest, TResponse> m_method;
 
         public RestDeserialiseHandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method)
-            : base(httpMethod, path)
+            : this(httpMethod, path, method, null, null) {}
+
+        public RestDeserialiseHandler(
+            string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method, string name, string description)
+            : base(httpMethod, path, name, description)
         {
             m_method = method;
         }

OpenSim/Framework/Servers/HttpServer/RestHTTPHandler.cs

@@ -38,19 +38,25 @@ namespace OpenSim.Framework.Servers.HttpServer
             get { return m_dhttpMethod; }
         }
 
-        public override Hashtable Handle(string path, Hashtable request)
-        {
-
-            string param = GetParam(path);
-            request.Add("param", param);
-            request.Add("path", path);
-            return m_dhttpMethod(request);
-        }
-
         public RestHTTPHandler(string httpMethod, string path, GenericHTTPMethod dhttpMethod)
             : base(httpMethod, path)
         {
             m_dhttpMethod = dhttpMethod;
         }
+
+        public RestHTTPHandler(
+            string httpMethod, string path, GenericHTTPMethod dhttpMethod, string name, string description)
+            : base(httpMethod, path, name, description)
+        {
+            m_dhttpMethod = dhttpMethod;
+        }
+
+        public override Hashtable Handle(string path, Hashtable request)
+        {
+            string param = GetParam(path);
+            request.Add("param", param);
+            request.Add("path", path);
+            return m_dhttpMethod(request);
+        }
     }
 }

OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs

@@ -39,6 +39,15 @@ namespace OpenSim.Framework.Servers.HttpServer
             get { return m_restMethod; }
         }
 
+        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod)
+            : this(httpMethod, path, restMethod, null, null) {}
+
+        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod, string name, string description)
+            : base(httpMethod, path, name, description)
+        {
+            m_restMethod = restMethod;
+        }
+
         public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             Encoding encoding = Encoding.UTF8;
@@ -52,10 +61,5 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             return Encoding.UTF8.GetBytes(responseString);
         }
-
-        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod) : base(httpMethod, path)
-        {
-            m_restMethod = restMethod;
-        }
     }
 }

OpenSim/Framework/Servers/VersionInfo.cs

@@ -29,17 +29,18 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.7.3CM";
-        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
+        private const string VERSION_NUMBER = "0.7.3";
+        private const Flavour VERSION_FLAVOUR = Flavour.Extended;
 
         public enum Flavour
-        { 
+        {
             Unknown,
             Dev,
             RC1,
             RC2,
             Release,
-            Post_Fixes
+            Post_Fixes,
+            Extended
         }
 
         public static string Version
@@ -49,7 +50,7 @@ namespace OpenSim
 
         public static string GetVersionString(string versionNumber, Flavour flavour)
         {
-            string versionString = "Careminster " + versionNumber + " " + flavour;
+            string versionString = "OpenSim " + versionNumber + " " + flavour;
             return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
         }
 

OpenSim/Framework/Statistics/BaseStatsCollector.cs

@@ -26,8 +26,8 @@
  */
 
 using System;
+using System.Diagnostics;
 using System.Text;
-
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
@@ -46,8 +46,12 @@ namespace OpenSim.Framework.Statistics
             sb.Append(Environment.NewLine);
             sb.Append(
                 string.Format(
-                    "Allocated to OpenSim : {0} MB" + Environment.NewLine,
+                    "Allocated to OpenSim objects: {0} MB\n",
                     Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0)));
+            sb.Append(
+                string.Format(
+                    "Process memory              : {0} MB\n",
+                    Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0)));
 
             return sb.ToString();
         }

OpenSim/Framework/TaskInventoryDictionary.cs

@@ -27,13 +27,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading;
-using System.Reflection;
 using System.Xml;
-using System.Diagnostics;
 using System.Xml.Schema;
 using System.Xml.Serialization;
-using log4net;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
@@ -49,155 +45,6 @@ namespace OpenSim.Framework
         // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        private Thread LockedByThread;
-        private string WriterStack;
-
-        private Dictionary<Thread, string> ReadLockers =
-                new Dictionary<Thread, string>();
-
-        /// <value>
-        /// An advanced lock for inventory data
-        /// </value>
-        private System.Threading.ReaderWriterLockSlim m_itemLock = new System.Threading.ReaderWriterLockSlim();
-
-        /// <summary>
-        /// Are we readlocked by the calling thread?
-        /// </summary>
-        public bool IsReadLockedByMe()
-        {
-            if (m_itemLock.RecursiveReadCount > 0)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Lock our inventory list for reading (many can read, one can write)
-        /// </summary>
-        public void LockItemsForRead(bool locked)
-        {
-            if (locked)
-            {
-                if (m_itemLock.IsWriteLockHeld && LockedByThread != null)
-                {
-                    if (!LockedByThread.IsAlive)
-                    {
-                        //Locked by dead thread, reset.
-                        m_itemLock = new System.Threading.ReaderWriterLockSlim(); 
-                    }
-                }
-
-                if (m_itemLock.RecursiveReadCount > 0)
-                {
-                    m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
-                    try
-                    {
-                        StackTrace stackTrace = new StackTrace();           // get call stack
-                        StackFrame[] stackFrames = stackTrace.GetFrames();  // get method calls (frames)
-
-                        // write call stack method names
-                        foreach (StackFrame stackFrame in stackFrames)
-                        {
-                            m_log.Error("[SceneObjectGroup.m_parts]  "+(stackFrame.GetMethod().Name));   // write method name
-                        }
-                    }
-                    catch
-                    {}
-                    m_itemLock.ExitReadLock();
-                }
-                if (m_itemLock.RecursiveWriteCount > 0)
-                {
-                    m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
-                    m_itemLock.ExitWriteLock();
-                }
-                
-                while (!m_itemLock.TryEnterReadLock(60000))
-                {
-                    m_log.Error("Thread lock detected while trying to aquire READ lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
-                    if (m_itemLock.IsWriteLockHeld)
-                    {
-                        m_itemLock = new System.Threading.ReaderWriterLockSlim();
-                        System.Console.WriteLine("------------------------------------------");
-                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
-                        System.Console.WriteLine("------------------------------------------");
-                        System.Console.WriteLine("Locker's call stack:\n" + WriterStack);
-                        System.Console.WriteLine("------------------------------------------");
-                        LockedByThread = null;
-                        ReadLockers.Clear();
-                    }
-                }
-            }
-            else
-            {
-                if (m_itemLock.RecursiveReadCount>0)
-                {
-                    m_itemLock.ExitReadLock();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Lock our inventory list for writing (many can read, one can write)
-        /// </summary>
-        public void LockItemsForWrite(bool locked)
-        {
-            if (locked)
-            {
-                //Enter a write lock, wait indefinately for one to open.
-                if (m_itemLock.RecursiveReadCount > 0)
-                {
-                    m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
-                    m_itemLock.ExitReadLock();
-                }
-                if (m_itemLock.RecursiveWriteCount > 0)
-                {
-                    m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
-                    m_itemLock.ExitWriteLock();
-                }
-                while (!m_itemLock.TryEnterWriteLock(60000))
-                {
-                    if (m_itemLock.IsWriteLockHeld)
-                    {
-                        m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
-                        System.Console.WriteLine("------------------------------------------");
-                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
-                        System.Console.WriteLine("------------------------------------------");
-                        System.Console.WriteLine("Locker's call stack:\n" + WriterStack);
-                        System.Console.WriteLine("------------------------------------------");
-                    }
-                    else
-                    {
-                        m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by a reader. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
-                        System.Console.WriteLine("------------------------------------------");
-                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
-                        System.Console.WriteLine("------------------------------------------");
-                        foreach (KeyValuePair<Thread, string> kvp in ReadLockers)
-                        {
-                            System.Console.WriteLine("Locker name {0} call stack:\n" + kvp.Value, kvp.Key.Name);
-                            System.Console.WriteLine("------------------------------------------");
-                        }
-                    }
-                    m_itemLock = new System.Threading.ReaderWriterLockSlim();
-                    ReadLockers.Clear();
-                }
-
-                LockedByThread = Thread.CurrentThread;
-                WriterStack = Environment.StackTrace;
-            }
-            else
-            {
-                if (m_itemLock.RecursiveWriteCount > 0)
-                {
-                    m_itemLock.ExitWriteLock();
-                }
-            }
-        }
 
         #region ICloneable Members
 
@@ -205,13 +52,14 @@ namespace OpenSim.Framework
         {
             TaskInventoryDictionary clone = new TaskInventoryDictionary();
 
-            m_itemLock.EnterReadLock();
-            foreach (UUID uuid in Keys)
+            lock (this)
             {
-                clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
+                foreach (UUID uuid in Keys)
+                {
+                    clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
+                }
             }
-            m_itemLock.ExitReadLock();
-
+            
             return clone;
         }
 

OpenSim/Framework/TaskInventoryItem.cs

@@ -68,9 +68,6 @@ namespace OpenSim.Framework
         private UUID _loadedID = UUID.Zero;
 
         private bool _ownerChanged = false;
-        
-        // This used ONLY during copy. It can't be relied on at other times!
-        private bool _scriptRunning = true;
 
         public UUID AssetID {
             get {
@@ -343,15 +340,6 @@ namespace OpenSim.Framework
             }
         }
 
-        public bool ScriptRunning {
-            get {
-                return _scriptRunning;
-            }
-            set {
-                _scriptRunning = value;
-            }
-        }
-
         // See ICloneable
 
         #region ICloneable Members

OpenSim/Framework/Tests/MundaneFrameworkTests.cs

@@ -217,12 +217,12 @@ namespace OpenSim.Framework.Tests
                               BannedHostNameMask = string.Empty,
                               BannedUserID = bannedUserId}
                           );
-            Assert.IsTrue(es.IsBanned(bannedUserId, 32), "User Should be banned but is not.");
-            Assert.IsFalse(es.IsBanned(UUID.Zero, 32), "User Should not be banned but is.");
+            Assert.IsTrue(es.IsBanned(bannedUserId), "User Should be banned but is not.");
+            Assert.IsFalse(es.IsBanned(UUID.Zero), "User Should not be banned but is.");
 
             es.RemoveBan(bannedUserId);
 
-            Assert.IsFalse(es.IsBanned(bannedUserId, 32), "User Should not be banned but is.");
+            Assert.IsFalse(es.IsBanned(bannedUserId), "User Should not be banned but is.");
 
             es.AddEstateManager(UUID.Zero);
 

OpenSim/Framework/Util.cs

@@ -35,7 +35,8 @@ using System.IO;
 using System.IO.Compression;
 using System.Net;
 using System.Net.Sockets;
-using System.Reflection;
+using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Security.Cryptography;
@@ -80,12 +81,15 @@ namespace OpenSim.Framework
 
         private static uint nextXferID = 5000;
         private static Random randomClass = new Random();
+
         // Get a list of invalid file characters (OS dependent)
         private static string regexInvalidFileChars = "[" + new String(Path.GetInvalidFileNameChars()) + "]";
         private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]";
         private static object XferLock = new object();
-        /// <summary>Thread pool used for Util.FireAndForget if
-        /// FireAndForgetMethod.SmartThreadPool is used</summary>
+
+        /// <summary>
+        /// Thread pool used for Util.FireAndForget if FireAndForgetMethod.SmartThreadPool is used
+        /// </summary>
         private static SmartThreadPool m_ThreadPool;
 
         // Unix-epoch starts at January 1st 1970, 00:00:00 UTC. And all our times in the server are (or at least should be) in UTC.
@@ -143,7 +147,6 @@ namespace OpenSim.Framework
             return lerp(y, lerp(x, a, b), lerp(x, c, d));
         }
 
-
         public static Encoding UTF8 = Encoding.UTF8;
 
         /// <value>
@@ -375,6 +378,50 @@ namespace OpenSim.Framework
             }
 
             return sb.ToString();
+        }
+
+        /// <summary>
+        /// Is the platform Windows?
+        /// </summary>
+        /// <returns>true if so, false otherwise</returns>
+        public static bool IsWindows()
+        {
+            PlatformID platformId = Environment.OSVersion.Platform;
+
+            return (platformId == PlatformID.Win32NT
+                || platformId == PlatformID.Win32S
+                || platformId == PlatformID.Win32Windows
+                || platformId == PlatformID.WinCE);
+        }
+
+        public static bool LoadArchSpecificWindowsDll(string libraryName)
+        {
+            // We do this so that OpenSimulator on Windows loads the correct native library depending on whether
+            // it's running as a 32-bit process or a 64-bit one.  By invoking LoadLibary here, later DLLImports
+            // will find it already loaded later on.
+            //
+            // This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
+            // controlled in config files.
+            string nativeLibraryPath;
+
+            if (Util.Is64BitProcess())
+                nativeLibraryPath = "lib64/" + libraryName;
+            else
+                nativeLibraryPath = "lib32/" + libraryName;
+
+            m_log.DebugFormat("[UTIL]: Loading native Windows library at {0}", nativeLibraryPath);
+
+            if (Util.LoadLibrary(nativeLibraryPath) == IntPtr.Zero)
+            {
+                m_log.ErrorFormat(
+                    "[UTIL]: Couldn't find native Windows library at {0}", nativeLibraryPath);
+
+                return false;
+            }
+            else
+            {
+                return true;
+            }
         }
 
         public static bool IsEnvironmentSupported(ref string reason)
@@ -433,25 +480,19 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="data"></param>
         /// <returns></returns>
-
         public static string Md5Hash(string data)
         {
-            return Md5Hash(data, Encoding.Default);
-        }
-
-        public static string Md5Hash(string data, Encoding encoding)
-        {
-            byte[] dataMd5 = ComputeMD5Hash(data, encoding);
+            byte[] dataMd5 = ComputeMD5Hash(data);
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < dataMd5.Length; i++)
                 sb.AppendFormat("{0:x2}", dataMd5[i]);
             return sb.ToString();
         }
 
-        private static byte[] ComputeMD5Hash(string data, Encoding encoding)
+        private static byte[] ComputeMD5Hash(string data)
         {
             MD5 md5 = MD5.Create();
-            return md5.ComputeHash(encoding.GetBytes(data));
+            return md5.ComputeHash(Encoding.Default.GetBytes(data));
         }
 
         /// <summary>
@@ -459,12 +500,6 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="data"></param>
         /// <returns></returns>
-
-        public static string SHA1Hash(string data, Encoding enc)
-        {
-            return SHA1Hash(enc.GetBytes(data));
-        }
-
         public static string SHA1Hash(string data)
         {
             return SHA1Hash(Encoding.Default.GetBytes(data));
@@ -1069,19 +1104,19 @@ namespace OpenSim.Framework
         {
             string os = String.Empty;
 
-//            if (Environment.OSVersion.Platform != PlatformID.Unix)
-//            {
-//                os = Environment.OSVersion.ToString();
-//            }
-//            else
-//            {
-//                os = ReadEtcIssue();
-//            }
-//                      
-//            if (os.Length > 45)
-//            {
-//                os = os.Substring(0, 45);
-//            }
+            if (Environment.OSVersion.Platform != PlatformID.Unix)
+            {
+                os = Environment.OSVersion.ToString();
+            }
+            else
+            {
+                os = ReadEtcIssue();
+            }
+                      
+            if (os.Length > 45)
+            {
+                os = os.Substring(0, 45);
+            }
             
             return os;
         }
@@ -1214,7 +1249,7 @@ namespace OpenSim.Framework
 
         public static Guid GetHashGuid(string data, string salt)
         {
-            byte[] hash = ComputeMD5Hash(data + salt, Encoding.Default);
+            byte[] hash = ComputeMD5Hash(data + salt);
 
             //string s = BitConverter.ToString(hash);
 
@@ -1469,6 +1504,27 @@ namespace OpenSim.Framework
             }
 
             return data;
+        }
+
+        /// <summary>
+        /// Used to trigger an early library load on Windows systems.
+        /// </summary>
+        /// <remarks>
+        /// Required to get 32-bit and 64-bit processes to automatically use the
+        /// appropriate native library.
+        /// </remarks>
+        /// <param name="dllToLoad"></param>
+        /// <returns></returns>
+        [DllImport("kernel32.dll")]
+        public static extern IntPtr LoadLibrary(string dllToLoad);
+
+        /// <summary>
+        /// Determine whether the current process is 64 bit
+        /// </summary>
+        /// <returns>true if so, false if not</returns>
+        public static bool Is64BitProcess()
+        {
+            return IntPtr.Size == 8;
         }
 
         #region FireAndForget Threading Pattern
@@ -1617,6 +1673,61 @@ namespace OpenSim.Framework
             }
         }
 
+        /// <summary>
+        /// Get a thread pool report.
+        /// </summary>
+        /// <returns></returns>
+        public static string GetThreadPoolReport()
+        {
+            string threadPoolUsed = null;
+            int maxThreads = 0;
+            int minThreads = 0;
+            int allocatedThreads = 0;
+            int inUseThreads = 0;
+            int waitingCallbacks = 0;
+            int completionPortThreads = 0;
+
+            StringBuilder sb = new StringBuilder();
+            if (FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)
+            {
+                threadPoolUsed = "SmartThreadPool";
+                maxThreads = m_ThreadPool.MaxThreads;
+                minThreads = m_ThreadPool.MinThreads;
+                inUseThreads = m_ThreadPool.InUseThreads;
+                allocatedThreads = m_ThreadPool.ActiveThreads;
+                waitingCallbacks = m_ThreadPool.WaitingCallbacks;
+            }
+            else if (
+                FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem
+                    || FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem)
+            {
+                threadPoolUsed = "BuiltInThreadPool";
+                ThreadPool.GetMaxThreads(out maxThreads, out completionPortThreads);
+                ThreadPool.GetMinThreads(out minThreads, out completionPortThreads);
+                int availableThreads;
+                ThreadPool.GetAvailableThreads(out availableThreads, out completionPortThreads);
+                inUseThreads = maxThreads - availableThreads;
+                allocatedThreads = -1;
+                waitingCallbacks = -1;
+            }
+
+            if (threadPoolUsed != null)
+            {
+                sb.AppendFormat("Thread pool used           : {0}\n", threadPoolUsed);
+                sb.AppendFormat("Max threads                : {0}\n", maxThreads);
+                sb.AppendFormat("Min threads                : {0}\n", minThreads);
+                sb.AppendFormat("Allocated threads          : {0}\n", allocatedThreads < 0 ? "not applicable" : allocatedThreads.ToString());
+                sb.AppendFormat("In use threads             : {0}\n", inUseThreads);
+                sb.AppendFormat("Work items waiting         : {0}\n", waitingCallbacks < 0 ? "not available" : waitingCallbacks.ToString());
+            }
+            else
+            {
+                sb.AppendFormat("Thread pool not used\n");
+            }
+
+            return sb.ToString();
+        }
+
         private static object SmartThreadPoolCallback(object o)
         {
             object[] array = (object[])o;
@@ -1642,6 +1753,20 @@ namespace OpenSim.Framework
         }
         const Int32 EnvironmentTickCountMask = 0x3fffffff;
 
+        /// <summary>
+        /// Environment.TickCount is an int but it counts all 32 bits so it goes positive
+        /// and negative every 24.9 days. Subtracts the passed value (previously fetched by
+        /// 'EnvironmentTickCount()') and accounts for any wrapping.
+        /// </summary>
+        /// <param name="newValue"></param>
+        /// <param name="prevValue"></param>
+        /// <returns>subtraction of passed prevValue from current Environment.TickCount</returns>
+        public static Int32 EnvironmentTickCountSubtract(Int32 newValue, Int32 prevValue)
+        {
+            Int32 diff = newValue - prevValue;
+            return (diff >= 0) ? diff : (diff + EnvironmentTickCountMask + 1);
+        }
+
         /// <summary>
         /// Environment.TickCount is an int but it counts all 32 bits so it goes positive
         /// and negative every 24.9 days. Subtracts the passed value (previously fetched by
@@ -1650,8 +1775,7 @@ namespace OpenSim.Framework
         /// <returns>subtraction of passed prevValue from current Environment.TickCount</returns>
         public static Int32 EnvironmentTickCountSubtract(Int32 prevValue)
         {
-            Int32 diff = EnvironmentTickCount() - prevValue;
-            return (diff >= 0) ? diff : (diff + EnvironmentTickCountMask + 1);
+            return EnvironmentTickCountSubtract(EnvironmentTickCount(), prevValue);
         }
 
         // Returns value of Tick Count A - TickCount B accounting for wrapping of TickCount

OpenSim/Framework/Watchdog.cs

@@ -72,6 +72,11 @@ namespace OpenSim.Framework
             /// </summary>
             public bool IsTimedOut { get; set; }
 
+            /// <summary>
+            /// Will this thread trigger the alarm function if it has timed out?
+            /// </summary>
+            public bool AlarmIfTimeout { get; set; }
+
             public ThreadWatchdogInfo(Thread thread, int timeout)
             {
                 Thread = thread;
@@ -112,12 +117,13 @@ namespace OpenSim.Framework
         /// <param name="start">The method that will be executed in a new thread</param>
         /// <param name="name">A name to give to the new thread</param>
         /// <param name="priority">Priority to run the thread at</param>
-        /// <param name="isBackground">True to run this thread as a background
-        /// thread, otherwise false</param>
+        /// <param name="isBackground">True to run this thread as a background thread, otherwise false</param>
+        /// <param name="alarmIfTimeout">Trigger an alarm function is we have timed out</param>
         /// <returns>The newly created Thread object</returns>
-        public static Thread StartThread(ThreadStart start, string name, ThreadPriority priority, bool isBackground)
+        public static Thread StartThread(
+            ThreadStart start, string name, ThreadPriority priority, bool isBackground, bool alarmIfTimeout)
         {
-            return StartThread(start, name, priority, isBackground, WATCHDOG_TIMEOUT_MS);
+            return StartThread(start, name, priority, isBackground, alarmIfTimeout, WATCHDOG_TIMEOUT_MS);
         }
 
         /// <summary>
@@ -128,21 +134,21 @@ namespace OpenSim.Framework
         /// <param name="priority">Priority to run the thread at</param>
         /// <param name="isBackground">True to run this thread as a background
         /// thread, otherwise false</param>
-        /// <param name="timeout">
-        /// Number of milliseconds to wait until we issue a warning about timeout.
-        /// </para>
+        /// <param name="alarmIfTimeout">Trigger an alarm function is we have timed out</param>
+        /// <param name="timeout">Number of milliseconds to wait until we issue a warning about timeout.</param>
         /// <returns>The newly created Thread object</returns>
         public static Thread StartThread(
-            ThreadStart start, string name, ThreadPriority priority, bool isBackground, int timeout)
+            ThreadStart start, string name, ThreadPriority priority, bool isBackground, bool alarmIfTimeout, int timeout)
         {
             Thread thread = new Thread(start);
             thread.Name = name;
             thread.Priority = priority;
             thread.IsBackground = isBackground;
             
-            ThreadWatchdogInfo twi = new ThreadWatchdogInfo(thread, timeout);
+            ThreadWatchdogInfo twi = new ThreadWatchdogInfo(thread, timeout) { AlarmIfTimeout = alarmIfTimeout };
 
-            m_log.Debug("[WATCHDOG]: Started tracking thread \"" + twi.Thread.Name + "\" (ID " + twi.Thread.ManagedThreadId + ")");
+            m_log.DebugFormat(
+                "[WATCHDOG]: Started tracking thread {0}, ID {1}", twi.Thread.Name, twi.Thread.ManagedThreadId);
 
             lock (m_threads)
                 m_threads.Add(twi.Thread.ManagedThreadId, twi);
@@ -224,46 +230,76 @@ namespace OpenSim.Framework
         /// Get currently watched threads for diagnostic purposes
         /// </summary>
         /// <returns></returns>
-        public static ThreadWatchdogInfo[] GetThreads()
+        public static ThreadWatchdogInfo[] GetThreadsInfo()
         {
             lock (m_threads)
                 return m_threads.Values.ToArray();
         }
 
+        /// <summary>
+        /// Return the current thread's watchdog info.
+        /// </summary>
+        /// <returns>The watchdog info.  null if the thread isn't being monitored.</returns>
+        public static ThreadWatchdogInfo GetCurrentThreadInfo()
+        {
+            lock (m_threads)
+            {
+                if (m_threads.ContainsKey(Thread.CurrentThread.ManagedThreadId))
+                    return m_threads[Thread.CurrentThread.ManagedThreadId];
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Check watched threads.  Fire alarm if appropriate.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private static void WatchdogTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
             WatchdogTimeout callback = OnWatchdogTimeout;
 
             if (callback != null)
             {
-                ThreadWatchdogInfo timedOut = null;
+                List<ThreadWatchdogInfo> callbackInfos = null;
 
                 lock (m_threads)
                 {
-                    int now = Environment.TickCount;
+                    int now = Environment.TickCount & Int32.MaxValue;
 
                     foreach (ThreadWatchdogInfo threadInfo in m_threads.Values)
                     {
                         if (threadInfo.Thread.ThreadState == ThreadState.Stopped)
                         {
-                            timedOut = threadInfo;
                             RemoveThread(threadInfo.Thread.ManagedThreadId);
-                            break;
+
+                            if (callbackInfos == null)
+                                callbackInfos = new List<ThreadWatchdogInfo>();
+
+                            callbackInfos.Add(threadInfo);
                         }
                         else if (!threadInfo.IsTimedOut && now - threadInfo.LastTick >= threadInfo.Timeout)
                         {
                             threadInfo.IsTimedOut = true;
-                            timedOut = threadInfo;
-                            break;
+
+                            if (threadInfo.AlarmIfTimeout)
+                            {
+                                if (callbackInfos == null)
+                                    callbackInfos = new List<ThreadWatchdogInfo>();
+
+                                callbackInfos.Add(threadInfo);
+                            }
                         }
                     }
                 }
 
-                if (timedOut != null)
-                    callback(timedOut.Thread, timedOut.LastTick);
+                if (callbackInfos != null)
+                    foreach (ThreadWatchdogInfo callbackInfo in callbackInfos)
+                        callback(callbackInfo.Thread, callbackInfo.LastTick);
             }
 
             m_watchdogTimer.Start();
         }
     }
-}
+}

OpenSim/Framework/WebUtil.cs

@@ -53,45 +53,36 @@ namespace OpenSim.Framework
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static int m_requestNumber = 0;
+        /// <summary>
+        /// Request number for diagnostic purposes.
+        /// </summary>
+        public static int RequestNumber = 0;
 
-        // this is the header field used to communicate the local request id
-        // used for performance and debugging
+        /// <summary>
+        /// this is the header field used to communicate the local request id
+        /// used for performance and debugging
+        /// </summary>
         public const string OSHeaderRequestID = "opensim-request-id";
 
-        // number of milliseconds a call can take before it is considered
-        // a "long" call for warning & debugging purposes
-        public const int LongCallTime = 500;
+        /// <summary>
+        /// Number of milliseconds a call can take before it is considered
+        /// a "long" call for warning & debugging purposes
+        /// </summary>
+        public const int LongCallTime = 3000;
 
-//        /// <summary>
-//        /// Send LLSD to an HTTP client in application/llsd+json form
-//        /// </summary>
-//        /// <param name="response">HTTP response to send the data in</param>
-//        /// <param name="body">LLSD to send to the client</param>
-//        public static void SendJSONResponse(OSHttpResponse response, OSDMap body)
-//        {
-//            byte[] responseData = Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(body));
-//
-//            response.ContentEncoding = Encoding.UTF8;
-//            response.ContentLength = responseData.Length;
-//            response.ContentType = "application/llsd+json";
-//            response.Body.Write(responseData, 0, responseData.Length);
-//        }
-//
-//        /// <summary>
-//        /// Send LLSD to an HTTP client in application/llsd+xml form
-//        /// </summary>
-//        /// <param name="response">HTTP response to send the data in</param>
-//        /// <param name="body">LLSD to send to the client</param>
-//        public static void SendXMLResponse(OSHttpResponse response, OSDMap body)
-//        {
-//            byte[] responseData = OSDParser.SerializeLLSDXmlBytes(body);
-//
-//            response.ContentEncoding = Encoding.UTF8;
-//            response.ContentLength = responseData.Length;
-//            response.ContentType = "application/llsd+xml";
-//            response.Body.Write(responseData, 0, responseData.Length);
-//        }
+        /// <summary>
+        /// The maximum length of any data logged because of a long request time.
+        /// </summary>
+        /// <remarks>
+        /// This is to truncate any really large post data, such as an asset.  In theory, the first section should
+        /// give us useful information about the call (which agent it relates to if applicable, etc.).
+        /// </remarks>
+        public const int MaxRequestDiagLength = 100;
+
+        /// <summary>
+        /// Dictionary of end points
+        /// </summary>
+        private static Dictionary<string,object> m_endpointSerializer = new Dictionary<string,object>();
 
         /// <summary>
         /// Make a GET or GET-like request to a web service that returns LLSD
@@ -166,12 +157,14 @@ namespace OpenSim.Framework
         
         public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout, bool compressed)
         {
-            int reqnum = m_requestNumber++;
+            int reqnum = RequestNumber++;
+
             // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
 
             string errorMessage = "unknown error";
             int tickstart = Util.EnvironmentTickCount();
             int tickdata = 0;
+            string strBuffer = null;
 
             try
             {
@@ -186,7 +179,7 @@ namespace OpenSim.Framework
                 // If there is some input, write it into the request
                 if (data != null)
                 {
-                    string strBuffer =  OSDParser.SerializeJsonString(data);
+                    strBuffer =  OSDParser.SerializeJsonString(data);
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
 
                     if (compressed)
@@ -243,18 +236,26 @@ namespace OpenSim.Framework
             catch (Exception ex)
             {
                 errorMessage = ex.Message;
-                m_log.Debug("[WEB UTIL]: Exception making request: " + ex.ToString());
             }
             finally
             {
-                // This just dumps a warning for any operation that takes more than 100 ms
                 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
                 if (tickdiff > LongCallTime)
-                    m_log.DebugFormat("[WEB UTIL]: osd request <{0}> (URI:{1}, METHOD:{2}) took {3}ms overall, {4}ms writing",
-                                     reqnum,url,method,tickdiff,tickdata);
+                    m_log.InfoFormat(
+                        "[OSD REQUEST]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                        reqnum,
+                        method,
+                        url,
+                        tickdiff,
+                        tickdata,
+                        strBuffer != null
+                            ? (strBuffer.Length > MaxRequestDiagLength ? strBuffer.Remove(MaxRequestDiagLength) : strBuffer)
+                            : "");
             }
            
-	        m_log.DebugFormat("[WEB UTIL]: <{0}> osd request for {1}, method {2} FAILED: {3}", reqnum, url, method, errorMessage); 
+            m_log.DebugFormat(
+                "[WEB UTIL]: <{0}> osd request for {1}, method {2} FAILED: {3}", reqnum, url, method, errorMessage);
+
             return ErrorResponseMap(errorMessage);
         }
 
@@ -310,22 +311,22 @@ namespace OpenSim.Framework
         /// </summary>
         public static OSDMap PostToService(string url, NameValueCollection data)
         {
-            return ServiceFormRequest(url,data, 20000);
+            return ServiceFormRequest(url,data,10000);
         }
         
         public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
         {
-            int reqnum = m_requestNumber++;
+            int reqnum = RequestNumber++;
             string method = (data != null && data["RequestMethod"] != null) ? data["RequestMethod"] : "unknown";
             // m_log.DebugFormat("[WEB UTIL]: <{0}> start form request for {1}, method {2}",reqnum,url,method);
             
             string errorMessage = "unknown error";
             int tickstart = Util.EnvironmentTickCount();
             int tickdata = 0;
+            string queryString = null;
 
             try
             {
-                
                 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
                 request.Method = "POST";
                 request.Timeout = timeout;
@@ -336,7 +337,7 @@ namespace OpenSim.Framework
                 
                 if (data != null)
                 {
-                    string queryString = BuildQueryString(data);
+                    queryString = BuildQueryString(data);
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(queryString);
                     
                     request.ContentLength = buffer.Length;
@@ -379,11 +380,20 @@ namespace OpenSim.Framework
             {
                 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
                 if (tickdiff > LongCallTime)
-                    m_log.InfoFormat("[WEB UTIL]: form request <{0}> (URI:{1}, METHOD:{2}) took {3}ms overall, {4}ms writing",
-                                     reqnum,url,method,tickdiff,tickdata);
+                    m_log.InfoFormat(
+                        "[SERVICE FORM]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                        reqnum,
+                        method,
+                        url,
+                        tickdiff,
+                        tickdata,
+                        queryString != null
+                            ? (queryString.Length > MaxRequestDiagLength) ? queryString.Remove(MaxRequestDiagLength) : queryString
+                            : "");
             }
 
-            m_log.WarnFormat("[WEB UTIL]: <{0}> form request failed: {1}",reqnum,errorMessage);
+            m_log.WarnFormat("[SERVICE FORM]: <{0}> form request to {1} failed: {2}", reqnum, url, errorMessage);
+
             return ErrorResponseMap(errorMessage);
         }
 
@@ -656,8 +666,6 @@ namespace OpenSim.Framework
 
             return new string[0];
         }
-
-
     }
 
     public static class AsynchronousRestObjectRequester
@@ -680,6 +688,12 @@ namespace OpenSim.Framework
         public static void MakeRequest<TRequest, TResponse>(string verb,
                 string requestUrl, TRequest obj, Action<TResponse> action)
         {
+            int reqnum = WebUtil.RequestNumber++;
+            // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+
+            int tickstart = Util.EnvironmentTickCount();
+            int tickdata = 0;
+
             //            m_log.DebugFormat("[ASYNC REQUEST]: Starting {0} {1}", verb, requestUrl);
 
             Type type = typeof(TRequest);
@@ -690,12 +704,13 @@ namespace OpenSim.Framework
             XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
 
             request.Method = verb;
+            MemoryStream buffer = null;
 
             if (verb == "POST")
             {
                 request.ContentType = "text/xml";
 
-                MemoryStream buffer = new MemoryStream();
+                buffer = new MemoryStream();
 
                 XmlWriterSettings settings = new XmlWriterSettings();
                 settings.Encoding = Encoding.UTF8;
@@ -717,6 +732,9 @@ namespace OpenSim.Framework
                     requestStream.Write(buffer.ToArray(), 0, length);
                     requestStream.Close();
 
+                    // capture how much time was spent writing
+                    tickdata = Util.EnvironmentTickCountSubtract(tickstart);
+
                     request.BeginGetResponse(delegate(IAsyncResult ar)
                     {
                         response = request.EndGetResponse(ar);
@@ -742,83 +760,108 @@ namespace OpenSim.Framework
 
                     }, null);
                 }, null);
-
-
-                return;
             }
-
-            request.BeginGetResponse(delegate(IAsyncResult res2)
+            else
             {
-                try
+                request.BeginGetResponse(delegate(IAsyncResult res2)
                 {
-                    // If the server returns a 404, this appears to trigger a System.Net.WebException even though that isn't
-                    // documented in MSDN
-                    response = request.EndGetResponse(res2);
-
-                    Stream respStream = null;
                     try
                     {
-                        respStream = response.GetResponseStream();
-                        deserial = (TResponse)deserializer.Deserialize(respStream);
-                    }
-                    catch (System.InvalidOperationException)
-                    {
-                    }
-                    finally
-                    {
-                        respStream.Close();
-                        response.Close();
-                    }
-                }
-                catch (WebException e)
-                {
-                    if (e.Status == WebExceptionStatus.ProtocolError)
-                    {
-                        if (e.Response is HttpWebResponse)
+                        // If the server returns a 404, this appears to trigger a System.Net.WebException even though that isn't
+                        // documented in MSDN
+                        response = request.EndGetResponse(res2);
+    
+                        Stream respStream = null;
+                        try
                         {
-                            HttpWebResponse httpResponse = (HttpWebResponse)e.Response;
-
-                            if (httpResponse.StatusCode != HttpStatusCode.NotFound)
-                            {
-                                // We don't appear to be handling any other status codes, so log these feailures to that
-                                // people don't spend unnecessary hours hunting phantom bugs.
-                                m_log.DebugFormat(
-                                    "[ASYNC REQUEST]: Request {0} {1} failed with unexpected status code {2}",
-                                    verb, requestUrl, httpResponse.StatusCode);
-                            }
+                            respStream = response.GetResponseStream();
+                            deserial = (TResponse)deserializer.Deserialize(respStream);
+                        }
+                        catch (System.InvalidOperationException)
+                        {
+                        }
+                        finally
+                        {
+                            respStream.Close();
+                            response.Close();
                         }
                     }
-                    else
+                    catch (WebException e)
                     {
-                        m_log.ErrorFormat("[ASYNC REQUEST]: Request {0} {1} failed with status {2} and message {3}", verb, requestUrl, e.Status, e.Message);
+                        if (e.Status == WebExceptionStatus.ProtocolError)
+                        {
+                            if (e.Response is HttpWebResponse)
+                            {
+                                HttpWebResponse httpResponse = (HttpWebResponse)e.Response;
+    
+                                if (httpResponse.StatusCode != HttpStatusCode.NotFound)
+                                {
+                                    // We don't appear to be handling any other status codes, so log these feailures to that
+                                    // people don't spend unnecessary hours hunting phantom bugs.
+                                    m_log.DebugFormat(
+                                        "[ASYNC REQUEST]: Request {0} {1} failed with unexpected status code {2}",
+                                        verb, requestUrl, httpResponse.StatusCode);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            m_log.ErrorFormat(
+                                "[ASYNC REQUEST]: Request {0} {1} failed with status {2} and message {3}",
+                                verb, requestUrl, e.Status, e.Message);
+                        }
                     }
-                }
-                catch (Exception e)
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[ASYNC REQUEST]: Request {0} {1} failed with exception {2}{3}",
+                            verb, requestUrl, e.Message, e.StackTrace);
+                    }
+    
+                    //  m_log.DebugFormat("[ASYNC REQUEST]: Received {0}", deserial.ToString());
+
+                    try
+                    {
+                        action(deserial);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[ASYNC REQUEST]: Request {0} {1} callback failed with exception {2}{3}",
+                            verb, requestUrl, e.Message, e.StackTrace);
+                    }
+    
+                }, null);
+            }
+
+            int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+            if (tickdiff > WebUtil.LongCallTime)
+            {
+                string originalRequest = null;
+
+                if (buffer != null)
                 {
-                    m_log.ErrorFormat("[ASYNC REQUEST]: Request {0} {1} failed with exception {2}", verb, requestUrl, e);
+                    originalRequest = Encoding.UTF8.GetString(buffer.ToArray());
+
+                    if (originalRequest.Length > WebUtil.MaxRequestDiagLength)
+                        originalRequest = originalRequest.Remove(WebUtil.MaxRequestDiagLength);
                 }
 
-                //  m_log.DebugFormat("[ASYNC REQUEST]: Received {0}", deserial.ToString());
-
-                try
-                {
-                    action(deserial);
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[ASYNC REQUEST]: Request {0} {1} callback failed with exception {2}", verb, requestUrl, e);
-                }
-
-            }, null);
+                m_log.InfoFormat(
+                    "[ASYNC REQUEST]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                    reqnum,
+                    verb,
+                    requestUrl,
+                    tickdiff,
+                    tickdata,
+                    originalRequest);
+            }
         }
     }
 
     public static class SynchronousRestFormsRequester
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// Perform a synchronous REST request.
@@ -832,6 +875,12 @@ namespace OpenSim.Framework
         /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
         public static string MakeRequest(string verb, string requestUrl, string obj)
         {
+            int reqnum = WebUtil.RequestNumber++;
+            // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+
+            int tickstart = Util.EnvironmentTickCount();
+            int tickdata = 0;
+
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
             string respstring = String.Empty;
@@ -860,12 +909,16 @@ namespace OpenSim.Framework
                     }
                     catch (Exception e)
                     {
-                        m_log.DebugFormat("[FORMS]: exception occured on sending request to {0}: " + e.ToString(), requestUrl);
+                        m_log.DebugFormat(
+                            "[FORMS]: exception occured {0} {1}: {2}{3}", verb, requestUrl, e.Message, e.StackTrace);
                     }
                     finally
                     {
                         if (requestStream != null)
                             requestStream.Close();
+
+                        // capture how much time was spent writing
+                        tickdata = Util.EnvironmentTickCountSubtract(tickstart);
                     }
                 }
 
@@ -886,7 +939,9 @@ namespace OpenSim.Framework
                             }
                             catch (Exception e)
                             {
-                                m_log.DebugFormat("[FORMS]: exception occured on receiving reply " + e.ToString());
+                                m_log.DebugFormat(
+                                    "[FORMS]: Exception occured on receiving {0} {1}: {2}{3}",
+                                    verb, requestUrl, e.Message, e.StackTrace);
                             }
                             finally
                             {
@@ -899,9 +954,21 @@ namespace OpenSim.Framework
                 catch (System.InvalidOperationException)
                 {
                     // This is what happens when there is invalid XML
-                    m_log.DebugFormat("[FORMS]: InvalidOperationException on receiving request");
+                    m_log.DebugFormat("[FORMS]: InvalidOperationException on receiving {0} {1}", verb, requestUrl);
                 }
             }
+
+            int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+            if (tickdiff > WebUtil.LongCallTime)
+                m_log.InfoFormat(
+                    "[FORMS]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                    reqnum,
+                    verb,
+                    requestUrl,
+                    tickdiff,
+                    tickdata,
+                    obj.Length > WebUtil.MaxRequestDiagLength ? obj.Remove(WebUtil.MaxRequestDiagLength) : obj);
+
             return respstring;
         }
     }
@@ -924,24 +991,24 @@ namespace OpenSim.Framework
         /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
         {
-            return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, 0);
-        }
+            int reqnum = WebUtil.RequestNumber++;
+            // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+
+            int tickstart = Util.EnvironmentTickCount();
+            int tickdata = 0;
 
-        public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
-        {
             Type type = typeof(TRequest);
             TResponse deserial = default(TResponse);
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
-            if (pTimeout != 0)
-                request.Timeout = pTimeout * 1000;
+            MemoryStream buffer = null;
 
             if ((verb == "POST") || (verb == "PUT"))
             {
                 request.ContentType = "text/xml";
 
-                MemoryStream buffer = new MemoryStream();
+                buffer = new MemoryStream();
 
                 XmlWriterSettings settings = new XmlWriterSettings();
                 settings.Encoding = Encoding.UTF8;
@@ -964,13 +1031,19 @@ namespace OpenSim.Framework
                 }
                 catch (Exception e)
                 {
-                    m_log.DebugFormat("[SynchronousRestObjectRequester]: exception in sending data to {0}: {1}", requestUrl, e); 
+                    m_log.DebugFormat(
+                        "[SynchronousRestObjectRequester]: Exception in making request {0} {1}: {2}{3}",
+                        verb, requestUrl, e.Message, e.StackTrace);
+
                     return deserial;
                 }
                 finally
                 {
                     if (requestStream != null)
                         requestStream.Close();
+
+                    // capture how much time was spent writing
+                    tickdata = Util.EnvironmentTickCountSubtract(tickstart);
                 }
             }
 
@@ -986,7 +1059,11 @@ namespace OpenSim.Framework
                         respStream.Close();
                     }
                     else
-                        m_log.DebugFormat("[SynchronousRestObjectRequester]: Oops! no content found in response stream from {0} {1}", requestUrl, verb);
+                    {
+                        m_log.DebugFormat(
+                            "[SynchronousRestObjectRequester]: Oops! no content found in response stream from {0} {1}",
+                            verb, requestUrl);
+                    }
                 }
             }
             catch (WebException e)
@@ -997,17 +1074,44 @@ namespace OpenSim.Framework
                     return deserial;
                 else
                     m_log.ErrorFormat(
-                        "[SynchronousRestObjectRequester]: WebException {0} {1} {2} {3}",
-                        requestUrl, typeof(TResponse).ToString(), e.Message, e.StackTrace);
+                        "[SynchronousRestObjectRequester]: WebException for {0} {1} {2}: {3} {4}",
+                        verb, requestUrl, typeof(TResponse).ToString(), e.Message, e.StackTrace);
             }
             catch (System.InvalidOperationException)
             {
                 // This is what happens when there is invalid XML
-                m_log.DebugFormat("[SynchronousRestObjectRequester]: Invalid XML {0} {1}", requestUrl, typeof(TResponse).ToString());
+                m_log.DebugFormat(
+                    "[SynchronousRestObjectRequester]: Invalid XML from {0} {1} {2}",
+                    verb, requestUrl, typeof(TResponse).ToString());
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[SynchronousRestObjectRequester]: Exception on response from {0} {1}", requestUrl, e);
+                m_log.DebugFormat(
+                    "[SynchronousRestObjectRequester]: Exception on response from {0} {1}: {2}{3}",
+                    verb, requestUrl, e.Message, e.StackTrace);
+            }
+
+            int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+            if (tickdiff > WebUtil.LongCallTime)
+            {
+                string originalRequest = null;
+
+                if (buffer != null)
+                {
+                    originalRequest = Encoding.UTF8.GetString(buffer.ToArray());
+
+                    if (originalRequest.Length > WebUtil.MaxRequestDiagLength)
+                        originalRequest = originalRequest.Remove(WebUtil.MaxRequestDiagLength);
+                }
+
+                m_log.InfoFormat(
+                    "[SynchronousRestObjectRequester]: Slow request to <{0}> {1} {2} took {3}ms, {4}ms writing, {5}",
+                    reqnum,
+                    verb,
+                    requestUrl,
+                    tickdiff,
+                    tickdata,
+                    originalRequest);
             }
 
             return deserial;

OpenSim/Region/Application/OpenSim.cs

@@ -225,12 +225,12 @@ namespace OpenSim
         /// </summary>
         private void RegisterConsoleCommands()
         {
-            m_console.Commands.AddCommand("region", false, "force update",
+            m_console.Commands.AddCommand("Objects", false, "force update",
                                           "force update",
                                           "Force the update of all objects on clients",
                                           HandleForceUpdate);
 
-            m_console.Commands.AddCommand("region", false, "debug packet",
+            m_console.Commands.AddCommand("Comms", false, "debug packet",
                                           "debug packet <level> [<avatar-first-name> <avatar-last-name>]",
                                           "Turn on packet debugging",
                                             "If level >  255 then all incoming and outgoing packets are logged.\n"
@@ -242,7 +242,7 @@ namespace OpenSim
                                           + "If an avatar name is given then only packets from that avatar are logged",
                                           Debug);
 
-            m_console.Commands.AddCommand("region", false, "debug http",
+            m_console.Commands.AddCommand("Comms", false, "debug http",
                                           "debug http <level>",
                                           "Turn on inbound http request debugging for everything except the event queue (see debug eq).",
                                             "If level >= 2 then the handler used to service the request is logged.\n"
@@ -250,37 +250,37 @@ namespace OpenSim
                                           + "If level <= 0 then no extra http logging is done.\n",
                                           Debug);
 
-            m_console.Commands.AddCommand("region", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug);
+            m_console.Commands.AddCommand("Comms", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug);
 
-            m_console.Commands.AddCommand("region", false, "debug scene",
+            m_console.Commands.AddCommand("Regions", false, "debug scene",
                                           "debug scene <scripting> <collisions> <physics>",
                                           "Turn on scene debugging", Debug);
 
-            m_console.Commands.AddCommand("region", false, "change region",
+            m_console.Commands.AddCommand("General", false, "change region",
                                           "change region <region name>",
                                           "Change current console region", ChangeSelectedRegion);
 
-            m_console.Commands.AddCommand("region", false, "save xml",
+            m_console.Commands.AddCommand("Archiving", false, "save xml",
                                           "save xml",
                                           "Save a region's data in XML format", SaveXml);
 
-            m_console.Commands.AddCommand("region", false, "save xml2",
+            m_console.Commands.AddCommand("Archiving", false, "save xml2",
                                           "save xml2",
                                           "Save a region's data in XML2 format", SaveXml2);
 
-            m_console.Commands.AddCommand("region", false, "load xml",
+            m_console.Commands.AddCommand("Archiving", false, "load xml",
                                           "load xml [-newIDs [<x> <y> <z>]]",
                                           "Load a region's data from XML format", LoadXml);
 
-            m_console.Commands.AddCommand("region", false, "load xml2",
+            m_console.Commands.AddCommand("Archiving", false, "load xml2",
                                           "load xml2",
                                           "Load a region's data from XML2 format", LoadXml2);
 
-            m_console.Commands.AddCommand("region", false, "save prims xml2",
+            m_console.Commands.AddCommand("Archiving", false, "save prims xml2",
                                           "save prims xml2 [<prim name> <file name>]",
                                           "Save named prim to XML2", SavePrimsXml2);
 
-            m_console.Commands.AddCommand("region", false, "load oar",
+            m_console.Commands.AddCommand("Archiving", false, "load oar",
                                           "load oar [--merge] [--skip-assets] [<OAR path>]",
                                           "Load a region's data from an OAR archive.",
                                           "--merge will merge the OAR with the existing scene." + Environment.NewLine
@@ -289,7 +289,7 @@ namespace OpenSim
                                           + "  If this is not given then the command looks for an OAR named region.oar in the current directory.",
                                           LoadOar);
 
-            m_console.Commands.AddCommand("region", false, "save oar",
+            m_console.Commands.AddCommand("Archiving", false, "save oar",
                                           //"save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]",
                                           "save oar [-h|--home=<url>] [--noassets] [--publish] [--perm=<permissions>] [<OAR path>]",
                                           "Save a region's data to an OAR archive.",
@@ -306,54 +306,54 @@ namespace OpenSim
                                           + " If this is not given then the oar is saved to region.oar in the current directory.",
                                           SaveOar);
 
-            m_console.Commands.AddCommand("region", false, "edit scale",
+            m_console.Commands.AddCommand("Objects", false, "edit scale",
                                           "edit scale <name> <x> <y> <z>",
                                           "Change the scale of a named prim", HandleEditScale);
 
-            m_console.Commands.AddCommand("region", false, "kick user",
+            m_console.Commands.AddCommand("Users", false, "kick user",
                                           "kick user <first> <last> [message]",
                                           "Kick a user off the simulator", KickUserCommand);
 
-            m_console.Commands.AddCommand("region", false, "show users",
+            m_console.Commands.AddCommand("Users", false, "show users",
                                           "show users [full]",
                                           "Show user data for users currently on the region", 
                                           "Without the 'full' option, only users actually on the region are shown."
                                             + "  With the 'full' option child agents of users in neighbouring regions are also shown.",
                                           HandleShow);
 
-            m_console.Commands.AddCommand("region", false, "show connections",
+            m_console.Commands.AddCommand("Comms", false, "show connections",
                                           "show connections",
                                           "Show connection data", HandleShow);
 
-            m_console.Commands.AddCommand("region", false, "show circuits",
+            m_console.Commands.AddCommand("Comms", false, "show circuits",
                                           "show circuits",
                                           "Show agent circuit data", HandleShow);
 
-            m_console.Commands.AddCommand("region", false, "show http-handlers",
+            m_console.Commands.AddCommand("Comms", false, "show http-handlers",
                                           "show http-handlers",
                                           "Show all registered http handlers", HandleShow);
 
-            m_console.Commands.AddCommand("region", false, "show pending-objects",
+            m_console.Commands.AddCommand("Comms", false, "show pending-objects",
                                           "show pending-objects",
                                           "Show # of objects on the pending queues of all scene viewers", HandleShow);
 
-            m_console.Commands.AddCommand("region", false, "show modules",
+            m_console.Commands.AddCommand("General", false, "show modules",
                                           "show modules",
                                           "Show module data", HandleShow);
 
-            m_console.Commands.AddCommand("region", false, "show regions",
+            m_console.Commands.AddCommand("Regions", false, "show regions",
                                           "show regions",
                                           "Show region data", HandleShow);
             
-            m_console.Commands.AddCommand("region", false, "show ratings",
+            m_console.Commands.AddCommand("Regions", false, "show ratings",
                                           "show ratings",
                                           "Show rating data", HandleShow);
 
-            m_console.Commands.AddCommand("region", false, "backup",
+            m_console.Commands.AddCommand("Objects", false, "backup",
                                           "backup",
                                           "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", RunCommand);
 
-            m_console.Commands.AddCommand("region", false, "create region",
+            m_console.Commands.AddCommand("Regions", false, "create region",
                                           "create region [\"region name\"] <region_file.ini>",
                                           "Create a new region.",
                                           "The settings for \"region name\" are read from <region_file.ini>. Paths specified with <region_file.ini> are relative to your Regions directory, unless an absolute path is given."
@@ -362,62 +362,57 @@ namespace OpenSim
                                           + "If <region_file.ini> does not exist, it will be created.",
                                           HandleCreateRegion);
 
-            m_console.Commands.AddCommand("region", false, "restart",
+            m_console.Commands.AddCommand("Regions", false, "restart",
                                           "restart",
                                           "Restart all sims in this instance", RunCommand);
 
-            m_console.Commands.AddCommand("region", false, "config set",
+            m_console.Commands.AddCommand("General", false, "config set",
                                           "config set <section> <key> <value>",
                                           "Set a config option.  In most cases this is not useful since changed parameters are not dynamically reloaded.  Neither do changed parameters persist - you will have to change a config file manually and restart.", HandleConfig);
 
-            m_console.Commands.AddCommand("region", false, "config get",
+            m_console.Commands.AddCommand("General", false, "config get",
                                           "config get [<section>] [<key>]",
                                           "Synonym for config show",
                                           HandleConfig);
             
-            m_console.Commands.AddCommand("region", false, "config show",
+            m_console.Commands.AddCommand("General", false, "config show",
                                           "config show [<section>] [<key>]",
                                           "Show config information", 
                                           "If neither section nor field are specified, then the whole current configuration is printed." + Environment.NewLine
                                           + "If a section is given but not a field, then all fields in that section are printed.",
                                           HandleConfig);            
 
-            m_console.Commands.AddCommand("region", false, "config save",
+            m_console.Commands.AddCommand("General", false, "config save",
                                           "config save <path>",
                                           "Save current configuration to a file at the given path", HandleConfig);
 
-            m_console.Commands.AddCommand("region", false, "command-script",
+            m_console.Commands.AddCommand("General", false, "command-script",
                                           "command-script <script>",
                                           "Run a command script from file", RunCommand);
 
-            m_console.Commands.AddCommand("region", false, "remove-region",
+            m_console.Commands.AddCommand("Regions", false, "remove-region",
                                           "remove-region <name>",
                                           "Remove a region from this simulator", RunCommand);
 
-            m_console.Commands.AddCommand("region", false, "delete-region",
+            m_console.Commands.AddCommand("Regions", false, "delete-region",
                                           "delete-region <name>",
                                           "Delete a region from disk", RunCommand);
 
-            m_console.Commands.AddCommand("region", false, "modules list",
+            m_console.Commands.AddCommand("General", false, "modules list",
                                           "modules list",
                                           "List modules", HandleModules);
 
-            m_console.Commands.AddCommand("region", false, "modules load",
+            m_console.Commands.AddCommand("General", false, "modules load",
                                           "modules load <name>",
                                           "Load a module", HandleModules);
 
-            m_console.Commands.AddCommand("region", false, "modules unload",
+            m_console.Commands.AddCommand("General", false, "modules unload",
                                           "modules unload <name>",
                                           "Unload a module", HandleModules);
 
-            m_console.Commands.AddCommand("region", false, "Add-InventoryHost",
-                                          "Add-InventoryHost <host>",
-                                          String.Empty, RunCommand);
-
-            m_console.Commands.AddCommand("region", false, "kill uuid",
+            m_console.Commands.AddCommand("Objects", false, "kill uuid",
                                           "kill uuid <UUID>",
                                           "Kill an object by UUID", KillUUID);
-
         }
 
         public override void ShutdownSpecific()
@@ -484,7 +479,7 @@ namespace OpenSim
                     if (alert != null)
                         presence.ControllingClient.Kick(alert);
                     else
-                        presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
+                        presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
 
                     // ...and close on our side
                     presence.Scene.IncomingCloseAgent(presence.UUID);
@@ -829,14 +824,6 @@ namespace OpenSim
                 case "restart":
                     m_sceneManager.RestartCurrentScene();
                     break;
-
-                case "Add-InventoryHost":
-                    if (cmdparams.Length > 0)
-                    {
-                        MainConsole.Instance.Output("Not implemented.");
-                    }
-                    break;
-
             }
         }
 
@@ -928,7 +915,7 @@ namespace OpenSim
                     break;
 
                 case "scene":
-                    if (args.Length == 5)
+                    if (args.Length == 4)
                     {
                         if (m_sceneManager.CurrentScene == null)
                         {
@@ -936,39 +923,21 @@ namespace OpenSim
                         }
                         else
                         {
-                            bool scriptingOn = !Convert.ToBoolean(args[2]);
-                            bool collisionsOn = !Convert.ToBoolean(args[3]);
-                            bool physicsOn = !Convert.ToBoolean(args[4]);
-                            m_sceneManager.CurrentScene.SetSceneCoreDebug(scriptingOn, collisionsOn, physicsOn);
+                            string key = args[2];
+                            string value = args[3];
+                            m_sceneManager.CurrentScene.SetSceneCoreDebug(
+                                new Dictionary<string, string>() { { key, value } });
 
-                            MainConsole.Instance.Output(
-                                String.Format(
-                                    "Set debug scene scripting = {0}, collisions = {1}, physics = {2}",
-                                    !scriptingOn, !collisionsOn, !physicsOn));
+                            MainConsole.Instance.OutputFormat("Set debug scene {0} = {1}", key, value);
                         }
                     }
                     else
                     {
-                        MainConsole.Instance.Output("Usage: debug scene <scripting> <collisions> <physics> (where inside <> is true/false)");
+                        MainConsole.Instance.Output("Usage: debug scene scripting|collisions|physics|teleport true|false");
                     }
 
                     break;
 
-                case "teleport":
-                    foreach(Scene s in m_sceneManager.Scenes)
-                    {
-                        if (s.DEBUG)
-                        {
-                            s.DEBUG = false;
-                            MainConsole.Instance.Output("Teleport debugging is disabled!");
-                        }
-                        else{
-                            s.DEBUG = true;
-                            MainConsole.Instance.Output("Teleport debugging is enabled!");
-                        }
-                    }
-                    break;
-
                 default:
                     MainConsole.Instance.Output("Unknown debug command");
                     break;
@@ -1228,7 +1197,7 @@ namespace OpenSim
                         MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
                     }
                 }
-                m_sceneManager.LoadCurrentSceneFromXml(cmdparams[0], generateNewIDS, loadOffset);
+                m_sceneManager.LoadCurrentSceneFromXml(cmdparams[2], generateNewIDS, loadOffset);
             }
             else
             {

OpenSim/Region/Application/OpenSimBase.cs

@@ -93,10 +93,6 @@ namespace OpenSim
 
         protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
 
-        private List<string> m_permsModules;
-
-        private bool m_securePermissionsLoading = true;
-
         /// <value>
         /// The config information passed into the OpenSimulator region server.
         /// </value>
@@ -201,11 +197,6 @@ namespace OpenSim
                     CreatePIDFile(pidFile);
                 
                 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty);
-
-                m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true);
-
-                string permissionModules = startupConfig.GetString("permissionmodules", "DefaultPermissionsModule");
-                m_permsModules = new List<string>(permissionModules.Split(','));
             }
 
             // Load the simulation data service
@@ -234,12 +225,6 @@ namespace OpenSim
             m_moduleLoader = new ModuleLoader(m_config.Source);
 
             LoadPlugins();
-
-            if (m_plugins.Count == 0) // We failed to load any modules. Mono Addins glitch!
-            {
-                Environment.Exit(1);
-            }
-
             foreach (IApplicationPlugin plugin in m_plugins)
             {
                 plugin.PostInitialise();
@@ -257,15 +242,18 @@ namespace OpenSim
 
                 foreach (string topic in topics)
                 {
-                    m_console.Commands.AddCommand("plugin", false, "help " + topic,
-                                                  "help " + topic,
+                    string capitalizedTopic = char.ToUpper(topic[0]) + topic.Substring(1);
+
+                    // This is a hack to allow the user to enter the help command in upper or lowercase.  This will go
+                    // away at some point.
+                    m_console.Commands.AddCommand(capitalizedTopic, false, "help " + topic,
+                                                  "help " + capitalizedTopic,
+                                                  "Get help on plugin command '" + topic + "'",
+                                                  HandleCommanderHelp);
+                    m_console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic,
+                                                  "help " + capitalizedTopic,
                                                   "Get help on plugin command '" + topic + "'",
                                                   HandleCommanderHelp);
-
-                    m_console.Commands.AddCommand("plugin", false, topic,
-                                                  topic,
-                                                  "Execute subcommand for plugin '" + topic + "'",
-                                                  null);
 
                     ICommander commander = null;
 
@@ -282,7 +270,7 @@ namespace OpenSim
 
                     foreach (string command in commander.Commands.Keys)
                     {
-                        m_console.Commands.AddCommand(topic, false,
+                        m_console.Commands.AddCommand(capitalizedTopic, false,
                                                       topic + " " + command,
                                                       topic + " " + commander.Commands[command].ShortHelp(),
                                                       String.Empty, HandleCommanderCommand);
@@ -301,7 +289,7 @@ namespace OpenSim
             // Only safe for the interactive console, since it won't
             // let us come here unless both scene and commander exist
             //
-            ICommander moduleCommander = SceneManager.CurrentOrFirstScene.GetCommander(cmd[1]);
+            ICommander moduleCommander = SceneManager.CurrentOrFirstScene.GetCommander(cmd[1].ToLower());
             if (moduleCommander != null)
                 m_console.Output(moduleCommander.Help);
         }
@@ -387,41 +375,7 @@ namespace OpenSim
             }
             else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing...");
 
-            if (m_securePermissionsLoading)
-            {
-                foreach (string s in m_permsModules)
-                {
-                    if (!scene.RegionModules.ContainsKey(s))
-                    {
-                        bool found = false;
-                        foreach (IRegionModule m in modules)
-                        {
-                            if (m.Name == s)
-                            {
-                                found = true;
-                            }
-                        }
-                        if (!found)
-                        {
-                            m_log.Fatal("[MODULES]: Required module " + s + " not found.");
-                            Environment.Exit(0);
-                        }
-                    }
-                }
-            }
-
             scene.SetModuleInterfaces();
-// First Step of bootreport sequence
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.ColdStart(1,scene);
-                scene.SnmpService.LinkDown(scene);
-            }
-
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("Loading prins", scene);
-            }
 
             while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
                 SetUpEstateOwner(scene);
@@ -430,16 +384,11 @@ namespace OpenSim
             scene.LoadPrimsFromStorage(regionInfo.originRegionID);
             
             // TODO : Try setting resource for region xstats here on scene
-            MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); 
+            MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo));
             
             scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
             scene.EventManager.TriggerParcelPrimCountUpdate();
 
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("Grid Registration in progress", scene);
-            } 
-
             try
             {
                 scene.RegisterRegionWithGrid();
@@ -450,29 +399,15 @@ namespace OpenSim
                     "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}", 
                     e.Message, e.StackTrace);
 
-                if (scene.SnmpService != null)
-                {
-                    scene.SnmpService.Critical("Grid registration failed. Startup aborted.", scene);
-                }
                 // Carrying on now causes a lot of confusion down the
                 // line - we need to get the user's attention
                 Environment.Exit(1);
             }
 
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("Grid Registration done", scene);
-            }
-
             // We need to do this after we've initialized the
             // scripting engines.
             scene.CreateScriptInstances();
 
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("ScriptEngine started", scene);
-            }
-
             m_sceneManager.Add(scene);
 
             if (m_autoCreateClientStack)
@@ -481,10 +416,6 @@ namespace OpenSim
                 clientServer.Start();
             }
 
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("Initializing region modules", scene);
-            }
             if (do_post_init)
             {
                 foreach (IRegionModule module in modules)
@@ -496,14 +427,7 @@ namespace OpenSim
 
             mscene = scene;
 
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("The region is operational", scene);
-                scene.SnmpService.LinkUp(scene);
-            }
-
-            scene.StartTimer();
-            scene.StartTimerWatchdog();
+            scene.Start();
 
             scene.StartScripts();
 
@@ -580,11 +504,6 @@ namespace OpenSim
         private void ShutdownRegion(Scene scene)
         {
             m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName);
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("The region is shutting down", scene);
-                scene.SnmpService.LinkDown(scene);
-            }
             IRegionModulesController controller;
             if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller))
             {
@@ -808,6 +727,9 @@ namespace OpenSim
                 return Util.UTF8.GetBytes("OK");
             }
 
+            public string Name { get { return "SimStatus"; } }
+            public string Description { get { return "Simulator Status"; } }
+
             public string ContentType
             {
                 get { return "text/plain"; }
@@ -832,6 +754,9 @@ namespace OpenSim
         {
             OpenSimBase m_opensim;
             string osXStatsURI = String.Empty;
+
+            public string Name { get { return "XSimStatus"; } }
+            public string Description { get { return "Simulator XStatus"; } }
         
             public XSimStatusHandler(OpenSimBase sim)
             {
@@ -872,6 +797,9 @@ namespace OpenSim
         {
             OpenSimBase m_opensim;
             string osUXStatsURI = String.Empty;
+
+            public string Name { get { return "UXSimStatus"; } }
+            public string Description { get { return "Simulator UXStatus"; } }
         
             public UXSimStatusHandler(OpenSimBase sim)
             {
@@ -1028,7 +956,7 @@ namespace OpenSim
                             = MainConsole.Instance.CmdPrompt(
                                 string.Format(
                                     "Do you wish to join region {0} to an existing estate (yes/no)?", regInfo.RegionName), 
-                                    "no", 
+                                    "yes", 
                                     new List<string>() { "yes", "no" });
                         
                         if (response == "no")
@@ -1044,15 +972,12 @@ namespace OpenSim
                                 = MainConsole.Instance.CmdPrompt(
                                     string.Format(
                                         "Name of estate to join.  Existing estate names are ({0})", string.Join(", ", estateNames.ToArray())), 
-                                    "None");
-                            
-                            if (response == "None")
-                                continue;
+                                    estateNames[0]);
     
                             List<int> estateIDs = EstateDataService.GetEstates(response);
                             if (estateIDs.Count < 1)
                             {
-                                MainConsole.Instance.Output("The name you have entered matches no known estate. Please try again.");
+                                MainConsole.Instance.Output("The name you have entered matches no known estate.  Please try again.");
                                 continue;
                             }
     

OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs

@@ -151,7 +151,9 @@ namespace OpenSim.Region.ClientStack.Linden
             try
             {
                 // the root of all evil
-                m_HostCapsObj.RegisterHandler("SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest));
+                m_HostCapsObj.RegisterHandler(
+                    "SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest, "SEED", null));
+
                 m_log.DebugFormat(
                     "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_HostCapsObj.AgentID);
 
@@ -159,7 +161,10 @@ namespace OpenSim.Region.ClientStack.Linden
                 //    new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST",
                 //                                                                capsBase + m_mapLayerPath,
                 //                                                                GetMapLayer);
-                IRequestHandler req = new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
+                IRequestHandler req
+                    = new RestStreamHandler(
+                        "POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory, "UpdateScript", null);
+
                 m_HostCapsObj.RegisterHandler("UpdateScriptTaskInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptTask", req);
             }
@@ -174,14 +179,27 @@ namespace OpenSim.Region.ClientStack.Linden
             try
             {
                 // I don't think this one works...
-                m_HostCapsObj.RegisterHandler("NewFileAgentInventory", new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST",
-                                                                                           capsBase + m_newInventory,
-                                                                                           NewAgentInventoryRequest));
-                IRequestHandler req = new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory);
+                m_HostCapsObj.RegisterHandler(
+                    "NewFileAgentInventory",
+                    new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>(
+                        "POST",
+                        capsBase + m_newInventory,
+                        NewAgentInventoryRequest,
+                        "NewFileAgentInventory",
+                        null));
+
+                IRequestHandler req
+                    = new RestStreamHandler(
+                        "POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory, "Update*", null);
+
                 m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req);
-                m_HostCapsObj.RegisterHandler("CopyInventoryFromNotecard", new RestStreamHandler("POST", capsBase + m_copyFromNotecardPath, CopyInventoryFromNotecard));
+
+                m_HostCapsObj.RegisterHandler(
+                    "CopyInventoryFromNotecard",
+                    new RestStreamHandler(
+                        "POST", capsBase + m_copyFromNotecardPath, CopyInventoryFromNotecard, "CopyInventoryFromNotecard", null));
              
                 // As of RC 1.22.9 of the Linden client this is
                 // supported
@@ -231,7 +249,10 @@ namespace OpenSim.Region.ClientStack.Linden
 
             if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint))
             {
-                m_log.DebugFormat("[CAPS]: Unauthorized CAPS client");
+                m_log.DebugFormat(
+                    "[CAPS]: Unauthorized CAPS client {0} from {1}",
+                    m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint);
+
                 return string.Empty;
             }
 
@@ -282,7 +303,9 @@ namespace OpenSim.Region.ClientStack.Linden
                         m_dumpAssetsToFile);
                 uploader.OnUpLoad += TaskScriptUpdated;
 
-                m_HostCapsObj.HttpListener.AddStreamHandler(new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+                m_HostCapsObj.HttpListener.AddStreamHandler(
+                    new BinaryStreamHandler(
+                        "POST", capsBase + uploaderPath, uploader.uploaderCaps, "BunchOfCaps", null));
 
                 string protocol = "http://";
 
@@ -393,8 +416,14 @@ namespace OpenSim.Region.ClientStack.Linden
             AssetUploader uploader =
                 new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
                                   llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile);
+
             m_HostCapsObj.HttpListener.AddStreamHandler(
-                new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+                new BinaryStreamHandler(
+                    "POST",
+                    capsBase + uploaderPath,
+                    uploader.uploaderCaps,
+                    "NewAgentInventoryRequest",
+                    m_HostCapsObj.AgentID.ToString()));
 
             string protocol = "http://";
 
@@ -710,7 +739,8 @@ namespace OpenSim.Region.ClientStack.Linden
             uploader.OnUpLoad += ItemUpdated;
 
             m_HostCapsObj.HttpListener.AddStreamHandler(
-                new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+                new BinaryStreamHandler(
+                    "POST", capsBase + uploaderPath, uploader.uploaderCaps, "NoteCardAgentInventory", null));
 
             string protocol = "http://";
 

OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs

@@ -106,7 +106,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 scene.EventManager.OnRegisterCaps += OnRegisterCaps;
 
                 MainConsole.Instance.Commands.AddCommand(
-                    "event queue",
+                    "Comms",
                     false,
                     "debug eq",
                     "debug eq [0|1]",
@@ -351,14 +351,18 @@ namespace OpenSim.Region.ClientStack.Linden
             // EventQueueGet when it receive capability information, but then we replace the rest handler immediately
             // afterwards with the poll service.  So for now, we'll pass a null instead to simplify code reading, but
             // really it should be possible to directly register the poll handler as a capability.
-            caps.RegisterHandler("EventQueueGet",
-                                 new RestHTTPHandler("POST", capsBase + EventQueueGetUUID.ToString() + "/", null));
+            caps.RegisterHandler(
+                "EventQueueGet",
+                new RestHTTPHandler(
+                    "POST", capsBase + EventQueueGetUUID.ToString() + "/", null));
+
 //                                                       delegate(Hashtable m_dhttpMethod)
 //                                                       {
 //                                                           return ProcessQueue(m_dhttpMethod, agentID, caps);
 //                                                       }));
 
             // This will persist this beyond the expiry of the caps handlers
+            // TODO: Add EventQueueGet name/description for diagnostics
             MainServer.Instance.AddPollServiceHTTPHandler(
                 capsBase + EventQueueGetUUID.ToString() + "/",
                 new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID));

OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs

@@ -60,7 +60,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             CapabilitiesModule capsModule = new CapabilitiesModule();
             EventQueueGetModule eqgModule = new EventQueueGetModule();
 
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, config, capsModule, eqgModule);
         }
 

OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs

@@ -132,7 +132,8 @@ namespace OpenSim.Region.ClientStack.Linden
                 capUrl = "/CAPS/" + UUID.Random();
 
                 IRequestHandler reqHandler
-                    = new RestStreamHandler("POST", capUrl, m_fetchHandler.FetchInventoryRequest);
+                    = new RestStreamHandler(
+                        "POST", capUrl, m_fetchHandler.FetchInventoryRequest, capName, agentID.ToString());
 
                 caps.RegisterHandler(capName, reqHandler);
             }

OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs

@@ -120,11 +120,13 @@ namespace OpenSim.Region.ClientStack.Linden
             {
 //                m_log.DebugFormat("[GETMESH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
                 GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService);
-                IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(),
-                                                           delegate(Hashtable m_dhttpMethod)
-                                                           {
-                                                               return gmeshHandler.ProcessGetMesh(m_dhttpMethod, UUID.Zero, null);
-                                                           });
+                IRequestHandler reqHandler
+                    = new RestHTTPHandler(
+                        "GET",
+                        "/CAPS/" + UUID.Random(),
+                        httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
+                        "GetMesh",
+                        agentID.ToString());
 
                 caps.RegisterHandler("GetMesh", reqHandler);
             }

OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs

@@ -130,7 +130,9 @@ namespace OpenSim.Region.ClientStack.Linden
             if (m_URL == "localhost")
             {
 //                m_log.DebugFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
-                caps.RegisterHandler("GetTexture", new GetTextureHandler("/CAPS/" + capID + "/", m_assetService));
+                caps.RegisterHandler(
+                    "GetTexture",
+                    new GetTextureHandler("/CAPS/" + capID + "/", m_assetService, "GetTexture", agentID.ToString()));
             }
             else
             {

OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs

@@ -117,7 +117,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-            IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), MeshUploadFlag);
+            IRequestHandler reqHandler
+                = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), MeshUploadFlag, "MeshUploadFlag", agentID.ToString());
+
             caps.RegisterHandler("MeshUploadFlag", reqHandler);
 	        m_agentID = agentID;
         }

OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs

@@ -56,6 +56,7 @@ namespace OpenSim.Region.ClientStack.Linden
 //        private IAssetService m_assetService;
         private bool m_dumpAssetsToFile = false;
         private bool m_enabled = true;
+        private int  m_levelUpload = 0;
 
         #region IRegionModuleBase Members
 
@@ -72,6 +73,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 return;
 
             m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
+            m_levelUpload = meshConfig.GetInt("LevelUpload", 0);
         }
 
         public void AddRegion(Scene pScene)
@@ -113,51 +115,66 @@ namespace OpenSim.Region.ClientStack.Linden
             UUID capID = UUID.Random();
 
 //            m_log.Debug("[NEW FILE AGENT INVENTORY VARIABLE PRICE]: /CAPS/" + capID);
-            caps.RegisterHandler("NewFileAgentInventoryVariablePrice",
-
-                    new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDNewFileAngentInventoryVariablePriceReplyResponse>("POST",
-                                                                                           "/CAPS/" + capID.ToString(),
-                                                                                           delegate(LLSDAssetUploadRequest req)
-                                                       {
-                                                           return NewAgentInventoryRequest(req,agentID);
-                                                       }));
-         
+            caps.RegisterHandler(
+                "NewFileAgentInventoryVariablePrice",
+                new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDNewFileAngentInventoryVariablePriceReplyResponse>(
+                    "POST",
+                    "/CAPS/" + capID.ToString(),
+                    req => NewAgentInventoryRequest(req, agentID),
+                    "NewFileAgentInventoryVariablePrice",
+                    agentID.ToString()));         
         }
 
         #endregion
 
         public LLSDNewFileAngentInventoryVariablePriceReplyResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest, UUID agentID)
         {
-
             //TODO:  The Mesh uploader uploads many types of content. If you're going to implement a Money based limit
-            // You need to be aware of this and 
-
+            // you need to be aware of this
 
             //if (llsdRequest.asset_type == "texture" ||
            //     llsdRequest.asset_type == "animation" ||
            //     llsdRequest.asset_type == "sound")
            // {
-                IClientAPI client = null;
+                // check user level
 
-                
-                IMoneyModule mm = m_scene.RequestModuleInterface<IMoneyModule>();
-                
-                if (mm != null)
+            ScenePresence avatar = null;
+            IClientAPI client = null;
+            m_scene.TryGetScenePresence(agentID, out avatar);
+
+            if (avatar != null)
+            {
+                client = avatar.ControllingClient;
+
+                if (avatar.UserLevel < m_levelUpload)
                 {
-                    if (m_scene.TryGetClient(agentID, out client))
-                    {
-                        if (!mm.UploadCovered(client.AgentId, mm.UploadCharge))
-                        {
-                            if (client != null)
-                                client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
+                    if (client != null)
+                        client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false);
 
-                            LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
-                            errorResponse.rsvp = "";
-                            errorResponse.state = "error";
-                            return errorResponse;
-                        }
-                    }
+                    LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
+                    errorResponse.rsvp = "";
+                    errorResponse.state = "error";
+                    return errorResponse;
                 }
+            }
+
+            // check funds
+            IMoneyModule mm = m_scene.RequestModuleInterface<IMoneyModule>();
+
+            if (mm != null)
+            {
+                if (!mm.UploadCovered(agentID, mm.UploadCharge))
+                {
+                    if (client != null)
+                        client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
+
+                    LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
+                    errorResponse.rsvp = "";
+                    errorResponse.state = "error";
+                    return errorResponse;
+                }
+            }
+
            // }
 
             string assetName = llsdRequest.name;
@@ -171,8 +188,14 @@ namespace OpenSim.Region.ClientStack.Linden
             AssetUploader uploader =
                 new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
                                   llsdRequest.asset_type, capsBase + uploaderPath, MainServer.Instance, m_dumpAssetsToFile);
+
             MainServer.Instance.AddStreamHandler(
-                new BinaryStreamHandler("POST", capsBase + uploaderPath, uploader.uploaderCaps));
+                new BinaryStreamHandler(
+                    "POST",
+                    capsBase + uploaderPath,
+                    uploader.uploaderCaps,
+                    "NewFileAgentInventoryVariablePrice",
+                    agentID.ToString()));
 
             string protocol = "http://";
 
@@ -181,10 +204,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
             string uploaderURL = protocol + m_scene.RegionInfo.ExternalHostName + ":" + MainServer.Instance.Port.ToString() + capsBase +
                                  uploaderPath;
-         
+
 
             LLSDNewFileAngentInventoryVariablePriceReplyResponse uploadResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
-           
             
             uploadResponse.rsvp = uploaderURL;
             uploadResponse.state = "upload";
@@ -202,6 +224,7 @@ namespace OpenSim.Region.ClientStack.Linden
                                           pinventoryItem, pparentFolder, pdata,  pinventoryType,
                                           passetType,agentID);
                };
+
             return uploadResponse;
         }
 

OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs

@@ -66,12 +66,14 @@ namespace OpenSim.Region.ClientStack.Linden
             
 //            m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/");
 
-            caps.RegisterHandler("ObjectAdd",
-                                 new RestHTTPHandler("POST", "/CAPS/OA/" + capuuid + "/",
-                                                       delegate(Hashtable m_dhttpMethod)
-                                                       {
-                                                           return ProcessAdd(m_dhttpMethod, agentID, caps);
-                                                       }));
+            caps.RegisterHandler(
+                "ObjectAdd",
+                new RestHTTPHandler(
+                    "POST",
+                    "/CAPS/OA/" + capuuid + "/",
+                    httpMethod => ProcessAdd(httpMethod, agentID, caps),
+                    "ObjectAdd",
+                    agentID.ToString()));;
         }
 
         public Hashtable ProcessAdd(Hashtable request, UUID AgentId, Caps cap)

OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs

@@ -106,12 +106,15 @@ namespace OpenSim.Region.ClientStack.Linden
             UUID capID = UUID.Random();
 
 //            m_log.Debug("[UPLOAD OBJECT ASSET MODULE]: /CAPS/" + capID);
-            caps.RegisterHandler("UploadObjectAsset",
-                                 new RestHTTPHandler("POST", "/CAPS/OA/" + capID + "/",
-                                                       delegate(Hashtable m_dhttpMethod)
-                                                       {
-                                                           return ProcessAdd(m_dhttpMethod, agentID, caps);
-                                                       }));
+            caps.RegisterHandler(
+                "UploadObjectAsset",
+                new RestHTTPHandler(
+                    "POST",
+                    "/CAPS/OA/" + capID + "/",
+                    httpMethod => ProcessAdd(httpMethod, agentID, caps),
+                    "UploadObjectAsset",
+                    agentID.ToString()));
+
             /*
                    caps.RegisterHandler("NewFileAgentInventoryVariablePrice",
 

OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs

@@ -154,7 +154,9 @@ namespace OpenSim.Region.ClientStack.Linden
         public void RegisterCaps(UUID agentID, Caps caps)
         {
             IRequestHandler reqHandler
-                = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), HandleSimulatorFeaturesRequest);
+                = new RestHTTPHandler(
+                    "GET", "/CAPS/" + UUID.Random(),
+                    HandleSimulatorFeaturesRequest, "SimulatorFeatures", agentID.ToString());
 
             caps.RegisterHandler("SimulatorFeatures", reqHandler);
         }

OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs

@@ -106,7 +106,9 @@ namespace OpenSim.Region.ClientStack.Linden
                     "POST",
                     "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
                     new UploadBakedTextureHandler(
-                        caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture));
+                        caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture,
+                    "UploadBakedTexture",
+                    agentID.ToString()));
         }
     }
 }

OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs

@@ -144,7 +144,12 @@ namespace OpenSim.Region.ClientStack.Linden
                 capUrl = "/CAPS/" + UUID.Random();
 
                 IRequestHandler reqHandler
-                    = new RestStreamHandler("POST", capUrl, m_webFetchHandler.FetchInventoryDescendentsRequest);
+                    = new RestStreamHandler(
+                        "POST",
+                        capUrl,
+                        m_webFetchHandler.FetchInventoryDescendentsRequest,
+                        "FetchInventoryDescendents2",
+                        agentID.ToString());
 
                 caps.RegisterHandler(capName, reqHandler);
             }
@@ -160,4 +165,4 @@ namespace OpenSim.Region.ClientStack.Linden
 //                capName, capUrl, m_scene.RegionInfo.RegionName, agentID);
         }
     }
-}
+}