7 files changed, 17 insertions, 21 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
index 95e4bab..cd4781d 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             Util.FireAndForget(delegate(object o)
             {
                 m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
-            });
+            }, null, "SimianActivityDetector.SetLastPositionOnMakeRootAgent");
         }
 
         public void OnNewClient(IClientAPI client)
@@ -94,7 +94,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             Util.FireAndForget(delegate(object o)
             {
                 m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
-            });
+            }, null, "SimianActivityDetector.SetLastPositionOnEnteringNewParcel");
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 01cbf91..9ad4a7a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -225,7 +225,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 {
                     AssetBase asset = SimianGetOperation(id);
                     handler(id, sender, asset);
-                }
+                }, null, "SimianAssetServiceConnector.GetFromService"
             );
 
             return true;
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs
index 5c804d4..b57f8d8 100644
--- a/OpenSim/Services/HypergridService/HGAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGAssetService.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Services.HypergridService
                 return null;
 
             if (asset.Metadata.Type == (sbyte)AssetType.Object)
-                asset.Data = AdjustIdentifiers(asset.Data); ;
+                asset.Data = AdjustIdentifiers(asset.Data);
 
             AdjustIdentifiers(asset.Metadata);
 
diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs
index a8bcfb2..6e35a88 100644
--- a/OpenSim/Services/HypergridService/HGFriendsService.cs
+++ b/OpenSim/Services/HypergridService/HGFriendsService.cs
@@ -198,7 +198,8 @@ namespace OpenSim.Services.HypergridService
             // So let's send back the call, but start a thread to continue
             // with the verification and the actual action.
 
-            Util.FireAndForget(delegate { ProcessFriendshipOffered(fromID, fromName, toID, message); });
+            Util.FireAndForget(
+                o => ProcessFriendshipOffered(fromID, fromName, toID, message), null, "HGFriendsService.ProcessFriendshipOffered");
 
             return true;
         }
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index c45ea76..ce50ab0 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Services.Interfaces
 
     public class GridRegion
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
 #pragma warning disable 414
         private static readonly string LogHeader = "[GRID REGION]";
@@ -135,12 +135,7 @@ namespace OpenSim.Services.Interfaces
         /// <summary>
         /// The port by which http communication occurs with the region 
         /// </summary>
-        public uint HttpPort
-        {
-            get { return m_httpPort; }
-            set { m_httpPort = value; }
-        }
-        protected uint m_httpPort;
+        public uint HttpPort { get; set; }
 
         /// <summary>
         /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
@@ -151,10 +146,10 @@ namespace OpenSim.Services.Interfaces
                 if (!String.IsNullOrEmpty(m_serverURI)) {
                     return m_serverURI;
                 } else {
-                    if (m_httpPort == 0)
+                    if (HttpPort == 0)
                         return "http://" + m_externalHostName + "/";
                     else
-                        return "http://" + m_externalHostName + ":" + m_httpPort + "/";
+                        return "http://" + m_externalHostName + ":" + HttpPort + "/";
                 }
             }
             set { 
@@ -290,7 +285,7 @@ namespace OpenSim.Services.Interfaces
             RegionSizeY = (int)ConvertFrom.RegionSizeY;
             m_internalEndPoint = ConvertFrom.InternalEndPoint;
             m_externalHostName = ConvertFrom.ExternalHostName;
-            m_httpPort = ConvertFrom.HttpPort;
+            HttpPort = ConvertFrom.HttpPort;
             RegionID = ConvertFrom.RegionID;
             ServerURI = ConvertFrom.ServerURI;
             TerrainImage = ConvertFrom.RegionSettings.TerrainImageID;
@@ -310,7 +305,7 @@ namespace OpenSim.Services.Interfaces
             RegionSizeY = ConvertFrom.RegionSizeY;
             m_internalEndPoint = ConvertFrom.InternalEndPoint;
             m_externalHostName = ConvertFrom.ExternalHostName;
-            m_httpPort = ConvertFrom.HttpPort;
+            HttpPort = ConvertFrom.HttpPort;
             RegionID = ConvertFrom.RegionID;
             ServerURI = ConvertFrom.ServerURI;
             TerrainImage = ConvertFrom.TerrainImage;
diff --git a/OpenSim/Services/Interfaces/OpenProfileClient.cs b/OpenSim/Services/Interfaces/OpenProfileClient.cs
index e601ebe..bda8151 100644
--- a/OpenSim/Services/Interfaces/OpenProfileClient.cs
+++ b/OpenSim/Services/Interfaces/OpenProfileClient.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Services.UserProfilesService
     /// </remarks>
     public class OpenProfileClient
     {
-        static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         private string m_serverURI;
 
@@ -60,8 +60,7 @@ namespace OpenSim.Services.UserProfilesService
         {
             m_serverURI = serverURI;
         }
-
-
+               
         /// <summary>
         /// Gets an avatar's profile using the OpenProfile protocol.
         /// </summary>
@@ -132,4 +131,4 @@ namespace OpenSim.Services.UserProfilesService
             return true;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index c07e034..a816411 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -166,7 +166,8 @@ namespace OpenSim.Services.MapImageService
                 // m_log.DebugFormat("{0} UpdateMultiResolutionFilesAsync: scheduling update for <{1},{2}>", LogHeader, x, y);
                 multiRezToBuild.Enqueue(new mapToMultiRez(x, y));
                 if (multiRezToBuild.Count == 1)
-                    Util.FireAndForget(DoUpdateMultiResolutionFilesAsync);
+                    Util.FireAndForget(
+                        DoUpdateMultiResolutionFilesAsync, null, "MapImageService.DoUpdateMultiResolutionFilesAsync");
             }
 
             return true;