7 files changed, 64 insertions, 67 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c046010..cafbd1f 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Framework
 
     public delegate void ObjectExtraParams(UUID agentID, uint localID, ushort type, bool inUse, byte[] data);
 
-    public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
+    public delegate void ObjectSelect(List<uint> localID, IClientAPI remoteClient);
 
     public delegate void ObjectRequest(uint localID, IClientAPI remoteClient);
 
@@ -1382,6 +1382,8 @@ namespace OpenSim.Framework
 
         void SendObjectPropertiesReply(ISceneEntity Entity);
 
+        void SendSelectedPartsProprieties(List<ISceneEntity> parts);
+
         void SendPartPhysicsProprieties(ISceneEntity Entity);
 
         void SendAgentOffline(UUID[] agentIDs);
diff --git a/OpenSim/Framework/Monitoring/ChecksManager.cs b/OpenSim/Framework/Monitoring/ChecksManager.cs
index e4a7f8c..ff3b041 100644
--- a/OpenSim/Framework/Monitoring/ChecksManager.cs
+++ b/OpenSim/Framework/Monitoring/ChecksManager.cs
@@ -132,8 +132,8 @@ namespace OpenSim.Framework.Monitoring
         /// <returns></returns>
         public static bool RegisterCheck(Check check)
         {
-            SortedDictionary<string, SortedDictionary<string, Check>> category = null, newCategory;
-            SortedDictionary<string, Check> container = null, newContainer;
+            SortedDictionary<string, SortedDictionary<string, Check>> category = null;
+            SortedDictionary<string, Check> container = null;
 
             lock (RegisteredChecks)
             {
@@ -146,19 +146,15 @@ namespace OpenSim.Framework.Monitoring
                 // We take a copy-on-write approach here of replacing dictionaries when keys are added or removed.
                 // This means that we don't need to lock or copy them on iteration, which will be a much more
                 // common operation after startup.
-                if (container != null)
-                    newContainer = new SortedDictionary<string, Check>(container);
-                else
-                    newContainer = new SortedDictionary<string, Check>();
+                if (container == null)
+                    container = new SortedDictionary<string, Check>();
 
-                if (category != null)
-                    newCategory = new SortedDictionary<string, SortedDictionary<string, Check>>(category);
-                else
-                    newCategory = new SortedDictionary<string, SortedDictionary<string, Check>>();
+                if (category == null)
+                    category = new SortedDictionary<string, SortedDictionary<string, Check>>();
 
-                newContainer[check.ShortName] = check;
-                newCategory[check.Container] = newContainer;
-                RegisteredChecks[check.Category] = newCategory;
+                container[check.ShortName] = check;
+                category[check.Container] = container;
+                RegisteredChecks[check.Category] = category;
             }
 
             return true;
@@ -171,23 +167,24 @@ namespace OpenSim.Framework.Monitoring
         /// <returns></returns>
         public static bool DeregisterCheck(Check check)
         {
-            SortedDictionary<string, SortedDictionary<string, Check>> category = null, newCategory;
-            SortedDictionary<string, Check> container = null, newContainer;
+            SortedDictionary<string, SortedDictionary<string, Check>> category = null;
+            SortedDictionary<string, Check> container = null;
 
             lock (RegisteredChecks)
             {
                 if (!TryGetCheckParents(check, out category, out container))
                     return false;
 
-                newContainer = new SortedDictionary<string, Check>(container);
-                newContainer.Remove(check.ShortName);
-
-                newCategory = new SortedDictionary<string, SortedDictionary<string, Check>>(category);
-                newCategory.Remove(check.Container);
-
-                newCategory[check.Container] = newContainer;
-                RegisteredChecks[check.Category] = newCategory;
-
+                if(container != null)
+                {
+                    container.Remove(check.ShortName);
+                    if(category != null && container.Count == 0)
+                    {
+                        category.Remove(check.Container);
+                        if(category.Count == 0)
+                            RegisteredChecks.Remove(check.Category);
+                    }
+                }
                 return true;
             }
         }
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 8787ea0..30926d8 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -80,8 +80,7 @@ namespace OpenSim.Framework.Monitoring
                     + "'all' will show all statistics.\n"
                     + "A <category> name will show statistics from that category.\n"
                     + "A <category>.<container> name will show statistics from that category in that container.\n"
-                    + "More than one name can be given separated by spaces.\n"
-                    + "THIS STATS FACILITY IS EXPERIMENTAL AND DOES NOT YET CONTAIN ALL STATS",
+                    + "More than one name can be given separated by spaces.\n",
                 HandleShowStatsCommand);
 
             console.Commands.AddCommand(
@@ -91,7 +90,6 @@ namespace OpenSim.Framework.Monitoring
                 "show stats [list|all|(<category>[.<container>])+",
                 "Alias for 'stats show' command",
                 HandleShowStatsCommand);
-
             StatsLogger.RegisterConsoleCommands(console);
         }
 
