Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2 files changed, 12 insertions, 1 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index a8f3a9e..605909d 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -192,8 +192,19 @@ namespace OpenSim.Framework.Servers
                         "threads show",
                         "Show thread status.  Synonym for \"show threads\"",
                         (string module, string[] args) => Notice(GetThreadsReport()));
+
+                m_console.Commands.AddCommand("General", false, "force gc",
+                        "force gc",
+                        "Manually invoke runtime garbage collection.  For debugging purposes",
+                        HandleForceGc);
             }
         }
+
+        private void HandleForceGc(string module, string[] args)
+        {
+            MainConsole.Instance.Output("Manually invoking runtime garbage collection");
+            GC.Collect();
+        }
         
         /// <summary>
         /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 74551ea..e76a37b 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -548,7 +548,7 @@ namespace OpenSim.Framework
         /// <summary>
         /// Determines whether a point is inside a bounding box.
         /// </summary>
-        /// <param name='v'>/param>
+        /// <param name='v'></param>
         /// <param name='min'></param>
         /// <param name='max'></param>
         /// <returns></returns>