@@ -361,8 +359,8 @@ namespace OpenSim.Framework.Monitoring
         /// <returns></returns>
         public static bool RegisterStat(Stat stat)
         {
-            SortedDictionary<string, SortedDictionary<string, Stat>> category = null, newCategory;
-            SortedDictionary<string, Stat> container = null, newContainer;
+            SortedDictionary<string, SortedDictionary<string, Stat>> category = null;
+            SortedDictionary<string, Stat> container = null;
 
             lock (RegisteredStats)
             {
@@ -372,22 +370,15 @@ namespace OpenSim.Framework.Monitoring
                 if (TryGetStatParents(stat, out category, out container))
                     return false;
 
-                // We take a copy-on-write approach here of replacing dictionaries when keys are added or removed.
-                // This means that we don't need to lock or copy them on iteration, which will be a much more
-                // common operation after startup.
-                if (container != null)
-                    newContainer = new SortedDictionary<string, Stat>(container);
-                else
-                    newContainer = new SortedDictionary<string, Stat>();
+                if (container == null)
+                    container = new SortedDictionary<string, Stat>();
 
-                if (category != null)
-                    newCategory = new SortedDictionary<string, SortedDictionary<string, Stat>>(category);
-                else
-                    newCategory = new SortedDictionary<string, SortedDictionary<string, Stat>>();
+                if (category == null)
+                    category = new SortedDictionary<string, SortedDictionary<string, Stat>>();
 
-                newContainer[stat.ShortName] = stat;
-                newCategory[stat.Container] = newContainer;
-                RegisteredStats[stat.Category] = newCategory;
+                container[stat.ShortName] = stat;
+                category[stat.Container] = container;
+                RegisteredStats[stat.Category] = category;
             }
 
             return true;
@@ -400,23 +391,24 @@ namespace OpenSim.Framework.Monitoring
         /// <returns></returns>
         public static bool DeregisterStat(Stat stat)
         {
-            SortedDictionary<string, SortedDictionary<string, Stat>> category = null, newCategory;
-            SortedDictionary<string, Stat> container = null, newContainer;
+            SortedDictionary<string, SortedDictionary<string, Stat>> category = null;
+            SortedDictionary<string, Stat> container = null;
 
             lock (RegisteredStats)
             {
                 if (!TryGetStatParents(stat, out category, out container))
                     return false;
-
-                newContainer = new SortedDictionary<string, Stat>(container);
-                newContainer.Remove(stat.ShortName);
-
-                newCategory = new SortedDictionary<string, SortedDictionary<string, Stat>>(category);
-                newCategory.Remove(stat.Container);
-
-                newCategory[stat.Container] = newContainer;
-                RegisteredStats[stat.Category] = newCategory;
-
+                
+                if(container != null)
+                {
+                    container.Remove(stat.ShortName);
+                    if(category != null && container.Count == 0)
+                    {
+                        category.Remove(stat.Container);
+                        if(category.Count == 0)
+                            RegisteredStats.Remove(stat.Category);
+                    }
+                }
                 return true;
             }
         }
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index b2c1fb1..ff439f5 100644
--- a/OpenSim/Framework/Monitoring/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -332,18 +332,18 @@ namespace OpenSim.Framework.Monitoring
             if (callback != null)
             {
                 List<ThreadWatchdogInfo> callbackInfos = null;
-                List<ThreadWatchdogInfo> threadsInfo;
+                List<ThreadWatchdogInfo> threadsToRemove = null;
 
                 lock (m_threads)
                 {
-                    // get a copy since we may change m_threads
-                    threadsInfo = m_threads.Values.ToList();
-
-                    foreach(ThreadWatchdogInfo threadInfo in threadsInfo)
+                    foreach(ThreadWatchdogInfo threadInfo in m_threads.Values)
                     {
                         if(threadInfo.Thread.ThreadState == ThreadState.Stopped)
                         {
-                            RemoveThread(threadInfo.Thread.ManagedThreadId);
+                            if(threadsToRemove == null)
+                                threadsToRemove = new List<ThreadWatchdogInfo>();
+
+                            threadsToRemove.Add(threadInfo);
 
                             if(callbackInfos == null)
                                 callbackInfos = new List<ThreadWatchdogInfo>();
@@ -365,6 +365,10 @@ namespace OpenSim.Framework.Monitoring
                             }
                         }
                     }
+
+                    if(threadsToRemove != null)
+                        foreach(ThreadWatchdogInfo twi in threadsToRemove)
+                            RemoveThread(twi.Thread.ManagedThreadId);
                 }
 
                 if(callbackInfos != null)
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 1ac5059..e431042 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -461,8 +461,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             
             OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
-//            resp.ReuseContext = true;
-            resp.ReuseContext = false;
+            resp.ReuseContext = true;
+//            resp.ReuseContext = false;
             HandleRequest(req, resp);           
 
             // !!!HACK ALERT!!!
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index b330384..7b806a4 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -842,7 +842,7 @@ namespace OpenSim.Framework.Servers
                 {
                     StreamReader RevisionFile = File.OpenText(svnRevisionFileName);
                     buildVersion = RevisionFile.ReadLine();
-                    buildVersion.Trim();
+                    buildVersion = buildVersion.Trim();
                     RevisionFile.Close();
                 }
 
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 96b91ff..01a06cd 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -705,8 +705,10 @@ namespace OpenSim.Framework
 
         private static byte[] ComputeSHA1Hash(byte[] src)
         {
-            SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider();
-            return SHA1.ComputeHash(src);
+            byte[] ret;
+            using(SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
+                 ret = SHA1.ComputeHash(src);
+            return ret;
         }
 
         public static int fast_distance2d(int x, int y)