minor: Add comment as to why we are pulcking plain old ints out of the LSL_List when converting values from LSL for modInvoke()

system ints can end up in LSL lists, which can cause counter-intuitive unknown list element type errors in ConvertFromLSL (via modInvoke)
Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations since the call itself does nothing and the return value is ignored by all callers.
2012-11-28 02:55:58 +00:00 · 2012-11-28 02:55:36 +00:00 · 2012-11-28 02:55:26 +00:00 · 2012-11-28 02:55:15 +00:00 · 2012-11-28 02:55:08 +00:00 · 2012-11-28 02:55:00 +00:00
585 changed files with 20332 additions and 43980 deletions
@@ -95,5 +95,3 @@ OpenSim/Region/ScriptEngine/test-results/
 OpenSim/Tests/Common/test-results/
 OpenSim/Tests/test-results/
 test-results/
-doc/html
-doc/doxygen.error.log
@@ -43,7 +43,6 @@
  <delete dir="${distbindir}/Prebuild"/>
  <delete dir="${distbindir}/%temp%"/>
  <delete dir="${distbindir}/.nant"/>
-  <delete dir="${distbindir}/ThirdParty"/>
  <delete>
    <fileset basedir="${distbindir}">
      <include name="compile.bat"/>
@@ -133,16 +132,6 @@
  </exec>
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 

-  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.server.handlers.tests">
-    <arg value="./bin/OpenSim.Server.Handlers.Tests.dll" />
-  </exec>
-  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.server.handlers.tests)==0}" /> 
-
-  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.services.inventoryservice.tests">
-    <arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" />
-  </exec>
-  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
-
  <delete dir="%temp%"/>
 </target>

@@ -246,16 +235,6 @@
    <arg value="-xml=test-results/OpenSim.Capabilities.Handlers.Tests.dll-Results.xml" />
  </exec>

- <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.server.handlers.tests">
-    <arg value="./bin/OpenSim.Server.Handlers.Tests.dll" />
-    <arg value="-xml=test-results/OpenSim.Server.Handlers.Tests.dll-Results.xml" />
-  </exec>
-
- <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.services.inventoryservice.tests">
-    <arg value="./bin/OpenSim.Services.InventoryService.Tests.dll" />
-    <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" />
-  </exec>
-
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 
@@ -266,7 +245,6 @@
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> 
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
 </target>

 <target name="doxygen">
@@ -1,4 +1,6 @@
-# Building on Windows
+==== Building OpenSim ====
+
+=== Building on Windows ===

 Steps:
 * runprebuild.bat
@@ -7,15 +9,16 @@ Steps:
 * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include
 * run OpenSim.exe

-# Building on Linux
+=== Building on Linux ===

 Prereqs:
-*	Mono >= 2.4.3
-*	Nant >= 0.85
-*	On some Linux distributions you may need to install additional packages.
-	See http://opensimulator.org/wiki/Dependencies for more information.
-*	May also use xbuild (included in mono distributions)
-*	May use Monodevelop, a cross-platform IDE
+ * Mono >= 2.4.3
+ * Nant >= 0.85
+ * On some Linux distributions you may need to install additional packages.  
+    See http://opensimulator.org/wiki/Dependencies for more information.
+
+ * May also use xbuild (included in mono distributions)
+ * May use Monodevelop, a cross-platform IDE 

 From the distribution type:
 * ./runprebuild.sh
@@ -24,13 +27,13 @@ From the distribution type:
 * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include
 * run mono OpenSim.exe

-# Using Monodevelop
+=== Using Monodevelop ===

 From the distribution type:
 * ./runprebuild.sh
 * type monodevelop OpenSim.sln

-# References
+=== References ===
 
 Helpful resources:
 * http://opensimulator.org/wiki/Build_Instructions
@@ -1,5 +1,5 @@
   <<<>>>>The following people have contributed to OpenSim (Thank you 
-for your effort!) 
+for your effort!)

 = Current OpenSim Developers (in very rough order of appearance) =
 These folks represent the current core team for OpenSim, and are the
@@ -16,7 +16,7 @@ people that make the day to day of OpenSim happen.
 * BlueWall (James Hughes)
 * Nebadon Izumi (Michael Cerquoni, OSgrid)
 * Snoopy Pfeffer
-* Robert Adams (Intel)
+* Richard Adams (Intel)

 = Core Developers Following the White Rabbit =
 Core developers who have temporarily (we hope) gone chasing the white rabbit. 
@@ -92,8 +92,6 @@ what it is today.
 * Flyte Xevious
 * Garmin Kawaguichi
 * Gryc Ueusp
-* Hiro Lecker
-* Iain Oliver
 * Imaze Rhiano
 * Intimidated
 * Jeremy Bongio (IBM)
@@ -183,14 +181,12 @@ what it is today.

 This software uses components from the following developers:
 * Sleepycat Software (Berkeley DB)
-* Aurora-Sim (http://aurora-sim.org)
 * SQLite (Public Domain)
 * XmlRpcCS (http://xmlrpccs.sf.net/)
 * MySQL, Inc. (MySQL Connector/NET)
 * NUnit (http://www.nunit.org)
 * AGEIA Inc. (PhysX)
 * Russel L. Smith (ODE)
-* Erwin Coumans (Bullet)
 * Prebuild (http://sourceforge.net/projects/dnpb/)
 * LibOpenMetaverse (http://lib.openmetaverse.org/)
 * DotNetOpenMail v0.5.8b (http://dotnetopenmail.sourceforge.net)
@@ -212,4 +208,3 @@ In addition, we would like to thank:
 * The NANT Developers
 * Microsoft (.NET, MSSQL-Adapters)
 *x
-  
@@ -99,12 +99,12 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
            RegionInfo[] regionsToLoad = regionLoader.LoadRegions();

            m_log.Info("[LOAD REGIONS PLUGIN]: Loading specific shared modules...");
-            //m_log.Info("[LOAD REGIONS PLUGIN]: DynamicTextureModule...");
-            //m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
-            //m_log.Info("[LOAD REGIONS PLUGIN]: LoadImageURLModule...");
-            //m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
-            //m_log.Info("[LOAD REGIONS PLUGIN]: XMLRPCModule...");
-            //m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
+            m_log.Info("[LOAD REGIONS PLUGIN]: DynamicTextureModule...");
+            m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
+            m_log.Info("[LOAD REGIONS PLUGIN]: LoadImageURLModule...");
+            m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
+            m_log.Info("[LOAD REGIONS PLUGIN]: XMLRPCModule...");
+            m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
 //            m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule...");
 //            m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule());
            m_log.Info("[LOAD REGIONS PLUGIN]: Done.");
@@ -136,6 +136,9 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                    }
                }
            }
+
+            m_openSim.ModuleLoader.PostInitialise();
+            m_openSim.ModuleLoader.ClearCache();
        }

        public void Dispose()
@@ -60,7 +60,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("0.7.5.*")]
+// [assembly: AssemblyVersion("0.6.5.*")]

-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.6.5.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.ApplicationPlugins.RegionModulesController")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("c023816d-194e-40c1-9195-a0f281d4ac5d")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -215,7 +215,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
            }
        }

-#region Region Module interfacesController implementation
+#region IRegionModulesController implementation
        
        /// <summary>
        /// Check that the given module is no disabled in the [Modules] section of the config files.
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.ApplicationPlugins.RemoteController")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("Copyright OpenSimulator developers ©  2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("efec6e69-fc4a-4e21-86e6-4a261c12d4db")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -728,6 +728,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                responseData["success"] = true;
                responseData["region_name"] = region.RegionName;
                responseData["region_id"] = region.RegionID.ToString();
+                responseData["region_uuid"] = region.RegionID.ToString(); //Deprecate July 2012

                m_log.Info("[RADMIN]: CreateRegion: request complete");
            }
@@ -1368,8 +1369,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
        ///       <description>profile url</description></item>
        /// <item><term>noassets</term>
        ///       <description>true if no assets should be saved</description></item>
-        /// <item><term>all</term>
-        ///       <description>true to save all the regions in the simulator</description></item>
        /// <item><term>perm</term>
        ///       <description>C and/or T</description></item>
        /// </list>
@@ -1426,11 +1425,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                    options["checkPermissions"] = (string)requestData["perm"];
                }

-                if ((string)requestData["all"] == "true")
-                {
-                    options["all"] = (string)requestData["all"];
-                }
-
                IRegionArchiverModule archiver = scene.RequestModuleInterface<IRegionArchiverModule>();

                if (archiver != null)
@@ -1880,6 +1874,29 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            {
                return;
            }
+            #region Deprecate July 2012
+            //region_ID, regionid, region_uuid will be deprecated in July 2012!!!!!!
+            else if (requestData.ContainsKey("regionid") &&
+                !String.IsNullOrEmpty((string)requestData["regionid"]))
+            {
+                m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
+            }
+            else if (requestData.ContainsKey("region_ID") &&
+                !String.IsNullOrEmpty((string)requestData["region_ID"]))
+            {
+                m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
+            }
+            else if (requestData.ContainsKey("regionID") &&
+                !String.IsNullOrEmpty((string)requestData["regionID"]))
+            {
+                m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
+            }
+            else if (requestData.ContainsKey("region_uuid") &&
+                !String.IsNullOrEmpty((string)requestData["region_uuid"]))
+            {
+                m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
+            }
+            #endregion
            else
            {
                responseData["accepted"] = false;
@@ -1901,6 +1918,56 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                    throw new Exception(String.Format("Region ID {0} not found", regionID));
                }
            }
+            #region Deprecate July 2012
+            else if (requestData.ContainsKey("regionid") &&
+                !String.IsNullOrEmpty((string)requestData["regionid"]))
+            {
+                m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
+
+                UUID regionID = (UUID)(string)requestData["regionid"];
+                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
+                {
+                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
+                    throw new Exception(String.Format("Region ID {0} not found", regionID));
+                }
+            }
+            else if (requestData.ContainsKey("region_ID") &&
+                !String.IsNullOrEmpty((string)requestData["region_ID"]))
+            {
+                m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
+
+                UUID regionID = (UUID)(string)requestData["region_ID"];
+                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
+                {
+                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
+                    throw new Exception(String.Format("Region ID {0} not found", regionID));
+                }
+            }
+            else if (requestData.ContainsKey("regionID") &&
+                !String.IsNullOrEmpty((string)requestData["regionID"]))
+            {
+                m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
+
+                UUID regionID = (UUID)(string)requestData["regionID"];
+                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
+                {
+                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
+                    throw new Exception(String.Format("Region ID {0} not found", regionID));
+                }
+            }
+            else if (requestData.ContainsKey("region_uuid") &&
+                !String.IsNullOrEmpty((string)requestData["region_uuid"]))
+            {
+                m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
+
+                UUID regionID = (UUID)(string)requestData["region_uuid"];
+                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
+                {
+                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
+                    throw new Exception(String.Format("Region ID {0} not found", regionID));
+                }
+            }
+            #endregion
            else if (requestData.ContainsKey("region_name") &&
                !String.IsNullOrEmpty((string)requestData["region_name"]))
            {
@@ -2314,6 +2381,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                        destinationItem.Description = item.Description;
                        destinationItem.InvType = item.InvType;
                        destinationItem.CreatorId = item.CreatorId;
+                        destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
                        destinationItem.CreatorData = item.CreatorData;
                        destinationItem.NextPermissions = item.NextPermissions;
                        destinationItem.CurrentPermissions = item.CurrentPermissions;
@@ -2368,6 +2436,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                        destinationItem.Description = item.Description;
                        destinationItem.InvType = item.InvType;
                        destinationItem.CreatorId = item.CreatorId;
+                        destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
                        destinationItem.CreatorData = item.CreatorData;
                        destinationItem.NextPermissions = item.NextPermissions;
                        destinationItem.CurrentPermissions = item.CurrentPermissions;
@@ -2480,6 +2549,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                    destinationItem.Description = item.Description;
                    destinationItem.InvType = item.InvType;
                    destinationItem.CreatorId = item.CreatorId;
+                    destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
                    destinationItem.CreatorData = item.CreatorData;
                    destinationItem.NextPermissions = item.NextPermissions;
                    destinationItem.CurrentPermissions = item.CurrentPermissions;
@@ -2785,6 +2855,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                            inventoryItem.Description = GetStringAttribute(item,"desc","");
                                            inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1);
                                            inventoryItem.CreatorId = GetStringAttribute(item,"creatorid","");
+                                            inventoryItem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid","");
                                            inventoryItem.CreatorData = GetStringAttribute(item, "creatordata", "");
                                            inventoryItem.NextPermissions = GetUnsignedAttribute(perms, "next", 0x7fffffff);
                                            inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff);
@@ -246,11 +246,6 @@ namespace OpenSim.Capabilities.Handlers
                    }
                    else
                    {
-                        // Handle the case where no second range value was given.  This is equivalent to requesting
-                        // the rest of the entity.
-                        if (end == -1)
-                            end = int.MaxValue;
-
                        end = Utils.Clamp(end, 0, texture.Data.Length - 1);
                        start = Utils.Clamp(start, 0, end);
                        int len = end - start + 1;
@@ -304,43 +299,15 @@ namespace OpenSim.Capabilities.Handlers
 //                    texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length);
        }

-        /// <summary>
-        /// Parse a range header.
-        /// </summary>
-        /// <remarks>
-        /// As per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html,
-        /// this obeys range headers with two values (e.g. 533-4165) and no second value (e.g. 533-).
-        /// Where there is no value, -1 is returned.
-        /// FIXME: Need to cover the case where only a second value is specified (e.g. -4165), probably by returning -1
-        /// for start.</remarks>
-        /// <returns></returns>
-        /// <param name='header'></param>
-        /// <param name='start'>Start of the range.  Undefined if this was not a number.</param>
-        /// <param name='end'>End of the range.  Will be -1 if no end specified.  Undefined if there was a raw string but this was not a number.</param>
        private bool TryParseRange(string header, out int start, out int end)
        {
-            start = end = 0;
-
            if (header.StartsWith("bytes="))
            {
                string[] rangeValues = header.Substring(6).Split('-');
-
                if (rangeValues.Length == 2)
                {
-                    if (!Int32.TryParse(rangeValues[0], out start))
-                        return false;
-
-                    string rawEnd = rangeValues[1];
-
-                    if (rawEnd == "")
-                    {
-                        end = -1;
+                    if (Int32.TryParse(rangeValues[0], out start) && Int32.TryParse(rangeValues[1], out end))
                        return true;
-                    }
-                    else if (Int32.TryParse(rawEnd, out end))
-                    {
-                        return true;
-                    }
                }
            }

@@ -42,7 +42,7 @@ using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
 {
    [TestFixture]
-    public class GetTextureHandlerTests : OpenSimTestCase
+    public class GetTextureHandlerTests
    {
        [Test]
        public void TestTextureNotFound()
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Capabilities.Handlers")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("32350823-e1df-45e3-b7fa-0a58b4372433")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Capabilities")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("7d1a55b1-8fab-42ff-9c83-066a9cc34d76")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.ConsoleClient")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8945df94-2e5e-475b-88fa-35a7cdde6fd7")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -53,6 +53,5 @@ namespace OpenSim.Data
        bool ReportAgent(UUID sessionID, UUID regionID);
        PresenceData[] Get(string field, string data);
        bool Delete(string field, string val);
-        bool VerifyAgent(UUID agentId, UUID secureSessionID);
    }
 }
@@ -85,6 +85,21 @@ namespace OpenSim.Data
        List<RegionData> GetHyperlinks(UUID scopeID);
    }

+    [Flags]
+    public enum RegionFlags : int
+    {
+        DefaultRegion = 1, // Used for new Rez. Random if multiple defined
+        FallbackRegion = 2, // Regions we redirect to when the destination is down
+        RegionOnline = 4, // Set when a region comes online, unset when it unregisters and DeleteOnUnregister is false
+        NoDirectLogin = 8, // Region unavailable for direct logins (by name)
+        Persistent = 16, // Don't remove on unregister
+        LockedOut = 32, // Don't allow registration
+        NoMove = 64, // Don't allow moving this region
+        Reservation = 128, // This is an inactive reservation
+        Authenticate = 256, // Require authentication
+        Hyperlink = 512 // Record represents a HG link
+    }
+    
    public class RegionDataDistanceCompare : IComparer<RegionData>
    {
        private Vector2 m_origin;
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data
-{
-    public class XGroup
-    {
-        public UUID groupID;
-        public UUID ownerRoleID;
-        public string name;
-        public string charter;
-        public bool showInList; 
-        public UUID insigniaID; 
-        public int membershipFee;
-        public bool openEnrollment;
-        public bool allowPublish;
-        public bool maturePublish; 
-        public UUID founderID;
-        public ulong everyonePowers;
-        public ulong ownersPowers;
-
-        public XGroup Clone()
-        {
-            return (XGroup)MemberwiseClone();
-        }
-    }
-
-    /// <summary>
-    /// Early stub interface for groups data, not final.
-    /// </summary>
-    /// <remarks>
-    /// Currently in-use only for regression test purposes.  Needs to be filled out over time.
-    /// </remarks>
-    public interface IXGroupData
-    {
-        bool StoreGroup(XGroup group);
-        XGroup[] GetGroups(string field, string val);
-        XGroup[] GetGroups(string[] fields, string[] vals);
-        bool DeleteGroups(string field, string val);
-        bool DeleteGroups(string[] fields, string[] vals);
-    }
-}
@@ -100,18 +100,5 @@ namespace OpenSim.Data.MSSQL
            return true;
        }

-        public bool VerifyAgent(UUID agentId, UUID secureSessionID)
-        {
-            PresenceData[] ret = Get("SecureSessionID",
-                    secureSessionID.ToString());
-            
-            if (ret.Length == 0)
-                return false;
-
-            if(ret[0].UserID != agentId.ToString())
-                return false;
-
-            return true;
-        }
    }
 }
@@ -37,7 +37,6 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using RegionFlags = OpenSim.Framework.RegionFlags;

 namespace OpenSim.Data.MSSQL
 {
@@ -2202,18 +2202,5 @@ VALUES
                }
            }
        }
-
-        public void SaveExtra(UUID regionID, string name, string value)
-        {
-        }
-
-        public void RemoveExtra(UUID regionID, string name)
-        {
-        }
-
-        public Dictionary<string, string> GetExtra(UUID regionID)
-        {
-            return null;
-        }
    }
 }
@@ -122,7 +122,7 @@ namespace OpenSim.Data.MSSQL
        }
    }

-    public class MSSQLItemHandler : MSSQLInventoryHandler<XInventoryItem>
+    public class MSSQLItemHandler : MSSQLGenericTableHandler<XInventoryItem>
    {
        public MSSQLItemHandler(string c, string t, string m) :
            base(c, t, m)
@@ -131,12 +131,6 @@ namespace OpenSim.Data.MSSQL

        public bool MoveItem(string id, string newParent)
        {
-            XInventoryItem[] retrievedItems = Get(new string[] { "inventoryID" }, new string[] { id });
-            if (retrievedItems.Length == 0)
-                return false;
-
-            UUID oldParent = retrievedItems[0].parentFolderID;
-
            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
            {
                using (SqlCommand cmd = new SqlCommand())
@@ -147,16 +141,9 @@ namespace OpenSim.Data.MSSQL
                    cmd.Parameters.Add(m_database.CreateParameter("@InventoryID", id));
                    cmd.Connection = conn;
                    conn.Open();
-
-                    if (cmd.ExecuteNonQuery() == 0)
-                        return false;
+                    return cmd.ExecuteNonQuery() == 0 ? false : true;
                }
            }
-
-            IncrementFolderVersion(oldParent);
-            IncrementFolderVersion(newParent);
-
-            return true;
        }

        public XInventoryItem[] GetActiveGestures(UUID principalID)
@@ -209,13 +196,30 @@ namespace OpenSim.Data.MSSQL
            if (!base.Store(item))
                return false;

-            IncrementFolderVersion(item.parentFolderID);
+            string sql = "update inventoryfolders set version=version+1 where folderID = @folderID";
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            {
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                {
+                    conn.Open();

-            return true;
+                        cmd.Parameters.AddWithValue("@folderID", item.parentFolderID.ToString());
+                        try
+                        {
+                            cmd.ExecuteNonQuery();
+                        }
+                        catch (Exception)
+                        {
+                            return false;
+                        }
+                }
+
+                return true;
+            }
        }
    }

-    public class MSSQLFolderHandler : MSSQLInventoryHandler<XInventoryFolder>
+    public class MSSQLFolderHandler : MSSQLGenericTableHandler<XInventoryFolder>
    {
        public MSSQLFolderHandler(string c, string t, string m) :
            base(c, t, m)
@@ -224,13 +228,6 @@ namespace OpenSim.Data.MSSQL

        public bool MoveFolder(string id, string newParentFolderID)
        {
-            XInventoryFolder[] folders = Get(new string[] { "folderID" }, new string[] { id });
-
-            if (folders.Length == 0)
-                return false;
-
-            UUID oldParentFolderUUID = folders[0].parentFolderID;
-
            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
            {
                using (SqlCommand cmd = new SqlCommand())
@@ -241,65 +238,9 @@ namespace OpenSim.Data.MSSQL
                    cmd.Parameters.Add(m_database.CreateParameter("@folderID", id));
                    cmd.Connection = conn;
                    conn.Open();
-
-                    if (cmd.ExecuteNonQuery() == 0)
-                        return false;
+                    return cmd.ExecuteNonQuery() == 0 ? false : true;
                }
            }
-
-            IncrementFolderVersion(oldParentFolderUUID);
-            IncrementFolderVersion(newParentFolderID);
-
-            return true;
-        }
-
-        public override bool Store(XInventoryFolder folder)
-        {
-            if (!base.Store(folder))
-                return false;
-
-            IncrementFolderVersion(folder.parentFolderID);
-
-            return true;
-        }
-    }
-
-    public class MSSQLInventoryHandler<T> : MSSQLGenericTableHandler<T> where T: class, new()
-    {
-        public MSSQLInventoryHandler(string c, string t, string m) : base(c, t, m) {}
-
-        protected bool IncrementFolderVersion(UUID folderID)
-        {
-            return IncrementFolderVersion(folderID.ToString());
-        }
-
-        protected bool IncrementFolderVersion(string folderID)
-        {
-//            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
-//            Util.PrintCallStack();
-
-            string sql = "update inventoryfolders set version=version+1 where folderID = ?folderID";
-            
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            {
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    conn.Open();
-
-                    cmd.Parameters.AddWithValue("@folderID", folderID);
-
-                    try
-                    {
-                        cmd.ExecuteNonQuery();
-                    }
-                    catch (Exception)
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
        }
    }
 }
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:

-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.6.5.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]
@@ -95,19 +95,5 @@ namespace OpenSim.Data.MySQL

            return true;
        }
-
-        public bool VerifyAgent(UUID agentId, UUID secureSessionID)
-        {
-            PresenceData[] ret = Get("SecureSessionID",
-                    secureSessionID.ToString());
-
-            if (ret.Length == 0)
-                return false;
-
-            if(ret[0].UserID != agentId.ToString())
-                return false;
-
-            return true;
-        }
    }
 }
@@ -30,11 +30,11 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using MySql.Data.MySqlClient;
+
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Data;
-using RegionFlags = OpenSim.Framework.RegionFlags;
+using MySql.Data.MySqlClient;

 namespace OpenSim.Data.MySQL
 {
@@ -1985,74 +1985,5 @@ namespace OpenSim.Data.MySQL
                }
            }
        }
-
-        public void SaveExtra(UUID regionID, string name, string val)
-        {
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "replace into regionextra values (?RegionID, ?Name, ?value)";
-                        cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-                        cmd.Parameters.AddWithValue("?Name", name);
-                        cmd.Parameters.AddWithValue("?value", val);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-        }
-
-        public void RemoveExtra(UUID regionID, string name)
-        {
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "delete from regionextra where RegionID=?RegionID and Name=?Name";
-                        cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-                        cmd.Parameters.AddWithValue("?Name", name);
-
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-        }
-
-        public Dictionary<string, string> GetExtra(UUID regionID)
-        {
-            Dictionary<string, string> ret = new Dictionary<string, string>();
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "select * from regionextra where RegionID=?RegionID";
-                        cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-                        using (IDataReader r = cmd.ExecuteReader())
-                        {
-                            while (r.Read())
-                            {
-                                ret[r["Name"].ToString()] = r["value"].ToString();
-                            }
-                        }
-                    }
-                }
-            }
-
-            return ret;
-        }
    }
 }
@@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL
        }
    }

-    public class MySqlItemHandler : MySqlInventoryHandler<XInventoryItem>
+    public class MySqlItemHandler : MySQLGenericTableHandler<XInventoryItem>
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

@@ -241,9 +241,47 @@ namespace OpenSim.Data.MySQL

            return true;
        }
+
+        private bool IncrementFolderVersion(UUID folderID)
+        {
+            return IncrementFolderVersion(folderID.ToString());
+        }
+
+        private bool IncrementFolderVersion(string folderID)
+        {
+//            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
+//            Util.PrintCallStack();
+
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            {
+                dbcon.Open();
+
+                using (MySqlCommand cmd = new MySqlCommand())
+                {
+                    cmd.Connection = dbcon;
+
+                    cmd.CommandText = String.Format("update inventoryfolders set version=version+1 where folderID = ?folderID");
+                    cmd.Parameters.AddWithValue("?folderID", folderID);
+
+                    try
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                    catch (Exception)
+                    {
+                        return false;
+                    }
+                    cmd.Dispose();
+                }
+
+                dbcon.Close();
+            }
+
+            return true;
+        }
    }

-    public class MySqlFolderHandler : MySqlInventoryHandler<XInventoryFolder>
+    public class MySqlFolderHandler : MySQLGenericTableHandler<XInventoryFolder>
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

@@ -288,18 +326,13 @@ namespace OpenSim.Data.MySQL

            return true;
        }
-    }

-    public class MySqlInventoryHandler<T> : MySQLGenericTableHandler<T> where T: class, new()
-    {
-        public MySqlInventoryHandler(string c, string t, string m) : base(c, t, m) {}
-
-        protected bool IncrementFolderVersion(UUID folderID)
+        private bool IncrementFolderVersion(UUID folderID)
        {
            return IncrementFolderVersion(folderID.ToString());
        }

-        protected bool IncrementFolderVersion(string folderID)
+        private bool IncrementFolderVersion(string folderID)
        {
 //            m_log.DebugFormat("[MYSQL FOLDER HANDLER]: Incrementing version on folder {0}", folderID);
 //            Util.PrintCallStack();
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:

-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.6.5.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]
@@ -17,8 +17,3 @@ CREATE TABLE `GridUser` (
 ) ENGINE=InnoDB;

 COMMIT;
-
-:VERSION 2         # -------------------------- 
-BEGIN;
-
-COMMIT;
@@ -895,10 +895,3 @@ CREATE TABLE `regionenvironment` (

 COMMIT;

-:VERSION 45
-
-BEGIN;
-
-CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`));
-
-COMMIT;
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Data;
-
-namespace OpenSim.Data.Null
-{
-    /// <summary>
-    /// Not a proper generic data handler yet - probably needs to actually store the data as well instead of relying
-    /// on descendent classes
-    /// </summary>
-    public class NullGenericDataHandler
-    {
-        protected List<T> Get<T>(string[] fields, string[] vals, List<T> inputEntities)
-        {
-            List<T> entities = inputEntities;
-
-            for (int i = 0; i < fields.Length; i++)
-            {
-                entities
-                    = entities.Where(
-                        e =>
-                        {
-                            FieldInfo fi = typeof(T).GetField(fields[i]);
-                            if (fi == null)
-                                throw new NotImplementedException(string.Format("No field {0} for val {1}", fields[i], vals[i]));
-
-                            return fi.GetValue(e).ToString() == vals[i];
-                        }
-                    ).ToList();
-            }
-
-            return entities;
-        }
-    }
-}
@@ -222,13 +222,5 @@ namespace OpenSim.Data.Null
            return true;
        }

-        public bool VerifyAgent(UUID agentId, UUID secureSessionID)
-        {
-            if (Instance != this)
-                return Instance.VerifyAgent(agentId, secureSessionID);
-
-            return false;
-        }
-
    }
 }
@@ -33,7 +33,6 @@ using OpenSim.Framework;
 using OpenSim.Data;
 using System.Reflection;
 using log4net;
-using RegionFlags = OpenSim.Framework.RegionFlags;

 namespace OpenSim.Data.Null
 {
@@ -113,14 +112,11 @@ namespace OpenSim.Data.Null
            // Find region data
            List<RegionData> ret = new List<RegionData>();

-            lock (m_regionData)
+            foreach (RegionData r in m_regionData.Values)
            {
-                foreach (RegionData r in m_regionData.Values)
-                {
-                    // m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower());
+//                    m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower());
                    if (queryMatch(r.RegionName.ToLower()))
                        ret.Add(r);
-                }
            }

            if (ret.Count > 0)
@@ -136,13 +132,10 @@ namespace OpenSim.Data.Null

            List<RegionData> ret = new List<RegionData>();

-            lock (m_regionData)
+            foreach (RegionData r in m_regionData.Values)
            {
-                foreach (RegionData r in m_regionData.Values)
-                {
-                    if (r.posX == posX && r.posY == posY)
-                        ret.Add(r);
-                }
+                if (r.posX == posX && r.posY == posY)
+                    ret.Add(r);
            }

            if (ret.Count > 0)
@@ -156,11 +149,8 @@ namespace OpenSim.Data.Null
            if (m_useStaticInstance && Instance != this)
                return Instance.Get(regionID, scopeID);

-            lock (m_regionData)
-            {
-                if (m_regionData.ContainsKey(regionID))
-                    return m_regionData[regionID];
-            }
+            if (m_regionData.ContainsKey(regionID))
+                return m_regionData[regionID];

            return null;
        }
@@ -172,13 +162,10 @@ namespace OpenSim.Data.Null

            List<RegionData> ret = new List<RegionData>();

-            lock (m_regionData)
+            foreach (RegionData r in m_regionData.Values)
            {
-                foreach (RegionData r in m_regionData.Values)
-                {
-                    if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY)
-                        ret.Add(r);
-                }
+                if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY)
+                    ret.Add(r);
            }

            return ret;
@@ -192,10 +179,7 @@ namespace OpenSim.Data.Null
 //            m_log.DebugFormat(
 //                "[NULL REGION DATA]: Storing region {0} {1}, scope {2}", data.RegionName, data.RegionID, data.ScopeID);

-            lock (m_regionData)
-            {
-                m_regionData[data.RegionID] = data;
-            }
+            m_regionData[data.RegionID] = data;

            return true;
        }
@@ -205,13 +189,10 @@ namespace OpenSim.Data.Null
            if (m_useStaticInstance && Instance != this)
                return Instance.SetDataItem(regionID, item, value);

-            lock (m_regionData)
-            {
-                if (!m_regionData.ContainsKey(regionID))
-                    return false;
+            if (!m_regionData.ContainsKey(regionID))
+                return false;

-                m_regionData[regionID].Data[item] = value;
-            }
+            m_regionData[regionID].Data[item] = value;

            return true;
        }
@@ -223,13 +204,10 @@ namespace OpenSim.Data.Null

 //            m_log.DebugFormat("[NULL REGION DATA]: Deleting region {0}", regionID);

-            lock (m_regionData)
-            {
-                if (!m_regionData.ContainsKey(regionID))
-                    return false;
+            if (!m_regionData.ContainsKey(regionID))
+                return false;

-                m_regionData.Remove(regionID);
-            }
+            m_regionData.Remove(regionID);

            return true;
        }
@@ -259,13 +237,10 @@ namespace OpenSim.Data.Null

            List<RegionData> ret = new List<RegionData>();

-            lock (m_regionData)
+            foreach (RegionData r in m_regionData.Values)
            {
-                foreach (RegionData r in m_regionData.Values)
-                {
-                    if ((Convert.ToInt32(r.Data["flags"]) & regionFlags) != 0)
-                        ret.Add(r);
-                }
+                if ((Convert.ToInt32(r.Data["flags"]) & regionFlags) != 0)
+                    ret.Add(r);
            }

            return ret;
@@ -151,18 +151,5 @@ namespace OpenSim.Data.Null
        public void Shutdown()
        {
        }
-
-        public void SaveExtra(UUID regionID, string name, string value)
-        {
-        }
-
-        public void RemoveExtra(UUID regionID, string name)
-        {
-        }
-
-        public Dictionary<string, string> GetExtra(UUID regionID)
-        {
-            return null;
-        }
    }
 }
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:

-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.6.5.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:

-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.6.5.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:

-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.6.5.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]
@@ -202,8 +202,7 @@ namespace OpenSim.Data.SQLite
        /// <returns>True if exist, or false.</returns>
        override public bool ExistsAsset(UUID uuid)
        {
-            lock (this) 
-            {
+            lock (this) {
                using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
                {
                    cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString()));
@@ -354,13 +353,12 @@ namespace OpenSim.Data.SQLite
        {
            lock (this)
            {
-                using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
-                {
-                    cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString()));
-                    cmd.ExecuteNonQuery();
-                }
+            using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
+            {
+                cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString()));
+                cmd.ExecuteNonQuery();
+            }
            }
-
            return true;
        }

@@ -82,14 +82,11 @@ namespace OpenSim.Data.SQLite
        {
            AuthenticationData ret = new AuthenticationData();
            ret.Data = new Dictionary<string, object>();
-            IDataReader result;

-            using (SqliteCommand cmd = new SqliteCommand("select * from `" + m_Realm + "` where UUID = :PrincipalID"))
-            {
-                cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));
+            SqliteCommand cmd = new SqliteCommand("select * from `" + m_Realm + "` where UUID = :PrincipalID");
+            cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));

-                result = ExecuteReader(cmd, m_Connection);
-            }
+            IDataReader result = ExecuteReader(cmd, m_Connection);

            try
            {
@@ -124,6 +121,10 @@ namespace OpenSim.Data.SQLite
            catch
            {
            }
+            finally
+            {
+                //CloseCommand(cmd);
+            }

            return null;
        }
@@ -139,81 +140,84 @@ namespace OpenSim.Data.SQLite
            foreach (object o in data.Data.Values)
                values[i++] = o.ToString();

-            using (SqliteCommand cmd = new SqliteCommand())
+            SqliteCommand cmd = new SqliteCommand();
+
+            if (Get(data.PrincipalID) != null)
            {
-                if (Get(data.PrincipalID) != null)
+
+
+                string update = "update `" + m_Realm + "` set ";
+                bool first = true;
+                foreach (string field in fields)
                {
+                    if (!first)
+                        update += ", ";
+                    update += "`" + field + "` = :" + field;
+                    cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));

+                    first = false;
+                }

-                    string update = "update `" + m_Realm + "` set ";
-                    bool first = true;
-                    foreach (string field in fields)
+                update += " where UUID = :UUID";
+                cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
+
+                cmd.CommandText = update;
+                try
+                {
+                    if (ExecuteNonQuery(cmd, m_Connection) < 1)
                    {
-                        if (!first)
-                            update += ", ";
-                        update += "`" + field + "` = :" + field;
-                        cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));
-
-                        first = false;
-                    }
-
-                    update += " where UUID = :UUID";
-                    cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
-
-                    cmd.CommandText = update;
-                    try
-                    {
-                        if (ExecuteNonQuery(cmd, m_Connection) < 1)
-                        {
-                            //CloseCommand(cmd);
-                            return false;
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error("[SQLITE]: Exception storing authentication data", e);
                        //CloseCommand(cmd);
                        return false;
                    }
                }
-                else
+                catch (Exception e)
                {
-                    string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
-                            String.Join("`, `", fields) +
-                            "`) values (:UUID, :" + String.Join(", :", fields) + ")";
+                    m_log.Error("[SQLITE]: Exception storing authentication data", e);
+                    //CloseCommand(cmd);
+                    return false;
+                }
+            }

-                    cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
-                    foreach (string field in fields)
-                        cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));
+            else
+            {
+                string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
+                        String.Join("`, `", fields) +
+                        "`) values (:UUID, :" + String.Join(", :", fields) + ")";

-                    cmd.CommandText = insert;
+                cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
+                foreach (string field in fields)
+                    cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));

-                    try
+                cmd.CommandText = insert;
+
+                try
+                {
+                    if (ExecuteNonQuery(cmd, m_Connection) < 1)
                    {
-                        if (ExecuteNonQuery(cmd, m_Connection) < 1)
-                        {
-                            return false;
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine(e.ToString());
+                        //CloseCommand(cmd);
                        return false;
                    }
                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                    //CloseCommand(cmd);
+                    return false;
+                }
            }

+            //CloseCommand(cmd);
+
            return true;
        }

        public bool SetDataItem(UUID principalID, string item, string value)
        {
-            using (SqliteCommand cmd = new SqliteCommand("update `" + m_Realm +
-                    "` set `" + item + "` = " + value + " where UUID = '" + principalID.ToString() + "'"))
-            {
-                if (ExecuteNonQuery(cmd, m_Connection) > 0)
-                    return true;
-            }
+            SqliteCommand cmd = new SqliteCommand("update `" + m_Realm +
+                    "` set `" + item + "` = " + value + " where UUID = '" + principalID.ToString() + "'");
+
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
+                return true;

            return false;
        }
@@ -223,13 +227,16 @@ namespace OpenSim.Data.SQLite
            if (System.Environment.TickCount - m_LastExpire > 30000)
                DoExpire();

-            using (SqliteCommand cmd = new SqliteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() + 
-                "', '" + token + "', datetime('now', 'localtime', '+" + lifetime.ToString() + " minutes'))"))
+            SqliteCommand cmd = new SqliteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() + 
+                "', '" + token + "', datetime('now', 'localtime', '+" + lifetime.ToString() + " minutes'))");
+
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
            {
-                if (ExecuteNonQuery(cmd, m_Connection) > 0)
-                    return true;
+                cmd.Dispose();
+                return true;
            }

+            cmd.Dispose();
            return false;
        }

@@ -238,22 +245,28 @@ namespace OpenSim.Data.SQLite
            if (System.Environment.TickCount - m_LastExpire > 30000)
                DoExpire();

-            using (SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() + 
-                " minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')"))
+            SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() + 
+                " minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')");
+
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
            {
-                if (ExecuteNonQuery(cmd, m_Connection) > 0)
-                    return true;
+                cmd.Dispose();
+                return true;
            }

+            cmd.Dispose();
+
            return false;
        }

        private void DoExpire()
        {
-            using (SqliteCommand cmd = new SqliteCommand("delete from tokens where validity < datetime('now', 'localtime')"))
-                ExecuteNonQuery(cmd, m_Connection);
+            SqliteCommand cmd = new SqliteCommand("delete from tokens where validity < datetime('now', 'localtime')");
+            ExecuteNonQuery(cmd, m_Connection);
+
+            cmd.Dispose();

            m_LastExpire = System.Environment.TickCount;
        }
    }
-}
+}
@@ -56,17 +56,23 @@ namespace OpenSim.Data.SQLite

        public bool Delete(UUID principalID, string name)
        {
-            using (SqliteCommand cmd = new SqliteCommand())
-            {
-                cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = :PrincipalID and `Name` = :Name", m_Realm);
-                cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
-                cmd.Parameters.AddWithValue(":Name", name);
+            SqliteCommand cmd = new SqliteCommand();

+            cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = :PrincipalID and `Name` = :Name", m_Realm);
+            cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
+            cmd.Parameters.AddWithValue(":Name", name);
+
+            try
+            {
                if (ExecuteNonQuery(cmd, m_Connection) > 0)
                    return true;
-            }

-            return false;
+                return false;
+            }
+            finally
+            {
+                //CloseCommand(cmd);
+            }
        }
    }
-}
+}
@@ -104,13 +104,12 @@ namespace OpenSim.Data.SQLite
        {
            string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = :RegionID";

-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {
-                cmd.CommandText = sql;
-                cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();

-                return DoLoad(cmd, regionID, create);
-            }
+            cmd.CommandText = sql;
+            cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
+
+            return DoLoad(cmd, regionID, create);
        }

        private EstateSettings DoLoad(SqliteCommand cmd, UUID regionID, bool create)
@@ -187,40 +186,38 @@ namespace OpenSim.Data.SQLite
        {
            List<string> names = new List<string>(FieldList);

+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
            IDataReader r = null;

-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {            
-                names.Remove("EstateID");
+            names.Remove("EstateID");

-                string sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( :"+String.Join(", :", names.ToArray())+")";
+            string sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( :"+String.Join(", :", names.ToArray())+")";

-                cmd.CommandText = sql;
-                cmd.Parameters.Clear();
+            cmd.CommandText = sql;
+            cmd.Parameters.Clear();

-                foreach (string name in FieldList)
+            foreach (string name in FieldList)
+            {
+                if (m_FieldMap[name].GetValue(es) is bool)
                {
-                    if (m_FieldMap[name].GetValue(es) is bool)
-                    {
-                        if ((bool)m_FieldMap[name].GetValue(es))
-                            cmd.Parameters.AddWithValue(":"+name, "1");
-                        else
-                            cmd.Parameters.AddWithValue(":"+name, "0");
-                    }
+                    if ((bool)m_FieldMap[name].GetValue(es))
+                        cmd.Parameters.AddWithValue(":"+name, "1");
                    else
-                    {
-                        cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
-                    }
+                        cmd.Parameters.AddWithValue(":"+name, "0");
+                }
+                else
+                {
+                    cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
                }
-
-                cmd.ExecuteNonQuery();
-
-                cmd.CommandText = "select LAST_INSERT_ROWID() as id";
-                cmd.Parameters.Clear();
-
-                r = cmd.ExecuteReader();
            }

+            cmd.ExecuteNonQuery();
+
+            cmd.CommandText = "select LAST_INSERT_ROWID() as id";
+            cmd.Parameters.Clear();
+
+            r = cmd.ExecuteReader();
+
            r.Read();

            es.EstateID = Convert.ToUInt32(r["id"]);
@@ -242,28 +239,27 @@ namespace OpenSim.Data.SQLite

            string sql = "update estate_settings set "+String.Join(", ", terms.ToArray())+" where EstateID = :EstateID";

-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
+
+            cmd.CommandText = sql;
+
+            foreach (string name in FieldList)
            {
-                cmd.CommandText = sql;
-
-                foreach (string name in FieldList)
+                if (m_FieldMap[name].GetValue(es) is bool)
                {
-                    if (m_FieldMap[name].GetValue(es) is bool)
-                    {
-                        if ((bool)m_FieldMap[name].GetValue(es))
-                            cmd.Parameters.AddWithValue(":"+name, "1");
-                        else
-                            cmd.Parameters.AddWithValue(":"+name, "0");
-                    }
+                    if ((bool)m_FieldMap[name].GetValue(es))
+                        cmd.Parameters.AddWithValue(":"+name, "1");
                    else
-                    {
-                        cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
-                    }
+                        cmd.Parameters.AddWithValue(":"+name, "0");
+                }
+                else
+                {
+                    cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
                }
-
-                cmd.ExecuteNonQuery();
            }

+            cmd.ExecuteNonQuery();
+
            SaveBanList(es);
            SaveUUIDList(es.EstateID, "estate_managers", es.EstateManagers);
            SaveUUIDList(es.EstateID, "estate_users", es.EstateAccess);
@@ -274,15 +270,12 @@ namespace OpenSim.Data.SQLite
        {
            es.ClearBans();

-            IDataReader r;
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();

-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {
-                cmd.CommandText = "select bannedUUID from estateban where EstateID = :EstateID";
-                cmd.Parameters.AddWithValue(":EstateID", es.EstateID);
+            cmd.CommandText = "select bannedUUID from estateban where EstateID = :EstateID";
+            cmd.Parameters.AddWithValue(":EstateID", es.EstateID);

-                r = cmd.ExecuteReader();
-            }
+            IDataReader r = cmd.ExecuteReader();

            while (r.Read())
            {
@@ -301,64 +294,60 @@ namespace OpenSim.Data.SQLite

        private void SaveBanList(EstateSettings es)
        {
-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
+
+            cmd.CommandText = "delete from estateban where EstateID = :EstateID";
+            cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
+
+            cmd.ExecuteNonQuery();
+
+            cmd.Parameters.Clear();
+
+            cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( :EstateID, :bannedUUID, '', '', '' )";
+
+            foreach (EstateBan b in es.EstateBans)
            {
-                cmd.CommandText = "delete from estateban where EstateID = :EstateID";
                cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
+                cmd.Parameters.AddWithValue(":bannedUUID", b.BannedUserID.ToString());

                cmd.ExecuteNonQuery();
-
                cmd.Parameters.Clear();
-
-                cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( :EstateID, :bannedUUID, '', '', '' )";
-
-                foreach (EstateBan b in es.EstateBans)
-                {
-                    cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
-                    cmd.Parameters.AddWithValue(":bannedUUID", b.BannedUserID.ToString());
-
-                    cmd.ExecuteNonQuery();
-                    cmd.Parameters.Clear();
-                }
            }
        }

        void SaveUUIDList(uint EstateID, string table, UUID[] data)
        {
-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
+
+            cmd.CommandText = "delete from "+table+" where EstateID = :EstateID";
+            cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
+
+            cmd.ExecuteNonQuery();
+
+            cmd.Parameters.Clear();
+
+            cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )";
+
+            foreach (UUID uuid in data)
            {
-                cmd.CommandText = "delete from "+table+" where EstateID = :EstateID";
                cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
+                cmd.Parameters.AddWithValue(":uuid", uuid.ToString());

                cmd.ExecuteNonQuery();
-
                cmd.Parameters.Clear();
-
-                cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( :EstateID, :uuid )";
-
-                foreach (UUID uuid in data)
-                {
-                    cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
-                    cmd.Parameters.AddWithValue(":uuid", uuid.ToString());
-
-                    cmd.ExecuteNonQuery();
-                    cmd.Parameters.Clear();
-                }
            }
        }

        UUID[] LoadUUIDList(uint EstateID, string table)
        {
            List<UUID> uuids = new List<UUID>();
-            IDataReader r;

-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {
-                cmd.CommandText = "select uuid from "+table+" where EstateID = :EstateID";
-                cmd.Parameters.AddWithValue(":EstateID", EstateID);
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();

-                r = cmd.ExecuteReader();
-            }
+            cmd.CommandText = "select uuid from "+table+" where EstateID = :EstateID";
+            cmd.Parameters.AddWithValue(":EstateID", EstateID);
+
+            IDataReader r = cmd.ExecuteReader();

            while (r.Read())
            {
@@ -378,13 +367,12 @@ namespace OpenSim.Data.SQLite
        {
            string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID = :EstateID";

-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {
-                cmd.CommandText = sql;
-                cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();

-                return DoLoad(cmd, UUID.Zero, false);
-            }
+            cmd.CommandText = sql;
+            cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
+
+            return DoLoad(cmd, UUID.Zero, false);
        }
        
        public List<EstateSettings> LoadEstateSettingsAll()
@@ -403,15 +391,13 @@ namespace OpenSim.Data.SQLite
            List<int> result = new List<int>();

            string sql = "select EstateID from estate_settings where estate_settings.EstateName = :EstateName";
-            IDataReader r;

-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {
-                cmd.CommandText = sql;
-                cmd.Parameters.AddWithValue(":EstateName", search);
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();

-                r = cmd.ExecuteReader();
-            }
+            cmd.CommandText = sql;
+            cmd.Parameters.AddWithValue(":EstateName", search);
+
+            IDataReader r = cmd.ExecuteReader();

            while (r.Read())
            {
@@ -427,14 +413,12 @@ namespace OpenSim.Data.SQLite
            List<int> result = new List<int>();

            string sql = "select EstateID from estate_settings";
-            IDataReader r;

-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {
-                cmd.CommandText = sql;
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();

-                r = cmd.ExecuteReader();
-            }
+            cmd.CommandText = sql;
+
+            IDataReader r = cmd.ExecuteReader();

            while (r.Read())
            {
@@ -450,15 +434,13 @@ namespace OpenSim.Data.SQLite
            List<int> result = new List<int>();

            string sql = "select EstateID from estate_settings where estate_settings.EstateOwner = :EstateOwner";
-            IDataReader r;

-            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {
-                cmd.CommandText = sql;
-                cmd.Parameters.AddWithValue(":EstateOwner", ownerID);
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();

-                r = cmd.ExecuteReader();
-            }
+            cmd.CommandText = sql;
+            cmd.Parameters.AddWithValue(":EstateOwner", ownerID);
+
+            IDataReader r = cmd.ExecuteReader();

            while (r.Read())
            {
@@ -90,5 +90,12 @@ namespace OpenSim.Data.SQLite
                return cmd.ExecuteReader();
            }
        }
+
+        protected void CloseCommand(SqliteCommand cmd)
+        {
+            cmd.Connection.Close();
+            cmd.Connection.Dispose();
+            cmd.Dispose();
+        }
    }
-}
+}
@@ -53,13 +53,13 @@ namespace OpenSim.Data.SQLite

        public FriendsData[] GetFriends(string userID)
        {
-            using (SqliteCommand cmd = new SqliteCommand())
-            {
-                cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = :PrincipalID", m_Realm);
-                cmd.Parameters.AddWithValue(":PrincipalID", userID.ToString());
+            SqliteCommand cmd = new SqliteCommand();
+
+            cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = :PrincipalID", m_Realm);
+            cmd.Parameters.AddWithValue(":PrincipalID", userID.ToString());
+
+            return DoQuery(cmd);

-                return DoQuery(cmd);
-            }
        }

        public bool Delete(UUID principalID, string friend)
@@ -69,14 +69,13 @@ namespace OpenSim.Data.SQLite

        public bool Delete(string principalID, string friend)
        {
-            using (SqliteCommand cmd = new SqliteCommand())
-            {
-                cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm);
-                cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
-                cmd.Parameters.AddWithValue(":Friend", friend);
+            SqliteCommand cmd = new SqliteCommand();

-                ExecuteNonQuery(cmd, m_Connection);
-            }
+            cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm);
+            cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
+            cmd.Parameters.AddWithValue(":Friend", friend);
+
+            ExecuteNonQuery(cmd, m_Connection);

            return true;
        }
@@ -120,35 +120,34 @@ namespace OpenSim.Data.SQLite
            }
        }

-        public virtual T[] Get(string field, string key)
+        public T[] Get(string field, string key)
        {
            return Get(new string[] { field }, new string[] { key });
        }

-        public virtual T[] Get(string[] fields, string[] keys)
+        public T[] Get(string[] fields, string[] keys)
        {
            if (fields.Length != keys.Length)
                return new T[0];

            List<string> terms = new List<string>();

-            using (SqliteCommand cmd = new SqliteCommand())
+            SqliteCommand cmd = new SqliteCommand();
+
+            for (int i = 0 ; i < fields.Length ; i++)
            {
-                for (int i = 0 ; i < fields.Length ; i++)
-                {
-                    cmd.Parameters.Add(new SqliteParameter(":" + fields[i], keys[i]));
-                    terms.Add("`" + fields[i] + "` = :" + fields[i]);
-                }
-
-                string where = String.Join(" and ", terms.ToArray());
-
-                string query = String.Format("select * from {0} where {1}",
-                        m_Realm, where);
-
-                cmd.CommandText = query;
-
-                return DoQuery(cmd);
+                cmd.Parameters.Add(new SqliteParameter(":" + fields[i], keys[i]));
+                terms.Add("`" + fields[i] + "` = :" + fields[i]);
            }
+
+            string where = String.Join(" and ", terms.ToArray());
+
+            string query = String.Format("select * from {0} where {1}",
+                    m_Realm, where);
+
+            cmd.CommandText = query;
+
+            return DoQuery(cmd);
        }

        protected T[] DoQuery(SqliteCommand cmd)
@@ -213,55 +212,53 @@ namespace OpenSim.Data.SQLite
            return result.ToArray();
        }

-        public virtual T[] Get(string where)
+        public T[] Get(string where)
        {
-            using (SqliteCommand cmd = new SqliteCommand())
-            {
-                string query = String.Format("select * from {0} where {1}",
-                        m_Realm, where);
+            SqliteCommand cmd = new SqliteCommand();

-                cmd.CommandText = query;
+            string query = String.Format("select * from {0} where {1}",
+                    m_Realm, where);

-                return DoQuery(cmd);
-            }
+            cmd.CommandText = query;
+
+            return DoQuery(cmd);
        }

-        public virtual bool Store(T row)
+        public bool Store(T row)
        {
-            using (SqliteCommand cmd = new SqliteCommand())
+            SqliteCommand cmd = new SqliteCommand();
+
+            string query = "";
+            List<String> names = new List<String>();
+            List<String> values = new List<String>();
+
+            foreach (FieldInfo fi in m_Fields.Values)
            {
-                string query = "";
-                List<String> names = new List<String>();
-                List<String> values = new List<String>();
-
-                foreach (FieldInfo fi in m_Fields.Values)
-                {
-                    names.Add(fi.Name);
-                    values.Add(":" + fi.Name);
-                    cmd.Parameters.Add(new SqliteParameter(":" + fi.Name, fi.GetValue(row).ToString()));
-                }
-
-                if (m_DataField != null)
-                {
-                    Dictionary<string, string> data =
-                            (Dictionary<string, string>)m_DataField.GetValue(row);
-
-                    foreach (KeyValuePair<string, string> kvp in data)
-                    {
-                        names.Add(kvp.Key);
-                        values.Add(":" + kvp.Key);
-                        cmd.Parameters.Add(new SqliteParameter(":" + kvp.Key, kvp.Value));
-                    }
-                }
-
-                query = String.Format("replace into {0} (`", m_Realm) + String.Join("`,`", names.ToArray()) + "`) values (" + String.Join(",", values.ToArray()) + ")";
-
-                cmd.CommandText = query;
-
-                if (ExecuteNonQuery(cmd, m_Connection) > 0)
-                    return true;
+                names.Add(fi.Name);
+                values.Add(":" + fi.Name);
+                cmd.Parameters.Add(new SqliteParameter(":" + fi.Name, fi.GetValue(row).ToString()));
            }

+            if (m_DataField != null)
+            {
+                Dictionary<string, string> data =
+                        (Dictionary<string, string>)m_DataField.GetValue(row);
+
+                foreach (KeyValuePair<string, string> kvp in data)
+                {
+                    names.Add(kvp.Key);
+                    values.Add(":" + kvp.Key);
+                    cmd.Parameters.Add(new SqliteParameter(":" + kvp.Key, kvp.Value));
+                }
+            }
+
+            query = String.Format("replace into {0} (`", m_Realm) + String.Join("`,`", names.ToArray()) + "`) values (" + String.Join(",", values.ToArray()) + ")";
+
+            cmd.CommandText = query;
+
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
+                return true;
+
            return false;
        }

@@ -270,29 +267,28 @@ namespace OpenSim.Data.SQLite
            return Delete(new string[] { field }, new string[] { key });
        }        

-        public virtual bool Delete(string[] fields, string[] keys)
+        public bool Delete(string[] fields, string[] keys)
        {
            if (fields.Length != keys.Length)
                return false;

            List<string> terms = new List<string>();

-            using (SqliteCommand cmd = new SqliteCommand())
+            SqliteCommand cmd = new SqliteCommand();
+
+            for (int i = 0 ; i < fields.Length ; i++)
            {
-                for (int i = 0 ; i < fields.Length ; i++)
-                {
-                    cmd.Parameters.Add(new SqliteParameter(":" + fields[i], keys[i]));
-                    terms.Add("`" + fields[i] + "` = :" + fields[i]);
-                }
-
-                string where = String.Join(" and ", terms.ToArray());
-
-                string query = String.Format("delete from {0} where {1}", m_Realm, where);
-
-                cmd.CommandText = query;
-
-                return ExecuteNonQuery(cmd, m_Connection) > 0;
+                cmd.Parameters.Add(new SqliteParameter(":" + fields[i], keys[i]));
+                terms.Add("`" + fields[i] + "` = :" + fields[i]);
            }
+
+            string where = String.Join(" and ", terms.ToArray());
+
+            string query = String.Format("delete from {0} where {1}", m_Realm, where);
+
+            cmd.CommandText = query;
+
+            return ExecuteNonQuery(cmd, m_Connection) > 0;
        }
    }
 }
@@ -2905,17 +2905,5 @@ namespace OpenSim.Data.SQLite
            }
        }

-        public void SaveExtra(UUID regionID, string name, string value)
-        {
-        }
-
-        public void RemoveExtra(UUID regionID, string name)
-        {
-        }
-
-        public Dictionary<string, string> GetExtra(UUID regionID)
-        {
-            return null;
-        }
    }
 }
@@ -66,21 +66,20 @@ namespace OpenSim.Data.SQLite
            if (words.Length > 2)
                return new UserAccountData[0];

-            using (SqliteCommand cmd = new SqliteCommand())
-            {
-                if (words.Length == 1)
-                {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')",
-                        m_Realm, scopeID.ToString(), words[0]);
-                }
-                else
-                {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{3}%')", 
-                        m_Realm, scopeID.ToString(), words[0], words[1]);
-                }
+            SqliteCommand cmd = new SqliteCommand();

-                return DoQuery(cmd);
+            if (words.Length == 1)
+            {
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')",
+                    m_Realm, scopeID.ToString(), words[0]);
            }
+            else
+            {
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{3}%')", 
+                    m_Realm, scopeID.ToString(), words[0], words[1]);
+            }
+
+            return DoQuery(cmd);
        }
    }
 }
@@ -130,106 +130,44 @@ namespace OpenSim.Data.SQLite
        }
    }

-    public class SqliteItemHandler : SqliteInventoryHandler<XInventoryItem>
+    public class SqliteItemHandler : SQLiteGenericTableHandler<XInventoryItem>
    {
        public SqliteItemHandler(string c, string t, string m) :
                base(c, t, m)
        {
        }

-        public override bool Store(XInventoryItem item)
-        {
-            if (!base.Store(item))
-                return false;
-
-            IncrementFolderVersion(item.parentFolderID);
-
-            return true;
-        }
-
-        public override bool Delete(string field, string val)
-        {
-            XInventoryItem[] retrievedItems = Get(new string[] { field }, new string[] { val });
-            if (retrievedItems.Length == 0)
-                return false;
-
-            if (!base.Delete(field, val))
-                return false;
-
-            // Don't increment folder version here since Delete(string, string) calls Delete(string[], string[])
-//            IncrementFolderVersion(retrievedItems[0].parentFolderID);
-
-            return true;
-        }
-
-        public override bool Delete(string[] fields, string[] vals)
-        {
-            XInventoryItem[] retrievedItems = Get(fields, vals);
-            if (retrievedItems.Length == 0)
-                return false;
-
-            if (!base.Delete(fields, vals))
-                return false;
-
-            HashSet<UUID> deletedItemFolderUUIDs = new HashSet<UUID>();
-
-            Array.ForEach<XInventoryItem>(retrievedItems, i => deletedItemFolderUUIDs.Add(i.parentFolderID));
-
-            foreach (UUID deletedItemFolderUUID in deletedItemFolderUUIDs)
-                IncrementFolderVersion(deletedItemFolderUUID);
-
-            return true;
-        }
-
        public bool MoveItem(string id, string newParent)
        {
-            XInventoryItem[] retrievedItems = Get(new string[] { "inventoryID" }, new string[] { id });
-            if (retrievedItems.Length == 0)
-                return false;
+            SqliteCommand cmd = new SqliteCommand();

-            UUID oldParent = retrievedItems[0].parentFolderID;
+            cmd.CommandText = String.Format("update {0} set parentFolderID = :ParentFolderID where inventoryID = :InventoryID", m_Realm);
+            cmd.Parameters.Add(new SqliteParameter(":ParentFolderID", newParent));
+            cmd.Parameters.Add(new SqliteParameter(":InventoryID", id));

-            using (SqliteCommand cmd = new SqliteCommand())
-            {
-                cmd.CommandText = String.Format("update {0} set parentFolderID = :ParentFolderID where inventoryID = :InventoryID", m_Realm);
-                cmd.Parameters.Add(new SqliteParameter(":ParentFolderID", newParent));
-                cmd.Parameters.Add(new SqliteParameter(":InventoryID", id));
-
-                if (ExecuteNonQuery(cmd, m_Connection) == 0)
-                    return false;
-            }
-
-            IncrementFolderVersion(oldParent);
-            IncrementFolderVersion(newParent);
-
-            return true;
+            return ExecuteNonQuery(cmd, m_Connection) == 0 ? false : true;
        }

        public XInventoryItem[] GetActiveGestures(UUID principalID)
        {
-            using (SqliteCommand cmd  = new SqliteCommand())
-            {
-                cmd.CommandText = String.Format("select * from inventoryitems where avatarId = :uuid and assetType = :type and flags = 1", m_Realm);
+            SqliteCommand cmd  = new SqliteCommand();
+            cmd.CommandText = String.Format("select * from inventoryitems where avatarId = :uuid and assetType = :type and flags = 1", m_Realm);

-                cmd.Parameters.Add(new SqliteParameter(":uuid", principalID.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":type", (int)AssetType.Gesture));
+            cmd.Parameters.Add(new SqliteParameter(":uuid", principalID.ToString()));
+            cmd.Parameters.Add(new SqliteParameter(":type", (int)AssetType.Gesture));

-                return DoQuery(cmd);
-            }
+            return DoQuery(cmd);
        }

        public int GetAssetPermissions(UUID principalID, UUID assetID)
        {
-            IDataReader reader;
+            SqliteCommand cmd = new SqliteCommand();

-            using (SqliteCommand cmd = new SqliteCommand())
-            {
-                cmd.CommandText = String.Format("select inventoryCurrentPermissions from inventoryitems where avatarID = :PrincipalID and assetID = :AssetID", m_Realm);
-                cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":AssetID", assetID.ToString()));
+            cmd.CommandText = String.Format("select inventoryCurrentPermissions from inventoryitems where avatarID = :PrincipalID and assetID = :AssetID", m_Realm);
+            cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));
+            cmd.Parameters.Add(new SqliteParameter(":AssetID", assetID.ToString()));

-                reader = ExecuteReader(cmd, m_Connection);
-            }
+            IDataReader reader = ExecuteReader(cmd, m_Connection);

            int perms = 0;

@@ -245,80 +183,22 @@ namespace OpenSim.Data.SQLite
        }
    }

-    public class SqliteFolderHandler : SqliteInventoryHandler<XInventoryFolder>
+    public class SqliteFolderHandler : SQLiteGenericTableHandler<XInventoryFolder>
    {
        public SqliteFolderHandler(string c, string t, string m) :
                base(c, t, m)
        {
        }

-        public override bool Store(XInventoryFolder folder)
-        {
-            if (!base.Store(folder))
-                return false;
-
-            IncrementFolderVersion(folder.parentFolderID);
-
-            return true;
-        }
-
        public bool MoveFolder(string id, string newParentFolderID)
        {
-            XInventoryFolder[] folders = Get(new string[] { "folderID" }, new string[] { id });
+            SqliteCommand cmd = new SqliteCommand();

-            if (folders.Length == 0)
-                return false;
+            cmd.CommandText = String.Format("update {0} set parentFolderID = :ParentFolderID where folderID = :FolderID", m_Realm);
+            cmd.Parameters.Add(new SqliteParameter(":ParentFolderID", newParentFolderID));
+            cmd.Parameters.Add(new SqliteParameter(":FolderID", id));

-            UUID oldParentFolderUUID = folders[0].parentFolderID;
-
-            using (SqliteCommand cmd = new SqliteCommand())
-            {
-                cmd.CommandText = String.Format("update {0} set parentFolderID = :ParentFolderID where folderID = :FolderID", m_Realm);
-                cmd.Parameters.Add(new SqliteParameter(":ParentFolderID", newParentFolderID));
-                cmd.Parameters.Add(new SqliteParameter(":FolderID", id));
-
-                if (ExecuteNonQuery(cmd, m_Connection) == 0)
-                    return false;
-            }
-
-            IncrementFolderVersion(oldParentFolderUUID);
-            IncrementFolderVersion(newParentFolderID);
-
-            return true;
-        }
-
-    }
-
-    public class SqliteInventoryHandler<T> : SQLiteGenericTableHandler<T> where T: class, new()
-    {
-        public SqliteInventoryHandler(string c, string t, string m) : base(c, t, m) {}
-
-        protected bool IncrementFolderVersion(UUID folderID)
-        {
-            return IncrementFolderVersion(folderID.ToString());
-        }
-
-        protected bool IncrementFolderVersion(string folderID)
-        {
-//            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
-//            Util.PrintCallStack();
-            
-            using (SqliteCommand cmd = new SqliteCommand())
-            {
-                cmd.CommandText = "update inventoryfolders set version=version+1 where folderID = ?folderID";
-                cmd.Parameters.Add(new SqliteParameter(":folderID", folderID));
-
-                try
-                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-            }
-
-            return true;
+            return ExecuteNonQuery(cmd, m_Connection) == 0 ? false : true;
        }
    }
 }
@@ -49,7 +49,7 @@ using OpenSim.Data.SQLite;
 namespace OpenSim.Data.Tests
 {
    [TestFixture(Description = "Asset store tests (SQLite)")]
-    public class SQLiteAssetTests :  AssetTests<SqliteConnection, SQLiteAssetData>
+    public class SQLiteAssetTests : AssetTests<SqliteConnection, SQLiteAssetData>
    {
    }

@@ -33,7 +33,6 @@ using NUnit.Framework;
 using NUnit.Framework.Constraints;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Tests.Common;
 using log4net;
 using System.Data;
 using System.Data.Common;
@@ -44,12 +43,6 @@ namespace OpenSim.Data.Tests
    /// <summary>This is a base class for testing any Data service for any DBMS. 
    /// Requires NUnit 2.5 or better (to support the generics).
    /// </summary>
-    /// <remarks>
-    /// FIXME: Should extend OpenSimTestCase but compile on mono 2.4.3 currently fails with 
-    /// AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true.
-    /// and similar on EstateTests, InventoryTests and RegionTests.
-    /// Runs fine with mono 2.10.8.1, so easiest thing is to wait until min Mono version uplifts.
-    /// </remarks>
    /// <typeparam name="TConn"></typeparam>
    /// <typeparam name="TService"></typeparam>
    public class BasicDataServiceTest<TConn, TService>
@@ -36,7 +36,6 @@ using NUnit.Framework;
 using NUnit.Framework.Constraints;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Tests.Common;

 namespace OpenSim.Data.Tests
 {
@@ -255,7 +254,7 @@ namespace OpenSim.Data.Tests
    }

    [TestFixture]
-    public class PropertyCompareConstraintTest : OpenSimTestCase
+    public class PropertyCompareConstraintTest
    {
        public class HasInt
        {
@@ -34,7 +34,6 @@ using System.Text;
 using NUnit.Framework;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Tests.Common;

 namespace OpenSim.Data.Tests
 {
@@ -159,7 +158,7 @@ namespace OpenSim.Data.Tests
    }

    [TestFixture]
-    public class PropertyScramblerTests : OpenSimTestCase
+    public class PropertyScramblerTests
    {
        [Test]
        public void TestScramble()
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 //      Revision
 //

-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.6.5.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Framework.AssetLoader.Filesystem")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8cb9cf69-4771-4d3a-a2ba-bac7230de326")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-using Nini.Config;
-using log4net;
-
-using OpenMetaverse;
-
-namespace OpenSim.Framework
-{
-    public class AssetPermissions
-    {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(
-            MethodBase.GetCurrentMethod().DeclaringType);
-
-        private bool[] m_DisallowExport, m_DisallowImport;
-        private string[] m_AssetTypeNames;
-
-        public AssetPermissions(IConfig config)
-        {
-            Type enumType = typeof(AssetType);
-            m_AssetTypeNames = Enum.GetNames(enumType);
-            for (int i = 0; i < m_AssetTypeNames.Length; i++)
-                m_AssetTypeNames[i] = m_AssetTypeNames[i].ToLower();
-            int n = Enum.GetValues(enumType).Length;
-            m_DisallowExport = new bool[n];
-            m_DisallowImport = new bool[n];
-
-            LoadPermsFromConfig(config, "DisallowExport", m_DisallowExport);
-            LoadPermsFromConfig(config, "DisallowImport", m_DisallowImport);
-
-        }
-
-        private void LoadPermsFromConfig(IConfig assetConfig, string variable, bool[] bitArray)
-        {
-            if (assetConfig == null)
-                return;
-
-            string perms = assetConfig.GetString(variable, String.Empty);
-            string[] parts = perms.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-            foreach (string s in parts)
-            {
-                int index = Array.IndexOf(m_AssetTypeNames, s.Trim().ToLower());
-                if (index >= 0)
-                    bitArray[index] = true;
-                else
-                    m_log.WarnFormat("[Asset Permissions]: Invalid AssetType {0}", s);
-            }
-
-        }
-
-        public bool AllowedExport(sbyte type)
-        {
-            string assetTypeName = ((AssetType)type).ToString();
-
-            int index = Array.IndexOf(m_AssetTypeNames, assetTypeName.ToLower());
-            if (index >= 0 && m_DisallowExport[index])
-            {
-                m_log.DebugFormat("[Asset Permissions]: Export denied: configuration does not allow export of AssetType {0}", assetTypeName);
-                return false;
-            }
-
-            return true;
-        }
-
-        public bool AllowedImport(sbyte type)
-        {
-            string assetTypeName = ((AssetType)type).ToString();
-
-            int index = Array.IndexOf(m_AssetTypeNames, assetTypeName.ToLower());
-            if (index >= 0 && m_DisallowImport[index])
-            {
-                m_log.DebugFormat("[Asset Permissions]: Import denied: configuration does not allow import of AssetType {0}", assetTypeName);
-                return false;
-            }
-
-            return true;
-        }
-
-
-    }
-}
@@ -306,8 +306,6 @@ namespace OpenSim.Framework

        public AgentGroupData[] Groups;
        public Animation[] Anims;
-        public Animation DefaultAnim = null;
-        public Animation AnimState = null;

        public UUID GranterID;

@@ -392,16 +390,6 @@ namespace OpenSim.Framework
                args["animations"] = anims;
            }

-            if (DefaultAnim != null)
-            {
-                args["default_animation"] = DefaultAnim.PackUpdateMessage();
-            }
-
-            if (AnimState != null)
-            {
-                args["animation_state"] = AnimState.PackUpdateMessage();
-            }
-
            if (Appearance != null)
                args["packed_appearance"] = Appearance.Pack();

@@ -595,30 +583,6 @@ namespace OpenSim.Framework
                }
            }

-            if (args["default_animation"] != null)
-            {
-                try
-                {
-                    DefaultAnim = new Animation((OSDMap)args["default_animation"]);
-                }
-                catch
-                {
-                    DefaultAnim = null;
-                }
-            }
-
-            if (args["animation_state"] != null)
-            {
-                try
-                {
-                    AnimState = new Animation((OSDMap)args["animation_state"]);
-                }
-                catch
-                {
-                    AnimState = null;
-                }
-            }
-
            //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
            //{
            //    OSDArray textures = (OSDArray)(args["agent_textures"]);
@@ -32,12 +32,12 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.

-[assembly : AssemblyTitle("OpenSim.Framework.Communications")]
+[assembly : AssemblyTitle("OpenGrid.Framework.Communications")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("http://opensimulator.org")]
-[assembly : AssemblyProduct("OpenSim")]
-[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers")]
+[assembly : AssemblyProduct("OpenGrid.Framework.Communications")]
+[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]

@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:

-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.6.5.*")]
 [assembly : AssemblyFileVersion("0.6.5.0")]
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Framework.Configuration.HTTP")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator develoeprs")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("cb78b672-d000-4f93-88f9-dae151cc0061")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Framework.Configuration.XML")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("eeb880df-0112-4c3d-87ed-b2108d614c55")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -39,7 +39,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("http://opensimulator.org")]
 [assembly : AssemblyProduct("ServerConsole")]
-[assembly: AssemblyCopyright("Copyright (c) OpenSimulator.org Developers")]
+[assembly: AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):

-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.6.5.*")]
@@ -83,8 +83,7 @@ namespace OpenSim.Framework.Console
            = "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 all' to get a list of all commands, 
-  or type help <item>' where <item> is one of the following:";
+                = "For more information, type 'help <item>' where <item> is one of the following:";

        /// <value>
        /// Commands organized by keyword in a tree
@@ -110,48 +109,19 @@ namespace OpenSim.Framework.Console
            // Remove initial help keyword
            helpParts.RemoveAt(0);

-            help.Add(""); // Will become a newline.
-
            // General help
            if (helpParts.Count == 0)
            {
+                help.Add(""); // Will become a newline.
                help.Add(GeneralHelpText);
                help.Add(ItemHelpText);
                help.AddRange(CollectModulesHelp(tree));
            }
-            else if (helpParts.Count == 1 && helpParts[0] == "all")
-            {
-                help.AddRange(CollectAllCommandsHelp());
-            }
            else
            {
                help.AddRange(CollectHelp(helpParts));
            }

-            help.Add(""); // Will become a newline.
-
-            return help;
-        }
-
-        /// <summary>
-        /// Collects the help from all commands and return in alphabetical order.
-        /// </summary>
-        /// <returns></returns>
-        private List<string> CollectAllCommandsHelp()
-        {
-            List<string> help = new List<string>();
-
-            lock (m_modulesCommands)
-            {
-                foreach (List<CommandInfo> commands in m_modulesCommands.Values)
-                {
-                    var ourHelpText = commands.ConvertAll(c => string.Format("{0} - {1}", c.help_text, c.long_help));
-                    help.AddRange(ourHelpText);
-                }
-            }
-
-            help.Sort();
-
            return help;
        }
        
@@ -197,11 +167,14 @@ namespace OpenSim.Framework.Console

                string descriptiveHelp = commandInfo.descriptive_help;

-                // If we do have some descriptive help then insert a spacing line before for readability.
+                // If we do have some descriptive help then insert a spacing line before and after for readability.
                if (descriptiveHelp != string.Empty)
                    help.Add(string.Empty);
                
                help.Add(commandInfo.descriptive_help);
+
+                if (descriptiveHelp != string.Empty)
+                    help.Add(string.Empty);
            }
            else
            {
@@ -705,8 +678,6 @@ namespace OpenSim.Framework.Console
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-        public event OnOutputDelegate OnOutput;
-
        public ICommands Commands { get; private set; }

        public CommandConsole(string defaultPrompt) : base(defaultPrompt)
@@ -726,19 +697,12 @@ namespace OpenSim.Framework.Console
                Output(s);
        }

-        protected void FireOnOutput(string text)
-        {
-            OnOutputDelegate onOutput = OnOutput;
-            if (onOutput != null)
-                onOutput(text);
-        }
-
        /// <summary>
        /// Display a command prompt on the console and wait for user input
        /// </summary>
        public void Prompt()
        {
-            string line = ReadLine(DefaultPrompt + "# ", true, true);
+            string line = ReadLine(m_defaultPrompt + "# ", true, true);

            if (line != String.Empty)
                Output("Invalid command");
@@ -43,7 +43,15 @@ namespace OpenSim.Framework.Console

        public object ConsoleScene { get; set; }

-        public string DefaultPrompt { get; set; }
+        /// <summary>
+        /// The default prompt text.
+        /// </summary>
+        public string DefaultPrompt
+        {
+            set { m_defaultPrompt = value; }
+            get { return m_defaultPrompt; }
+        }
+        protected string m_defaultPrompt;

        public ConsoleBase(string defaultPrompt)
        {
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Console
        public List<ConsoleDisplayTableRow> Rows { get; private set; }

        /// <summary>
-        /// Number of spaces to indent the whole table.
+        /// Number of spaces to indent the table.
        /// </summary>
        public int Indent { get; set; }

@@ -84,7 +84,7 @@ namespace OpenSim.Framework.Console
            Columns.Add(new ConsoleDisplayTableColumn(name, width));
        }

-        public void AddRow(params object[] cells)
+        public void AddRow(params string[] cells)
        {
            Rows.Add(new ConsoleDisplayTableRow(cells));
        }
@@ -113,8 +113,7 @@ namespace OpenSim.Framework.Console

            for (int i = 0; i < Columns.Count; i++)
            {
-                if (i != 0)
-                    formatSb.Append(' ', TableSpacing);
+                formatSb.Append(' ', TableSpacing);

                // Can only do left formatting for now
                formatSb.AppendFormat("{{{0},-{1}}}", i, Columns[i].Width);
@@ -140,16 +139,16 @@ namespace OpenSim.Framework.Console

    public struct ConsoleDisplayTableRow
    {
-        public List<object> Cells { get; private set; }
+        public List<string> Cells { get; private set; }

-        public ConsoleDisplayTableRow(List<object> cells) : this()
+        public ConsoleDisplayTableRow(List<string> cells) : this()
        {
            Cells = cells;
        }

-        public ConsoleDisplayTableRow(params object[] cells) : this()
+        public ConsoleDisplayTableRow(params string[] cells) : this()
        {
-            Cells = new List<object>(cells);
+            Cells = new List<string>(cells);
        }
    }
 }
@@ -27,7 +27,6 @@

 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using log4net;
@@ -63,24 +62,6 @@ namespace OpenSim.Framework.Console
    
        public const string VectorSeparator = ",";
        public static char[] VectorSeparatorChars = VectorSeparator.ToCharArray();
-
-        /// <summary>
-        /// Check if the given file path exists.
-        /// </summary>
-        /// <remarks>If not, warning is printed to the given console.</remarks>
-        /// <returns>true if the file does not exist, false otherwise.</returns>
-        /// <param name='console'></param>
-        /// <param name='path'></param>
-        public static bool CheckFileDoesNotExist(ICommandConsole console, string path)
-        {
-            if (File.Exists(path))
-            {
-                console.OutputFormat("File {0} already exists.  Please move or remove it.", path);
-                return false;
-            }
-
-            return true;
-        }
    
        /// <summary>
        /// Try to parse a console UUID from the console.
@@ -97,7 +78,7 @@ namespace OpenSim.Framework.Console
            if (!UUID.TryParse(rawUuid, out uuid))
            {
                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid uuid", rawUuid);
+                    console.OutputFormat("{0} is not a valid uuid", rawUuid);

                return false;
            }
@@ -110,7 +91,7 @@ namespace OpenSim.Framework.Console
            if (!uint.TryParse(rawLocalId, out localId))
            {
                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid local id", localId);
+                    console.OutputFormat("{0} is not a valid local id", localId);

                return false;
            }
@@ -118,7 +99,7 @@ namespace OpenSim.Framework.Console
            if (localId == 0)
            {
                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid local id - it must be greater than 0", localId);
+                    console.OutputFormat("{0} is not a valid local id - it must be greater than 0", localId);

                return false;
            }
@@ -150,30 +131,10 @@ namespace OpenSim.Framework.Console
            }

            if (console != null)
-                console.OutputFormat("ERROR: {0} is not a valid UUID or local id", rawId);
+                console.OutputFormat("{0} is not a valid UUID or local id", rawId);

            return false;
        }
-
-        /// <summary>
-        /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3
-        /// </summary>
-        /// <param name='console'>Can be null if no console is available.</param>
-        /// <param name='rawConsoleVector'>/param>
-        /// <param name='vector'></param>
-        /// <returns></returns>
-        public static bool TryParseConsoleInt(ICommandConsole console, string rawConsoleInt, out int i)
-        {
-            if (!int.TryParse(rawConsoleInt, out i))
-            {
-                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid integer", rawConsoleInt);
-
-                return false;
-            }
-
-            return true;
-        }
    
        /// <summary>
        /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3
@@ -319,8 +319,6 @@ namespace OpenSim.Framework.Console

        public override void Output(string text, string level)
        {
-            FireOnOutput(text);
-
            lock (m_commandLine)
            {
                if (m_cursorYPosition == -1)
@@ -511,4 +509,4 @@ namespace OpenSim.Framework.Console
            }
        }
    }
-}
+}
@@ -40,24 +40,17 @@ namespace OpenSim.Framework.Console
    /// </summary>
    public class MockConsole : ICommandConsole
    {
-        public event OnOutputDelegate OnOutput;
-
        private MockCommands m_commands = new MockCommands();

        public ICommands Commands { get { return m_commands; } }

-        public string DefaultPrompt { get; set; }
-
        public void Prompt() {}

        public void RunCommand(string cmd) {}

        public string ReadLine(string p, bool isCommand, bool e) { return ""; }

-        public object ConsoleScene { 
-            get { return null; }
-            set {}
-        }
+        public object ConsoleScene { get { return null; } }

        public void Output(string text, string level) {}
        public void Output(string text) {}
@@ -83,4 +76,4 @@ namespace OpenSim.Framework.Console
        public string[] Resolve(string[] cmd) { return null; }
        public XmlElement GetXml(XmlDocument doc) { return null; }
    }
-}
+}
@@ -100,7 +100,6 @@ namespace OpenSim.Framework.Console
                m_LineNumber++;
                m_Scrollback.Add(String.Format("{0}", m_LineNumber)+":"+level+":"+text);
            }
-            FireOnOutput(text.Trim());
            System.Console.WriteLine(text.Trim());
        }

@@ -1,508 +0,0 @@
-/*
- * Copyright (c) 2008, openmetaverse.org, http://opensimulator.org/
- * All rights reserved.
- *
- * - Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * - Neither the name of the openmetaverse.org nor the names
- *   of its contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Threading;
-using System.Collections.Generic;
-
-namespace OpenSim.Framework
-{
-    /// <summary>
-    /// A double dictionary that is thread abort safe.
-    /// </summary>
-    /// <remarks>
-    /// This adapts OpenMetaverse.DoubleDictionary to be thread-abort safe by acquiring ReaderWriterLockSlim within
-    /// a finally section (which can't be interrupted by Thread.Abort()).
-    /// </remarks>
-    public class DoubleDictionaryThreadAbortSafe<TKey1, TKey2, TValue>
-    {
-        Dictionary<TKey1, TValue> Dictionary1;
-        Dictionary<TKey2, TValue> Dictionary2;
-        ReaderWriterLockSlim rwLock = new ReaderWriterLockSlim();
-
-        public DoubleDictionaryThreadAbortSafe()
-        {
-            Dictionary1 = new Dictionary<TKey1,TValue>();
-            Dictionary2 = new Dictionary<TKey2,TValue>();
-        }
-
-        public DoubleDictionaryThreadAbortSafe(int capacity)
-        {
-            Dictionary1 = new Dictionary<TKey1, TValue>(capacity);
-            Dictionary2 = new Dictionary<TKey2, TValue>(capacity);
-        }
-
-        public void Add(TKey1 key1, TKey2 key2, TValue value)
-        {
-            bool gotLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterWriteLock();
-                    gotLock = true;
-                }
-
-                if (Dictionary1.ContainsKey(key1))
-                {
-                    if (!Dictionary2.ContainsKey(key2))
-                        throw new ArgumentException("key1 exists in the dictionary but not key2");
-                }
-                else if (Dictionary2.ContainsKey(key2))
-                {
-                    if (!Dictionary1.ContainsKey(key1))
-                        throw new ArgumentException("key2 exists in the dictionary but not key1");
-                }
-
-                Dictionary1[key1] = value;
-                Dictionary2[key2] = value;
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitWriteLock(); 
-            }
-        }
-
-        public bool Remove(TKey1 key1, TKey2 key2)
-        {
-            bool success;
-            bool gotLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterWriteLock();
-                    gotLock = true;
-                }
-
-                Dictionary1.Remove(key1);
-                success = Dictionary2.Remove(key2);
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitWriteLock(); 
-            }
-
-            return success;
-        }
-
-        public bool Remove(TKey1 key1)
-        {
-            bool found = false;
-            bool gotLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterWriteLock();
-                    gotLock = true;
-                }
-
-                // This is an O(n) operation!
-                TValue value;
-                if (Dictionary1.TryGetValue(key1, out value))
-                {
-                    foreach (KeyValuePair<TKey2, TValue> kvp in Dictionary2)
-                    {
-                        if (kvp.Value.Equals(value))
-                        {
-                            Dictionary1.Remove(key1);
-                            Dictionary2.Remove(kvp.Key);
-                            found = true;
-                            break;
-                        }
-                    }
-                }
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitWriteLock(); 
-            }
-
-            return found;
-        }
-
-        public bool Remove(TKey2 key2)
-        {
-            bool found = false;
-            bool gotLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterWriteLock();
-                    gotLock = true;
-                }
-
-                // This is an O(n) operation!
-                TValue value;
-                if (Dictionary2.TryGetValue(key2, out value))
-                {
-                    foreach (KeyValuePair<TKey1, TValue> kvp in Dictionary1)
-                    {
-                        if (kvp.Value.Equals(value))
-                        {
-                            Dictionary2.Remove(key2);
-                            Dictionary1.Remove(kvp.Key);
-                            found = true;
-                            break;
-                        }
-                    }
-                }
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitWriteLock(); 
-            }
-
-            return found;
-        }
-
-        public void Clear()
-        {
-            bool gotLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterWriteLock();
-                    gotLock = true;
-                }
-
-                Dictionary1.Clear();
-                Dictionary2.Clear();
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitWriteLock(); 
-            }
-        }
-
-        public int Count
-        {
-            get { return Dictionary1.Count; }
-        }
-
-        public bool ContainsKey(TKey1 key)
-        {
-            return Dictionary1.ContainsKey(key);
-        }
-
-        public bool ContainsKey(TKey2 key)
-        {
-            return Dictionary2.ContainsKey(key);
-        }
-
-        public bool TryGetValue(TKey1 key, out TValue value)
-        {
-            bool success;
-            bool gotLock = false;
-
-            try 
-            { 
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterReadLock();
-                    gotLock = true;
-                }
-
-                success = Dictionary1.TryGetValue(key, out value); 
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitReadLock(); 
-            }
-
-            return success;
-        }
-
-        public bool TryGetValue(TKey2 key, out TValue value)
-        {
-            bool success;
-            bool gotLock = false;
-
-            try 
-            { 
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterReadLock();
-                    gotLock = true;
-                }
-
-                success = Dictionary2.TryGetValue(key, out value); 
-            }
-            finally 
-            {   
-                if (gotLock)
-                    rwLock.ExitReadLock(); 
-            }
-
-            return success;
-        }
-
-        public void ForEach(Action<TValue> action)
-        {
-            bool gotLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterReadLock();
-                    gotLock = true;
-                }
-
-                foreach (TValue value in Dictionary1.Values)
-                    action(value);
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitReadLock(); 
-            }
-        }
-
-        public void ForEach(Action<KeyValuePair<TKey1, TValue>> action)
-        {
-            bool gotLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterReadLock();
-                    gotLock = true;
-                }
-
-                foreach (KeyValuePair<TKey1, TValue> entry in Dictionary1)
-                    action(entry);
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitReadLock(); 
-            }
-        }
-
-        public void ForEach(Action<KeyValuePair<TKey2, TValue>> action)
-        {
-            bool gotLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterReadLock();
-                    gotLock = true;
-                }
-
-                foreach (KeyValuePair<TKey2, TValue> entry in Dictionary2)
-                    action(entry);
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitReadLock(); 
-            }
-        }
-
-        public TValue FindValue(Predicate<TValue> predicate)
-        {
-            bool gotLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterReadLock();
-                    gotLock = true;
-                }
-
-                foreach (TValue value in Dictionary1.Values)
-                {
-                    if (predicate(value))
-                        return value;
-                }
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitReadLock(); 
-            }
-
-            return default(TValue);
-        }
-
-        public IList<TValue> FindAll(Predicate<TValue> predicate)
-        {
-            IList<TValue> list = new List<TValue>();
-            bool gotLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterReadLock();
-                    gotLock = true;
-                }
-
-                foreach (TValue value in Dictionary1.Values)
-                {
-                    if (predicate(value))
-                        list.Add(value);
-                }
-            }
-            finally 
-            { 
-                if (gotLock)
-                    rwLock.ExitReadLock(); 
-            }
-
-            return list;
-        }
-
-        public int RemoveAll(Predicate<TValue> predicate)
-        {
-            IList<TKey1> list = new List<TKey1>();
-            bool gotUpgradeableLock = false;
-
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}            
-                finally
-                {
-                    rwLock.EnterUpgradeableReadLock();
-                    gotUpgradeableLock = true;
-                }
-
-                foreach (KeyValuePair<TKey1, TValue> kvp in Dictionary1)
-                {
-                    if (predicate(kvp.Value))
-                        list.Add(kvp.Key);
-                }
-
-                IList<TKey2> list2 = new List<TKey2>(list.Count);
-                foreach (KeyValuePair<TKey2, TValue> kvp in Dictionary2)
-                {
-                    if (predicate(kvp.Value))
-                        list2.Add(kvp.Key);
-                }
-
-                bool gotWriteLock = false;
-
-                try
-                {
-                    try {}            
-                    finally
-                    {
-                        rwLock.EnterUpgradeableReadLock();
-                        gotWriteLock = true;
-                    }
-
-                    for (int i = 0; i < list.Count; i++)
-                        Dictionary1.Remove(list[i]);
-
-                    for (int i = 0; i < list2.Count; i++)
-                        Dictionary2.Remove(list2[i]);
-                }
-                finally 
-                { 
-                    if (gotWriteLock)
-                        rwLock.ExitWriteLock(); 
-                }
-            }
-            finally 
-            { 
-                if (gotUpgradeableLock)
-                    rwLock.ExitUpgradeableReadLock(); 
-            }
-
-            return list.Count;
-        }
-    }
-}
@@ -44,6 +44,7 @@ namespace OpenSim.Framework
        public Vector3 Position;
        public byte[] binaryBucket;

+
        public uint ParentEstateID;
        public Guid RegionID;
        public uint timestamp;
@@ -57,7 +58,7 @@ namespace OpenSim.Framework
                string _fromAgentName, UUID _toAgentID,
                byte _dialog, bool _fromGroup, string _message,
                UUID _imSessionID, bool _offline, Vector3 _position,
-                byte[] _binaryBucket, bool addTimestamp)
+                byte[] _binaryBucket)
        {
            fromAgentID = _fromAgentID.Guid;
            fromAgentName = _fromAgentName;
@@ -78,9 +79,7 @@ namespace OpenSim.Framework
                ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID;
                RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid;
            }
-
-            if (addTimestamp)
-                timestamp = (uint)Util.UnixTimeSinceEpoch();
+            timestamp = (uint)Util.UnixTimeSinceEpoch();
        }

        public GridInstantMessage(IScene scene, UUID _fromAgentID,
@@ -88,7 +87,7 @@ namespace OpenSim.Framework
                string _message, bool _offline,
                Vector3 _position) : this(scene, _fromAgentID, _fromAgentName,
                _toAgentID, _dialog, false, _message,
-                _fromAgentID ^ _toAgentID, _offline, _position, new byte[0], true)
+                _fromAgentID ^ _toAgentID, _offline, _position, new byte[0])
        {
        }
    }
@@ -74,19 +74,10 @@ namespace OpenSim.Framework
        XmlElement GetXml(XmlDocument doc);
    }

-    public delegate void OnOutputDelegate(string message);
-
    public interface ICommandConsole : IConsole
    {
-        event OnOutputDelegate OnOutput;
-
        ICommands Commands { get; }

-        /// <summary>
-        /// The default prompt text.
-        /// </summary>
-        string DefaultPrompt { get; set; }
-
        /// <summary>
        /// Display a command prompt on the console and wait for user input
        /// </summary>
@@ -96,4 +87,4 @@ namespace OpenSim.Framework

        string ReadLine(string p, bool isCommand, bool e);
    }
-}
+}
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
    public interface IConsole
    {
-        object ConsoleScene { get; set; }
+        object ConsoleScene { get; }

        void Output(string text, string level);
        void Output(string text);
@@ -87,7 +87,16 @@ namespace OpenSim.Framework
        protected string m_creatorId;

        /// <value>
-        /// The CreatorId expressed as a UUID.tely
+        /// The UUID for the creator.  This may be different from the canonical CreatorId.  This property is used
+        /// for communication with the client over the Second Life protocol, since that protocol can only understand
+        /// UUIDs.  As this is a basic framework class, this means that both the string creator id and the uuid
+        /// reference have to be settable separately
+        ///
+        /// Database plugins don't need to set this, it will be set by
+        /// upstream code (or set by the get accessor if left unset).
+        ///
+        /// XXX: An alternative to having a separate uuid property would be to hash the CreatorId appropriately
+        /// every time there was communication with a UUID-only client.  This may be much more expensive.
        /// </value>
        public UUID CreatorIdAsUuid 
        {
@@ -100,18 +109,20 @@ namespace OpenSim.Framework

                return m_creatorIdAsUuid;
            }
+            
+            set
+            {
+                m_creatorIdAsUuid = value;
+            }
        }
        protected UUID m_creatorIdAsUuid = UUID.Zero;

-        /// <summary>
-        /// Extended creator information of the form <profile url>;<name>
-        /// </summary>
+        protected string m_creatorData = string.Empty;
        public string CreatorData // = <profile url>;<name>
        {
            get { return m_creatorData; }
            set { m_creatorData = value; }
        }
-        protected string m_creatorData = string.Empty;

        /// <summary>
        /// Used by the DB layer to retrieve / store the entire user identification.
@@ -151,6 +162,7 @@ namespace OpenSim.Framework
                        name = parts[2];

                    m_creatorData += ';' + name;
+
                }
            }
        }
@@ -49,8 +49,8 @@ namespace OpenSim.Framework
        // use only one serializer to give the runtime a chance to
        // optimize it (it won't do that if you use a new instance
        // every time)
-        private static XmlSerializer serializer = new XmlSerializer(typeof(LandData));
-
+        private static XmlSerializer serializer = new XmlSerializer(typeof (LandData));
+        
        private Vector3 _AABBMax = new Vector3();
        private Vector3 _AABBMin = new Vector3();
        private int _area = 0;
@@ -65,11 +65,11 @@ namespace OpenSim.Framework
        private byte[] _bitmap = new byte[512];
        private string _description = String.Empty;

-        private uint _flags = (uint)ParcelFlags.AllowFly | (uint)ParcelFlags.AllowLandmark |
-                                (uint)ParcelFlags.AllowAPrimitiveEntry |
-                                (uint)ParcelFlags.AllowDeedToGroup | (uint)ParcelFlags.AllowTerraform |
-                                (uint)ParcelFlags.CreateObjects | (uint)ParcelFlags.AllowOtherScripts |
-                                (uint)ParcelFlags.SoundLocal | (uint)ParcelFlags.AllowVoiceChat;
+        private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark |
+                                (uint) ParcelFlags.AllowAPrimitiveEntry |
+                                (uint) ParcelFlags.AllowDeedToGroup | (uint) ParcelFlags.AllowTerraform |
+                                (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts |
+                                (uint) ParcelFlags.SoundLocal | (uint) ParcelFlags.AllowVoiceChat;

        private byte _landingType = 0;
        private string _name = "Your Parcel";
@@ -97,36 +97,16 @@ namespace OpenSim.Framework
        private bool _mediaLoop = false;
        private bool _obscureMusic = false;
        private bool _obscureMedia = false;
-        private float _dwell = 0;
-
-        /// <summary>
-        /// Traffic count of parcel
-        /// </summary>
-        [XmlIgnore]
-        public float Dwell
-        {
-            get
-            {
-                return _dwell;
-            }
-            set
-            {
-                _dwell = value;
-            }
-        }

        /// <summary>
        /// Whether to obscure parcel media URL
        /// </summary>
        [XmlIgnore]
-        public bool ObscureMedia
-        {
-            get
-            {
+        public bool ObscureMedia {
+            get {
                return _obscureMedia;
            }
-            set
-            {
+            set {
                _obscureMedia = value;
            }
        }
@@ -135,14 +115,11 @@ namespace OpenSim.Framework
        /// Whether to obscure parcel music URL
        /// </summary>
        [XmlIgnore]
-        public bool ObscureMusic
-        {
-            get
-            {
+        public bool ObscureMusic {
+            get {
                return _obscureMusic;
            }
-            set
-            {
+            set {
                _obscureMusic = value;
            }
        }
@@ -151,14 +128,11 @@ namespace OpenSim.Framework
        /// Whether to loop parcel media
        /// </summary>
        [XmlIgnore]
-        public bool MediaLoop
-        {
-            get
-            {
+        public bool MediaLoop {
+            get {
                return _mediaLoop;
            }
-            set
-            {
+            set {
                _mediaLoop = value;
            }
        }
@@ -167,14 +141,11 @@ namespace OpenSim.Framework
        /// Height of parcel media render
        /// </summary>
        [XmlIgnore]
-        public int MediaHeight
-        {
-            get
-            {
+        public int MediaHeight {
+            get {
                return _mediaHeight;
            }
-            set
-            {
+            set {
                _mediaHeight = value;
            }
        }
@@ -183,14 +154,11 @@ namespace OpenSim.Framework
        /// Width of parcel media render
        /// </summary>
        [XmlIgnore]
-        public int MediaWidth
-        {
-            get
-            {
+        public int MediaWidth {
+            get {
                return _mediaWidth;
            }
-            set
-            {
+            set {
                _mediaWidth = value;
            }
        }
@@ -199,14 +167,11 @@ namespace OpenSim.Framework
        /// Upper corner of the AABB for the parcel
        /// </summary>
        [XmlIgnore]
-        public Vector3 AABBMax
-        {
-            get
-            {
+        public Vector3 AABBMax {
+            get {
                return _AABBMax;
            }
-            set
-            {
+            set {
                _AABBMax = value;
            }
        }
@@ -214,14 +179,11 @@ namespace OpenSim.Framework
        /// Lower corner of the AABB for the parcel
        /// </summary>
        [XmlIgnore]
-        public Vector3 AABBMin
-        {
-            get
-            {
+        public Vector3 AABBMin {
+            get {
                return _AABBMin;
            }
-            set
-            {
+            set {
                _AABBMin = value;
            }
        }
@@ -229,14 +191,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Area in meters^2 the parcel contains
        /// </summary>
-        public int Area
-        {
-            get
-            {
+        public int Area {
+            get {
                return _area;
            }
-            set
-            {
+            set {
                _area = value;
            }
        }
@@ -244,14 +203,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// ID of auction (3rd Party Integration) when parcel is being auctioned
        /// </summary>
-        public uint AuctionID
-        {
-            get
-            {
+        public uint AuctionID {
+            get {
                return _auctionID;
            }
-            set
-            {
+            set {
                _auctionID = value;
            }
        }
@@ -259,14 +215,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// UUID of authorized buyer of parcel.  This is UUID.Zero if anyone can buy it.
        /// </summary>
-        public UUID AuthBuyerID
-        {
-            get
-            {
+        public UUID AuthBuyerID {
+            get {
                return _authBuyerID;
            }
-            set
-            {
+            set {
                _authBuyerID = value;
            }
        }
@@ -274,14 +227,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Category of parcel.  Used for classifying the parcel in classified listings
        /// </summary>
-        public ParcelCategory Category
-        {
-            get
-            {
+        public ParcelCategory Category {
+            get {
                return _category;
            }
-            set
-            {
+            set {
                _category = value;
            }
        }
@@ -289,14 +239,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Date that the current owner purchased or claimed the parcel
        /// </summary>
-        public int ClaimDate
-        {
-            get
-            {
+        public int ClaimDate {
+            get {
                return _claimDate;
            }
-            set
-            {
+            set {
                _claimDate = value;
            }
        }
@@ -304,14 +251,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// The last price that the parcel was sold at
        /// </summary>
-        public int ClaimPrice
-        {
-            get
-            {
+        public int ClaimPrice {
+            get {
                return _claimPrice;
            }
-            set
-            {
+            set {
                _claimPrice = value;
            }
        }
@@ -319,14 +263,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Global ID for the parcel.  (3rd Party Integration)
        /// </summary>
-        public UUID GlobalID
-        {
-            get
-            {
+        public UUID GlobalID {
+            get {
                return _globalID;
            }
-            set
-            {
+            set {
                _globalID = value;
            }
        }
@@ -334,14 +275,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Unique ID of the Group that owns
        /// </summary>
-        public UUID GroupID
-        {
-            get
-            {
+        public UUID GroupID {
+            get {
                return _groupID;
            }
-            set
-            {
+            set {
                _groupID = value;
            }
        }
@@ -349,14 +287,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Returns true if the Land Parcel is owned by a group
        /// </summary>
-        public bool IsGroupOwned
-        {
-            get
-            {
+        public bool IsGroupOwned {
+            get {
                return _isGroupOwned;
            }
-            set
-            {
+            set {
                _isGroupOwned = value;
            }
        }
@@ -364,14 +299,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// jp2 data for the image representative of the parcel in the parcel dialog
        /// </summary>
-        public byte[] Bitmap
-        {
-            get
-            {
+        public byte[] Bitmap {
+            get {
                return _bitmap;
            }
-            set
-            {
+            set {
                _bitmap = value;
            }
        }
@@ -379,14 +311,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Parcel Description
        /// </summary>
-        public string Description
-        {
-            get
-            {
+        public string Description {
+            get {
                return _description;
            }
-            set
-            {
+            set {
                _description = value;
            }
        }
@@ -394,14 +323,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Parcel settings.  Access flags, Fly, NoPush, Voice, Scripts allowed, etc.  ParcelFlags
        /// </summary>
-        public uint Flags
-        {
-            get
-            {
+        public uint Flags {
+            get {
                return _flags;
            }
-            set
-            {
+            set {
                _flags = value;
            }
        }
@@ -410,14 +336,11 @@ namespace OpenSim.Framework
        /// Determines if people are able to teleport where they please on the parcel or if they 
        /// get constrainted to a specific point on teleport within the parcel
        /// </summary>
-        public byte LandingType
-        {
-            get
-            {
+        public byte LandingType {
+            get {
                return _landingType;
            }
-            set
-            {
+            set {
                _landingType = value;
            }
        }
@@ -425,14 +348,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Parcel Name
        /// </summary>
-        public string Name
-        {
-            get
-            {
+        public string Name {
+            get {
                return _name;
            }
-            set
-            {
+            set {
                _name = value;
            }
        }
@@ -440,14 +360,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Status of Parcel, Leased, Abandoned, For Sale
        /// </summary>
-        public ParcelStatus Status
-        {
-            get
-            {
+        public ParcelStatus Status {
+            get {
                return _status;
            }
-            set
-            {
+            set {
                _status = value;
            }
        }
@@ -455,14 +372,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Internal ID of the parcel.  Sometimes the client will try to use this value
        /// </summary>
-        public int LocalID
-        {
-            get
-            {
+        public int LocalID {
+            get {
                return _localID;
            }
-            set
-            {
+            set {
                _localID = value;
            }
        }
@@ -470,14 +384,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Determines if we scale the media based on the surface it's on
        /// </summary>
-        public byte MediaAutoScale
-        {
-            get
-            {
+        public byte MediaAutoScale {
+            get {
                return _mediaAutoScale;
            }
-            set
-            {
+            set {
                _mediaAutoScale = value;
            }
        }
@@ -485,14 +396,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Texture Guid to replace with the output of the media stream
        /// </summary>
-        public UUID MediaID
-        {
-            get
-            {
+        public UUID MediaID {
+            get {
                return _mediaID;
            }
-            set
-            {
+            set {
                _mediaID = value;
            }
        }
@@ -500,14 +408,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// URL to the media file to display
        /// </summary>
-        public string MediaURL
-        {
-            get
-            {
+        public string MediaURL {
+            get {
                return _mediaURL;
            }
-            set
-            {
+            set {
                _mediaURL = value;
            }
        }
@@ -527,14 +432,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// URL to the shoutcast music stream to play on the parcel
        /// </summary>
-        public string MusicURL
-        {
-            get
-            {
+        public string MusicURL {
+            get {
                return _musicURL;
            }
-            set
-            {
+            set {
                _musicURL = value;
            }
        }
@@ -543,14 +445,11 @@ namespace OpenSim.Framework
        /// Owner Avatar or Group of the parcel.  Naturally, all land masses must be
        /// owned by someone
        /// </summary>
-        public UUID OwnerID
-        {
-            get
-            {
+        public UUID OwnerID {
+            get {
                return _ownerID;
            }
-            set
-            {
+            set {
                _ownerID = value;
            }
        }
@@ -558,14 +457,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// List of access data for the parcel.  User data, some bitflags, and a time
        /// </summary>
-        public List<LandAccessEntry> ParcelAccessList
-        {
-            get
-            {
+        public List<LandAccessEntry> ParcelAccessList {
+            get {
                return _parcelAccessList;
            }
-            set
-            {
+            set {
                _parcelAccessList = value;
            }
        }
@@ -573,14 +469,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// How long in hours a Pass to the parcel is given
        /// </summary>
-        public float PassHours
-        {
-            get
-            {
+        public float PassHours {
+            get {
                return _passHours;
            }
-            set
-            {
+            set {
                _passHours = value;
            }
        }
@@ -588,14 +481,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// Price to purchase a Pass to a restricted parcel
        /// </summary>
-        public int PassPrice
-        {
-            get
-            {
+        public int PassPrice {
+            get {
                return _passPrice;
            }
-            set
-            {
+            set {
                _passPrice = value;
            }
        }
@@ -603,14 +493,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// When the parcel is being sold, this is the price to purchase the parcel
        /// </summary>
-        public int SalePrice
-        {
-            get
-            {
+        public int SalePrice {
+            get {
                return _salePrice;
            }
-            set
-            {
+            set {
                _salePrice = value;
            }
        }
@@ -619,14 +506,11 @@ namespace OpenSim.Framework
        /// Number of meters^2 in the Simulator
        /// </summary>
        [XmlIgnore]
-        public int SimwideArea
-        {
-            get
-            {
+        public int SimwideArea {
+            get {
                return _simwideArea;
            }
-            set
-            {
+            set {
                _simwideArea = value;
            }
        }
@@ -635,14 +519,11 @@ namespace OpenSim.Framework
        /// Number of SceneObjectPart in the Simulator
        /// </summary>
        [XmlIgnore]
-        public int SimwidePrims
-        {
-            get
-            {
+        public int SimwidePrims {
+            get {
                return _simwidePrims;
            }
-            set
-            {
+            set {
                _simwidePrims = value;
            }
        }
@@ -650,14 +531,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// ID of the snapshot used in the client parcel dialog of the parcel
        /// </summary>
-        public UUID SnapshotID
-        {
-            get
-            {
+        public UUID SnapshotID {
+            get {
                return _snapshotID;
            }
-            set
-            {
+            set {
                _snapshotID = value;
            }
        }
@@ -666,14 +544,11 @@ namespace OpenSim.Framework
        /// When teleporting is restricted to a certain point, this is the location 
        /// that the user will be redirected to
        /// </summary>
-        public Vector3 UserLocation
-        {
-            get
-            {
+        public Vector3 UserLocation {
+            get {
                return _userLocation;
            }
-            set
-            {
+            set {
                _userLocation = value;
            }
        }
@@ -682,14 +557,11 @@ namespace OpenSim.Framework
        /// When teleporting is restricted to a certain point, this is the rotation 
        /// that the user will be positioned
        /// </summary>
-        public Vector3 UserLookAt
-        {
-            get
-            {
+        public Vector3 UserLookAt {
+            get {
                return _userLookAt;
            }
-            set
-            {
+            set {
                _userLookAt = value;
            }
        }
@@ -698,14 +570,11 @@ namespace OpenSim.Framework
        /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own 
        /// the parcel and isn't set to the same 'group' as the parcel.
        /// </summary>
-        public int OtherCleanTime
-        {
-            get
-            {
+        public int OtherCleanTime {
+            get {
                return _otherCleanTime;
            }
-            set
-            {
+            set {
                _otherCleanTime = value;
            }
        }
@@ -713,14 +582,11 @@ namespace OpenSim.Framework
        /// <summary>
        /// parcel media description
        /// </summary>
-        public string MediaDescription
-        {
-            get
-            {
+        public string MediaDescription {
+            get {
                return _mediaDescription;
            }
-            set
-            {
+            set {
                _mediaDescription = value;
            }
        }
@@ -756,7 +622,7 @@ namespace OpenSim.Framework
            landData._mediaURL = _mediaURL;
            landData._musicURL = _musicURL;
            landData._ownerID = _ownerID;
-            landData._bitmap = (byte[])_bitmap.Clone();
+            landData._bitmap = (byte[]) _bitmap.Clone();
            landData._description = _description;
            landData._flags = _flags;
            landData._name = _name;
@@ -777,7 +643,6 @@ namespace OpenSim.Framework
            landData._obscureMedia = _obscureMedia;
            landData._simwideArea = _simwideArea;
            landData._simwidePrims = _simwidePrims;
-            landData._dwell = _dwell;

            landData._parcelAccessList.Clear();
            foreach (LandAccessEntry entry in _parcelAccessList)
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Framework.Monitoring")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("74506fe3-2f9d-44c1-94c9-a30f79d9e0cb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Framework.Monitoring
-{
-    public class PercentageStat : Stat
-    {
-        public long Antecedent { get; set; }
-        public long Consequent { get; set; }
-
-        public override double Value
-        {
-            get
-            {
-                // Asking for an update here means that the updater cannot access this value without infinite recursion.
-                // XXX: A slightly messy but simple solution may be to flick a flag so we can tell if this is being
-                // called by the pull action and just return the value.
-                if (StatType == StatType.Pull)
-                    PullAction(this);
-
-                long c = Consequent;
-
-                // Avoid any chance of a multi-threaded divide-by-zero
-                if (c == 0)
-                    return 0;
-
-                return (double)Antecedent / c * 100;
-            }
-
-            set
-            {
-                throw new InvalidOperationException("Cannot set value on a PercentageStat");
-            }
-        }
-
-        public PercentageStat(
-            string shortName,
-            string name,
-            string description,
-            string category,
-            string container,
-            StatType type,
-            Action<Stat> pullAction,
-            StatVerbosity verbosity)
-            : base(shortName, name, description, "%", category, container, type, pullAction, verbosity) {}
-
-        public override string ToConsoleString()
-        {
-            StringBuilder sb = new StringBuilder();
-
-            sb.AppendFormat(
-                "{0}.{1}.{2} : {3:0.##}{4} ({5}/{6})",
-                Category, Container, ShortName, Value, UnitName, Antecedent, Consequent);
-
-            AppendMeasuresOfInterest(sb);
-
-            return sb.ToString();
-        }
-    }
-}
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Framework.Monitoring
-{
-    /// <summary>
-    /// Holds individual statistic details
-    /// </summary>
-    public class Stat
-    {
-        /// <summary>
-        /// Category of this stat (e.g. cache, scene, etc).
-        /// </summary>
-        public string Category { get; private set; }
-
-        /// <summary>
-        /// Containing name for this stat.
-        /// FIXME: In the case of a scene, this is currently the scene name (though this leaves
-        /// us with a to-be-resolved problem of non-unique region names).
-        /// </summary>
-        /// <value>
-        /// The container.
-        /// </value>
-        public string Container { get; private set; }
-
-        public StatType StatType { get; private set; }
-
-        public MeasuresOfInterest MeasuresOfInterest { get; private set; }
-
-        /// <summary>
-        /// Action used to update this stat when the value is requested if it's a pull type.
-        /// </summary>
-        public Action<Stat> PullAction { get; private set; }
-
-        public StatVerbosity Verbosity { get; private set; }
-        public string ShortName { get; private set; }
-        public string Name { get; private set; }
-        public string Description { get; private set; }
-        public virtual string UnitName { get; private set; }
-
-        public virtual double Value
-        {
-            get
-            {
-                // Asking for an update here means that the updater cannot access this value without infinite recursion.
-                // XXX: A slightly messy but simple solution may be to flick a flag so we can tell if this is being
-                // called by the pull action and just return the value.
-                if (StatType == StatType.Pull)
-                    PullAction(this);
-
-                return m_value;
-            }
-
-            set
-            {
-                m_value = value;
-            }
-        }
-
-        private double m_value;
-
-        /// <summary>
-        /// Historical samples for calculating measures of interest average.
-        /// </summary>
-        /// <remarks>
-        /// Will be null if no measures of interest require samples.
-        /// </remarks>
-        private static Queue<double> m_samples;
-
-        /// <summary>
-        /// Maximum number of statistical samples.
-        /// </summary>
-        /// <remarks>
-        /// At the moment this corresponds to 1 minute since the sampling rate is every 2.5 seconds as triggered from
-        /// the main Watchdog.
-        /// </remarks>
-        private static int m_maxSamples = 24;
-
-        public Stat(
-            string shortName,
-            string name,
-            string description,
-            string unitName,
-            string category,
-            string container,
-            StatType type,
-            Action<Stat> pullAction,
-            StatVerbosity verbosity) 
-                : this(
-                    shortName, 
-                    name, 
-                    description, 
-                    unitName, 
-                    category, 
-                    container, 
-                    type, 
-                    MeasuresOfInterest.None, 
-                    pullAction, 
-                    verbosity)
-        {
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name='shortName'>Short name for the stat.  Must not contain spaces.  e.g. "LongFrames"</param>
-        /// <param name='name'>Human readable name for the stat.  e.g. "Long frames"</param>
-        /// <param name='description'>Description of stat</param>
-        /// <param name='unitName'>
-        /// Unit name for the stat.  Should be preceeded by a space if the unit name isn't normally appeneded immediately to the value.
-        /// e.g. " frames"
-        /// </param>
-        /// <param name='category'>Category under which this stat should appear, e.g. "scene".  Do not capitalize.</param>
-        /// <param name='container'>Entity to which this stat relates.  e.g. scene name if this is a per scene stat.</param>
-        /// <param name='type'>Push or pull</param>
-        /// <param name='pullAction'>Pull stats need an action to update the stat on request.  Push stats should set null here.</param>
-        /// <param name='moi'>Measures of interest</param>
-        /// <param name='verbosity'>Verbosity of stat.  Controls whether it will appear in short stat display or only full display.</param>
-        public Stat(
-            string shortName,
-            string name,
-            string description,
-            string unitName,
-            string category,
-            string container,
-            StatType type,
-            MeasuresOfInterest moi,
-            Action<Stat> pullAction,
-            StatVerbosity verbosity)
-        {
-            if (StatsManager.SubCommands.Contains(category))
-                throw new Exception(
-                    string.Format("Stat cannot be in category '{0}' since this is reserved for a subcommand", category));
-
-            ShortName = shortName;
-            Name = name;
-            Description = description;
-            UnitName = unitName;
-            Category = category;
-            Container = container;
-            StatType = type;
-
-            if (StatType == StatType.Push && pullAction != null)
-                throw new Exception("A push stat cannot have a pull action");
-            else
-                PullAction = pullAction;
-
-            MeasuresOfInterest = moi;
-
-            if ((moi & MeasuresOfInterest.AverageChangeOverTime) == MeasuresOfInterest.AverageChangeOverTime)
-                m_samples = new Queue<double>(m_maxSamples);
-
-            Verbosity = verbosity;
-        }
-
-        /// <summary>
-        /// Record a value in the sample set.
-        /// </summary>
-        /// <remarks>
-        /// Do not call this if MeasuresOfInterest.None
-        /// </remarks>
-        public void RecordValue()
-        {
-            double newValue = Value;
-
-            lock (m_samples)
-            {
-                if (m_samples.Count >= m_maxSamples)
-                    m_samples.Dequeue();
-
-                m_samples.Enqueue(newValue);
-            }
-        }
-
-        public virtual string ToConsoleString()
-        {
-            StringBuilder sb = new StringBuilder();
-            sb.AppendFormat("{0}.{1}.{2} : {3}{4}", Category, Container, ShortName, Value, UnitName);
-
-            AppendMeasuresOfInterest(sb);
-
-            return sb.ToString();
-        }
-
-        protected void AppendMeasuresOfInterest(StringBuilder sb)
-        {
-            if ((MeasuresOfInterest & MeasuresOfInterest.AverageChangeOverTime) 
-                == MeasuresOfInterest.AverageChangeOverTime)
-            {
-                double totalChange = 0;
-                double? lastSample = null;
-
-                lock (m_samples)
-                {
-                    foreach (double s in m_samples)
-                    {
-                        if (lastSample != null)
-                            totalChange += s - (double)lastSample;
-
-                        lastSample = s;
-                    }
-                }
-
-                int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
-
-                sb.AppendFormat(", {0:0.##}{1}/s", totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000), UnitName);
-            }
-        }
-    }
-}
@@ -27,7 +27,6 @@

 using System;
 using System.Collections.Generic;
-using System.Text;

 namespace OpenSim.Framework.Monitoring
 {
@@ -247,24 +246,6 @@ namespace OpenSim.Framework.Monitoring

            return false;
        }
-
-        public static void RecordStats()
-        {
-            lock (RegisteredStats)
-            {
-                foreach (Dictionary<string, Dictionary<string, Stat>> category in RegisteredStats.Values)
-                {
-                    foreach (Dictionary<string, Stat> container in category.Values)
-                    {
-                        foreach (Stat stat in container.Values)
-                        {
-                            if (stat.MeasuresOfInterest != MeasuresOfInterest.None)
-                                stat.RecordValue();
-                        }
-                    }
-                }
-            }
-        }
    }

    /// <summary>
@@ -280,16 +261,6 @@ namespace OpenSim.Framework.Monitoring
        Pull
    }

-    /// <summary>
-    /// Measures of interest for this stat.
-    /// </summary>
-    [Flags]
-    public enum MeasuresOfInterest
-    {
-        None,
-        AverageChangeOverTime
-    }
-
    /// <summary>
    /// Verbosity of stat.
    /// </summary>
@@ -301,4 +272,154 @@ namespace OpenSim.Framework.Monitoring
        Debug,
        Info
    }
+
+    /// <summary>
+    /// Holds individual static details
+    /// </summary>
+    public class Stat
+    {
+        /// <summary>
+        /// Category of this stat (e.g. cache, scene, etc).
+        /// </summary>
+        public string Category { get; private set; }
+
+        /// <summary>
+        /// Containing name for this stat.
+        /// FIXME: In the case of a scene, this is currently the scene name (though this leaves
+        /// us with a to-be-resolved problem of non-unique region names).
+        /// </summary>
+        /// <value>
+        /// The container.
+        /// </value>
+        public string Container { get; private set; }
+
+        public StatType StatType { get; private set; }
+
+        /// <summary>
+        /// Action used to update this stat when the value is requested if it's a pull type.
+        /// </summary>
+        public Action<Stat> PullAction { get; private set; }
+
+        public StatVerbosity Verbosity { get; private set; }
+        public string ShortName { get; private set; }
+        public string Name { get; private set; }
+        public string Description { get; private set; }
+        public virtual string UnitName { get; private set; }
+
+        public virtual double Value
+        {
+            get
+            {
+                // Asking for an update here means that the updater cannot access this value without infinite recursion.
+                // XXX: A slightly messy but simple solution may be to flick a flag so we can tell if this is being
+                // called by the pull action and just return the value.
+                if (StatType == StatType.Pull)
+                    PullAction(this);
+
+                return m_value;
+            }
+
+            set
+            {
+                m_value = value;
+            }
+        }
+
+        private double m_value;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name='shortName'>Short name for the stat.  Must not contain spaces.  e.g. "LongFrames"</param>
+        /// <param name='name'>Human readable name for the stat.  e.g. "Long frames"</param>
+        /// <param name='description'>Description of stat</param>
+        /// <param name='unitName'>
+        /// Unit name for the stat.  Should be preceeded by a space if the unit name isn't normally appeneded immediately to the value.
+        /// e.g. " frames"
+        /// </param>
+        /// <param name='category'>Category under which this stat should appear, e.g. "scene".  Do not capitalize.</param>
+        /// <param name='container'>Entity to which this stat relates.  e.g. scene name if this is a per scene stat.</param>
+        /// <param name='type'>Push or pull</param>
+        /// <param name='pullAction'>Pull stats need an action to update the stat on request.  Push stats should set null here.</param>
+        /// <param name='verbosity'>Verbosity of stat.  Controls whether it will appear in short stat display or only full display.</param>
+        public Stat(
+            string shortName,
+            string name,
+            string description,
+            string unitName,
+            string category,
+            string container,
+            StatType type,
+            Action<Stat> pullAction,
+            StatVerbosity verbosity)
+        {
+            if (StatsManager.SubCommands.Contains(category))
+                throw new Exception(
+                    string.Format("Stat cannot be in category '{0}' since this is reserved for a subcommand", category));
+
+            ShortName = shortName;
+            Name = name;
+            Description = description;
+            UnitName = unitName;
+            Category = category;
+            Container = container;
+            StatType = type;
+
+            if (StatType == StatType.Push && pullAction != null)
+                throw new Exception("A push stat cannot have a pull action");
+            else
+                PullAction = pullAction;
+
+            Verbosity = verbosity;
+        }
+
+        public virtual string ToConsoleString()
+        {
+            return string.Format(
+                "{0}.{1}.{2} : {3}{4}", Category, Container, ShortName, Value, UnitName);
+        }
+    }
+
+    public class PercentageStat : Stat
+    {
+        public int Antecedent { get; set; }
+        public int Consequent { get; set; }
+
+        public override double Value
+        {
+            get
+            {
+                int c = Consequent;
+
+                // Avoid any chance of a multi-threaded divide-by-zero
+                if (c == 0)
+                    return 0;
+
+                return (double)Antecedent / c * 100;
+            }
+
+            set
+            {
+                throw new Exception("Cannot set value on a PercentageStat");
+            }
+        }
+
+        public PercentageStat(
+            string shortName,
+            string name,
+            string description,
+            string category,
+            string container,
+            StatType type,
+            Action<Stat> pullAction,
+            StatVerbosity verbosity)
+            : base(shortName, name, description, "%", category, container, type, pullAction, verbosity) {}
+
+        public override string ToConsoleString()
+        {
+            return string.Format(
+                "{0}.{1}.{2} : {3:0.##}{4} ({5}/{6})",
+                Category, Container, ShortName, Value, UnitName, Antecedent, Consequent);
+        }
+    }
 }
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Monitoring
    public static class Watchdog
    {
        /// <summary>Timer interval in milliseconds for the watchdog timer</summary>
-        public const double WATCHDOG_INTERVAL_MS = 2500.0d;
+        const double WATCHDOG_INTERVAL_MS = 2500.0d;

        /// <summary>Default timeout in milliseconds before a thread is considered dead</summary>
        public const int DEFAULT_WATCHDOG_TIMEOUT_MS = 5000;
@@ -380,8 +380,6 @@ namespace OpenSim.Framework.Monitoring
            if (MemoryWatchdog.Enabled)
                MemoryWatchdog.Update();

-            StatsManager.RecordStats();
-
            m_watchdogTimer.Start();
        }
    }
@@ -1,563 +0,0 @@
-
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-using System;
-using System.Text;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using Mono.Addins;
-using Mono.Addins.Setup;
-using Mono.Addins.Description;
-using OpenSim.Framework;
-
-
-namespace OpenSim.Framework
-{
-    /// <summary>
-    /// Manager for registries and plugins
-    /// </summary>
-	public class PluginManager : SetupService
-	{
-		public AddinRegistry PluginRegistry;
-
-		public PluginManager(AddinRegistry registry): base (registry)
-        {
-			PluginRegistry = registry;
-
-		}
-
-		/// <summary>
-        /// Installs the plugin.
-        /// </summary>
-        /// <returns>
-        /// The plugin.
-        /// </returns>
-        /// <param name='args'>
-        /// Arguments.
-        /// </param>
-        public bool InstallPlugin(int ndx, out Dictionary<string, object> result)
-        {
-            Dictionary<string, object> res = new Dictionary<string, object>();
-
-            PackageCollection pack = new PackageCollection();
-            PackageCollection toUninstall;
-            DependencyCollection unresolved;
-
-            IProgressStatus ps = new ConsoleProgressStatus(false);
-
-            AddinRepositoryEntry[] available = GetSortedAvailbleAddins();
-
-            if (ndx > (available.Length - 1))
-            {
-                MainConsole.Instance.Output("Selection out of range");
-                result = res;
-                return false;
-            }
-
-            AddinRepositoryEntry aentry = available[ndx];
-
-            Package p = Package.FromRepository(aentry);
-            pack.Add(p);
-
-            ResolveDependencies(ps, pack, out toUninstall, out unresolved);
-
-            // Attempt to install the plugin disabled
-            if (Install(ps, pack) == true)
-            {
-                MainConsole.Instance.Output("Ignore the following error...");
-                PluginRegistry.Update(ps);
-                Addin addin = PluginRegistry.GetAddin(aentry.Addin.Id);
-                PluginRegistry.DisableAddin(addin.Id);
-                addin.Enabled = false;
-                
-                MainConsole.Instance.Output("Installation Success");
-                ListInstalledAddins(out res);
-                result = res;
-                return true;
-            } 
-            else
-            {                
-                MainConsole.Instance.Output("Installation Failed");
-                result = res;
-                return false;
-            }
-        }
-
-        // Remove plugin
-        /// <summary>
-        /// Uns the install.
-        /// </summary>
-        /// <param name='args'>
-        /// Arguments.
-        /// </param>
-        public void UnInstall(int ndx)
-        {
-            Addin[] addins = GetSortedAddinList("RobustPlugin");
-
-            if (ndx > (addins.Length -1))
-            {
-                MainConsole.Instance.Output("Selection out of range");
-                return;
-            }
-
-            Addin addin = addins[ndx];
-            MainConsole.Instance.OutputFormat("Uninstalling plugin {0}", addin.Id);
-            AddinManager.Registry.DisableAddin(addin.Id);
-            addin.Enabled = false;
-            IProgressStatus ps = new ConsoleProgressStatus(false);
-            Uninstall(ps, addin.Id);
-            MainConsole.Instance.Output("Uninstall Success - restart to complete operation");
-            return;
-        }
-
-        /// <summary>
-        /// Checks the installed.
-        /// </summary>
-        /// <returns>
-        /// The installed.
-        /// </returns>
-        public string CheckInstalled()
-        {
-            return "CheckInstall";
-        }
-
-        /// <summary>
-        /// Lists the installed addins.
-        /// </summary>
-        /// <param name='result'>
-        /// Result.
-        /// </param>
-        public void ListInstalledAddins(out Dictionary<string, object> result)
-        {
-            Dictionary<string, object> res = new Dictionary<string, object>();
-
-			Addin[] addins = GetSortedAddinList("RobustPlugin");
-			if(addins.Count() < 1)
-			{
-				MainConsole.Instance.Output("Error!");
-			}
-            int count = 0;
-            foreach (Addin addin in addins)
-            {
-                Dictionary<string, object> r = new Dictionary<string, object>();
-                r["enabled"] = addin.Enabled == true ? true : false;
-                r["name"] = addin.LocalId;
-                r["version"] = addin.Version;
-
-                res.Add(count.ToString(), r);
-
-                count++;
-            }
-            result = res;
-            return;
-        }
-
-        // List compatible plugins in registered repositories
-        /// <summary>
-        /// Lists the available.
-        /// </summary>
-        /// <param name='result'>
-        /// Result.
-        /// </param>
-        public void ListAvailable(out Dictionary<string, object> result)
-        {
-            Dictionary<string, object> res = new Dictionary<string, object>();
-
-            AddinRepositoryEntry[] addins = GetSortedAvailbleAddins();
-
-            int count = 0;
-            foreach (AddinRepositoryEntry addin in addins)
-            {
-                Dictionary<string, object> r = new Dictionary<string, object>();
-                r["name"] = addin.Addin.Name;
-                r["version"] = addin.Addin.Version;
-                r["repository"] = addin.RepositoryName;
-
-                res.Add(count.ToString(), r);
-                count++;
-            }
-            result = res;
-            return;
-        }
-
-        // List available updates ** 1
-        /// <summary>
-        /// Lists the updates.
-        /// </summary>
-        public void ListUpdates()
-        {
-            IProgressStatus ps = new ConsoleProgressStatus(true);
-            Console.WriteLine ("Looking for updates...");
-            Repositories.UpdateAllRepositories (ps);
-            Console.WriteLine ("Available add-in updates:");
-            bool found = false;
-            AddinRepositoryEntry[] entries = Repositories.GetAvailableUpdates();
-
-            foreach (AddinRepositoryEntry entry in entries)
-            {
-                Console.WriteLine(String.Format("{0}",entry.Addin.Id));
-            }
-        }
-
-        // Sync to repositories
-        /// <summary>
-        /// Update this instance.
-        /// </summary>
-        public string Update()
-        {
-            IProgressStatus ps = new ConsoleProgressStatus(true);
-            Repositories.UpdateAllRepositories(ps);
-            return "Update";
-        }
-
-        // Register a repository
-        /// <summary>
-        /// Register a repository with our server.
-        /// </summary>
-        /// <returns>
-        /// result of the action
-        /// </returns>
-        /// <param name='repo'>
-        /// The URL of the repository we want to add
-        /// </param>
-        public bool AddRepository(string repo)
-        {
-            Repositories.RegisterRepository(null, repo, true);
-            PluginRegistry.Rebuild(null);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Gets the repository.
-        /// </summary>
-        public void GetRepository()
-        {
-            Repositories.UpdateAllRepositories(new ConsoleProgressStatus(false));
-        }
-
-        // Remove a repository from the list
-        /// <summary>
-        /// Removes the repository.
-        /// </summary>
-        /// <param name='args'>
-        /// Arguments.
-        /// </param>
-        public void RemoveRepository(string[] args)
-        {
-            AddinRepository[] reps = Repositories.GetRepositories();
-            Array.Sort(reps, (r1,r2) => r1.Title.CompareTo(r2.Title));
-            if (reps.Length == 0)
-            {
-                MainConsole.Instance.Output("No repositories have been registered.");
-                return;
-            }
-
-            int n = Convert.ToInt16(args[2]);
-            if (n > (reps.Length -1))
-            {
-                MainConsole.Instance.Output("Selection out of range");
-                return;
-            }
-
-            AddinRepository rep = reps[n];
-            Repositories.RemoveRepository(rep.Url);
-            return;
-        }
-
-        // Enable repository
-        /// <summary>
-        /// Enables the repository.
-        /// </summary>
-        /// <param name='args'>
-        /// Arguments.
-        /// </param>
-        public void EnableRepository(string[] args)
-        {
-            AddinRepository[] reps = Repositories.GetRepositories();
-            Array.Sort(reps, (r1,r2) => r1.Title.CompareTo(r2.Title));
-            if (reps.Length == 0)
-            {
-                MainConsole.Instance.Output("No repositories have been registered.");
-                return;
-            }
-
-            int n = Convert.ToInt16(args[2]);
-            if (n > (reps.Length -1))
-            {
-                MainConsole.Instance.Output("Selection out of range");
-                return;
-            }
-
-            AddinRepository rep = reps[n];
-            Repositories.SetRepositoryEnabled(rep.Url, true);
-            return;
-        }
-
-        // Disable a repository
-        /// <summary>
-        /// Disables the repository.
-        /// </summary>
-        /// <param name='args'>
-        /// Arguments.
-        /// </param>
-        public void DisableRepository(string[] args)
-        {
-            AddinRepository[] reps = Repositories.GetRepositories();
-            Array.Sort(reps, (r1,r2) => r1.Title.CompareTo(r2.Title));
-            if (reps.Length == 0)
-            {
-                MainConsole.Instance.Output("No repositories have been registered.");
-                return;
-            }
-
-            int n = Convert.ToInt16(args[2]);
-            if (n > (reps.Length -1))
-            {
-                MainConsole.Instance.Output("Selection out of range");
-                return;
-            }
-
-            AddinRepository rep = reps[n];
-            Repositories.SetRepositoryEnabled(rep.Url, false);
-            return;
-        }
-
-        // List registered repositories
-        /// <summary>
-        /// Lists the repositories.
-        /// </summary>
-        /// <param name='result'>
-        /// Result.
-        /// </param>
-        public void ListRepositories(out Dictionary<string, object> result)
-        {
-            Dictionary<string, object> res = new Dictionary<string, object>();
-            result = res;
-
-            AddinRepository[] reps = GetSortedAddinRepo();
-            if (reps.Length == 0)
-            {
-                MainConsole.Instance.Output("No repositories have been registered.");
-                return;
-            }
-
-            int count = 0;
-            foreach (AddinRepository rep in reps)
-            {
-                Dictionary<string, object> r = new Dictionary<string, object>();
-                r["enabled"] = rep.Enabled == true ? true : false;
-                r["name"] = rep.Name;
-                r["url"] = rep.Url;
-                
-                res.Add(count.ToString(), r);
-                count++;
-            }
-            return;
-        }
-
-        /// <summary>
-        /// Updates the registry.
-        /// </summary>
-        public void UpdateRegistry()
-        {
-            PluginRegistry.Update();
-        }
-
-        // Show plugin info
-        /// <summary>
-        /// Addins the info.
-        /// </summary>
-        /// <returns>
-        /// The info.
-        /// </returns>
-        /// <param name='args'>
-        /// Arguments.
-        /// </param>
-        public bool AddinInfo(int ndx, out Dictionary<string, object> result)
-        {
-            Dictionary<string, object> res = new Dictionary<string, object>();
-            result = res;
-
-            Addin[] addins = GetSortedAddinList("RobustPlugin");
-
-            if (ndx > (addins.Length - 1))
-            {
-                MainConsole.Instance.Output("Selection out of range");
-                return false;
-            }
-            // author category description
-            Addin addin = addins[ndx];
-
-            res["author"] = addin.Description.Author;
-            res["category"] = addin.Description.Category;
-            res["description"] = addin.Description.Description;
-            res["name"] = addin.Name;
-            res["url"] = addin.Description.Url;
-            res["file_name"] = addin.Description.FileName;
-
-            result = res;
-            return true;
-        }
-
-        // Disable a plugin
-        /// <summary>
-        /// Disables the plugin.
-        /// </summary>
-        /// <param name='args'>
-        /// Arguments.
-        /// </param>
-        public void DisablePlugin(string[] args)
-        {
-            Addin[] addins = GetSortedAddinList("RobustPlugin");
-
-            int n = Convert.ToInt16(args[2]);
-            if (n > (addins.Length -1))
-            {
-                MainConsole.Instance.Output("Selection out of range");
-                return;
-            }
-
-            Addin addin = addins[n];
-            AddinManager.Registry.DisableAddin(addin.Id);
-            addin.Enabled = false;
-            return;
-        }
-
-        // Enable plugin
-        /// <summary>
-        /// Enables the plugin.
-        /// </summary>
-        /// <param name='args'>
-        /// Arguments.
-        /// </param>
-        public void EnablePlugin(string[] args)
-        {
-            Addin[] addins = GetSortedAddinList("RobustPlugin");
-
-            int n = Convert.ToInt16(args[2]);
-            if (n > (addins.Length -1))
-            {
-                MainConsole.Instance.Output("Selection out of range");
-                return;
-            }
-
-            Addin addin = addins[n];
-
-            addin.Enabled = true;
-            AddinManager.Registry.EnableAddin(addin.Id);
-            // AddinManager.Registry.Update();
-            if(PluginRegistry.IsAddinEnabled(addin.Id))
-            {
-                ConsoleProgressStatus ps = new ConsoleProgressStatus(false);
-                if (!AddinManager.AddinEngine.IsAddinLoaded(addin.Id))
-                {
-                    MainConsole.Instance.Output("Ignore the following error...");
-                    AddinManager.Registry.Rebuild(ps);
-                    AddinManager.AddinEngine.LoadAddin(ps, addin.Id);
-                }
-            }
-            else
-            {
-                MainConsole.Instance.OutputFormat("Not Enabled in this domain {0}", addin.Name);
-            }
-            return;
-        }
-
-
-		
-        #region Util
-        private void Testing()
-        {
-            Addin[] list = Registry.GetAddins();
-
-            var addins = list.Where( a => a.Description.Category == "RobustPlugin");
-
-            foreach (Addin addin in addins)
-            {
-                MainConsole.Instance.OutputFormat("Addin {0}", addin.Name);
-            }
-        }
-
-        // These will let us deal with numbered lists instead
-        // of needing to type in the full ids
-        private AddinRepositoryEntry[] GetSortedAvailbleAddins()
-        {
-            ArrayList list = new ArrayList();
-            list.AddRange(Repositories.GetAvailableAddins());
-
-            AddinRepositoryEntry[] addins = list.ToArray(typeof(AddinRepositoryEntry)) as AddinRepositoryEntry[];
-
-            Array.Sort(addins,(r1,r2) => r1.Addin.Id.CompareTo(r2.Addin.Id));
-
-            return addins;
-        }
-
-        private AddinRepository[] GetSortedAddinRepo()
-        {
-            ArrayList list = new ArrayList();
-            list.AddRange(Repositories.GetRepositories());
-
-            AddinRepository[] repos = list.ToArray(typeof(AddinRepository)) as AddinRepository[];
-            Array.Sort (repos,(r1,r2) => r1.Name.CompareTo(r2.Name));
-
-            return repos;
-        }
-
-        private Addin[] GetSortedAddinList(string category)
-        {
-
-            ArrayList xlist = new ArrayList();
-            ArrayList list = new ArrayList();
-			try 
-			{
-            	list.AddRange(PluginRegistry.GetAddins());
-			}
-			catch(Exception e)
-			{
-				Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[];
-				return x;
-			}
-
-            foreach (Addin addin in list)
-            {
-                if (addin.Description.Category == category)
-                    xlist.Add(addin);
-            }
-
-            Addin[] addins = xlist.ToArray(typeof(Addin)) as Addin[];
-            Array.Sort(addins,(r1,r2) => r1.Id.CompareTo(r2.Id));
-
-            return addins;
-        }
-        #endregion Util
-	}
-}
@@ -192,7 +192,18 @@ namespace OpenSim.Framework

        public PrimitiveBaseShape()
        {
+            PCode = (byte) PCodeEnum.Primitive;
+            ExtraParams = new byte[1];
+            m_textureEntry = DEFAULT_TEXTURE;
+        }
+
+        public PrimitiveBaseShape(bool noShape)
+        {
+            if (noShape)
+                return;
+
            PCode = (byte)PCodeEnum.Primitive;
+            ExtraParams = new byte[1];
            m_textureEntry = DEFAULT_TEXTURE;
        }

@@ -205,6 +216,7 @@ namespace OpenSim.Framework
 //            m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Creating from {0}", prim.ID);

            PCode = (byte)prim.PrimData.PCode;
+            ExtraParams = new byte[1];

            State = prim.PrimData.State;
            PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);
@@ -236,10 +248,7 @@ namespace OpenSim.Framework
                SculptTexture = prim.Sculpt.SculptTexture;
                SculptType = (byte)prim.Sculpt.Type;
            }
-            else 
-            {  
-                SculptType = (byte)OpenMetaverse.SculptType.None;
-            }
+            else SculptType = (byte)OpenMetaverse.SculptType.None;
        }

        [XmlIgnore]
@@ -331,9 +340,9 @@ namespace OpenSim.Framework
            _scale = new Vector3(side, side, side);
        }

-        public void SetHeigth(float height)
+        public void SetHeigth(float heigth)
        {
-            _scale.Z = height;
+            _scale.Z = heigth;
        }

        public void SetRadius(float radius)
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-
-namespace OpenSim.Framework
-{
-    /// <summary>
-    /// Region flags used internally by OpenSimulator to store installation specific information about regions.
-    /// </summary>
-    /// <remarks>
-    /// Don't confuse with OpenMetaverse.RegionFlags which are client facing flags (i.e. they go over the wire).
-    /// Returned by IGridService.GetRegionFlags()
-    /// </remarks>
-    [Flags]
-    public enum RegionFlags : int
-    {
-        DefaultRegion = 1, // Used for new Rez. Random if multiple defined
-        FallbackRegion = 2, // Regions we redirect to when the destination is down
-        RegionOnline = 4, // Set when a region comes online, unset when it unregisters and DeleteOnUnregister is false
-        NoDirectLogin = 8, // Region unavailable for direct logins (by name)
-        Persistent = 16, // Don't remove on unregister
-        LockedOut = 32, // Don't allow registration
-        NoMove = 64, // Don't allow moving this region
-        Reservation = 128, // This is an inactive reservation
-        Authenticate = 256, // Require authentication
-        Hyperlink = 512 // Record represents a HG link
-    }
-}
@@ -120,13 +120,10 @@ namespace OpenSim.Framework
        public UUID lastMapUUID = UUID.Zero;
        public string lastMapRefresh = "0";

-        private float m_nonphysPrimMin = 0;
        private int m_nonphysPrimMax = 0;
-        private float m_physPrimMin = 0;
        private int m_physPrimMax = 0;
        private bool m_clampPrimSize = false;
        private int m_objectCapacity = 0;
-        private int m_linksetCapacity = 0;
        private int m_agentCapacity = 0;
        private string m_regionType = String.Empty;
        private RegionLightShareData m_windlight = new RegionLightShareData();
@@ -288,21 +285,11 @@ namespace OpenSim.Framework
            set { m_windlight = value; }
        }

-        public float NonphysPrimMin
-        {
-            get { return m_nonphysPrimMin; }
-        }
-
        public int NonphysPrimMax
        {
            get { return m_nonphysPrimMax; }
        }

-        public float PhysPrimMin
-        {
-            get { return m_physPrimMin; }
-        }
-
        public int PhysPrimMax
        {
            get { return m_physPrimMax; }
@@ -318,11 +305,6 @@ namespace OpenSim.Framework
            get { return m_objectCapacity; }
        }

-        public int LinksetCapacity
-        {
-            get { return m_linksetCapacity; }
-        }
-
        public int AgentCapacity
        {
            get { return m_agentCapacity; }
@@ -641,31 +623,16 @@ namespace OpenSim.Framework
            m_regionType = config.GetString("RegionType", String.Empty);
            allKeys.Remove("RegionType");

-            #region Prim stuff
-
-            m_nonphysPrimMin = config.GetFloat("NonPhysicalPrimMin", 0);
-            allKeys.Remove("NonPhysicalPrimMin");
-
-            m_nonphysPrimMax = config.GetInt("NonPhysicalPrimMax", 0);
-            allKeys.Remove("NonPhysicalPrimMax");
-
-            m_physPrimMin = config.GetFloat("PhysicalPrimMin", 0);
-            allKeys.Remove("PhysicalPrimMin");
-
+            // Prim stuff
+            //
+            m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0);
+            allKeys.Remove("NonphysicalPrimMax");
            m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
            allKeys.Remove("PhysicalPrimMax");
-            
            m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
            allKeys.Remove("ClampPrimSize");
-            
            m_objectCapacity = config.GetInt("MaxPrims", 15000);
            allKeys.Remove("MaxPrims");
-
-            m_linksetCapacity = config.GetInt("LinksetPrims", 0);
-            allKeys.Remove("LinksetPrims");
-            
-            #endregion
-
            m_agentCapacity = config.GetInt("MaxAgents", 100);
            allKeys.Remove("MaxAgents");

@@ -701,27 +668,16 @@ namespace OpenSim.Framework

            config.Set("ExternalHostName", m_externalHostName);

-            if (m_nonphysPrimMin > 0)
-                config.Set("NonphysicalPrimMax", m_nonphysPrimMin);
-
-            if (m_nonphysPrimMax > 0)
+            if (m_nonphysPrimMax != 0)
                config.Set("NonphysicalPrimMax", m_nonphysPrimMax);
-
-            if (m_physPrimMin > 0)
-                config.Set("PhysicalPrimMax", m_physPrimMin);
-            
-            if (m_physPrimMax > 0)
+            if (m_physPrimMax != 0)
                config.Set("PhysicalPrimMax", m_physPrimMax);
-                        
            config.Set("ClampPrimSize", m_clampPrimSize.ToString());

-            if (m_objectCapacity > 0)
+            if (m_objectCapacity != 0)
                config.Set("MaxPrims", m_objectCapacity);

-            if (m_linksetCapacity > 0)
-                config.Set("LinksetPrims", m_linksetCapacity);
-
-            if (m_agentCapacity > 0)
+            if (m_agentCapacity != 0)
                config.Set("MaxAgents", m_agentCapacity);

            if (ScopeID != UUID.Zero)
@@ -798,15 +754,9 @@ namespace OpenSim.Framework
            configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);

-            configMember.addConfigurationOption("nonphysical_prim_min", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
-                                                "Minimum size for nonphysical prims", m_nonphysPrimMin.ToString(), true);
-
            configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                "Maximum size for nonphysical prims", m_nonphysPrimMax.ToString(), true);

-            configMember.addConfigurationOption("physical_prim_min", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
-                                                "Minimum size for nonphysical prims", m_physPrimMin.ToString(), true);
-
            configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                "Maximum size for physical prims", m_physPrimMax.ToString(), true);

@@ -816,9 +766,6 @@ namespace OpenSim.Framework
            configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                "Max objects this sim will hold", m_objectCapacity.ToString(), true);

-            configMember.addConfigurationOption("linkset_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
-                                                "Max prims an object will hold", m_linksetCapacity.ToString(), true);
-
            configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                "Max avatars this sim will hold", m_agentCapacity.ToString(), true);

@@ -937,9 +884,6 @@ namespace OpenSim.Framework
                case "object_capacity":
                    m_objectCapacity = (int)configuration_result;
                    break;
-                case "linkset_capacity":
-                    m_linksetCapacity = (int)configuration_result;
-                    break;
                case "agent_capacity":
                    m_agentCapacity = (int)configuration_result;
                    break;
@@ -1070,4 +1014,4 @@ namespace OpenSim.Framework
            return kvp;
        }
    }
-}
+}
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Framework.RegionLoader.Filesystem")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("4ab5c74b-e886-40a1-b67d-a04df285e706")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Framework.RegionLoader.Web")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("985afff8-e7ed-4056-acce-39abf7a43d33")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -52,11 +52,6 @@ namespace OpenSim.Framework.Serialization
        /// </value>
        public const string INVENTORY_PATH = "inventory/";

-        /// <value>
-        /// Path for regions in a multi-region archive
-        /// </value>
-        public const string REGIONS_PATH = "regions/";
-
        /// <value>
        /// Path for the prims file
        /// </value>
@@ -154,11 +149,6 @@ namespace OpenSim.Framework.Serialization
            EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "trashfolder.txt"]          = (sbyte)AssetType.TrashFolder;
        }

-        public static string CreateOarLandDataPath(LandData ld)
-        {
-            return string.Format("{0}{1}.xml", ArchiveConstants.LANDDATA_PATH, ld.GlobalID);
-        }
-
        /// <summary>
        /// Create the filename used to store an object in an OpenSim Archive.
        /// </summary>
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Framework.Serialization")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("919db41e-4ac0-4f24-9992-81d62c0ee183")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -37,7 +37,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Framework.Serialization.Tests
 {
    [TestFixture]
-    public class LandDataSerializerTest : OpenSimTestCase
+    public class LandDataSerializerTest
    {
        private LandData land;
        private LandData landWithParcelAccessList;
@@ -37,7 +37,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Framework.Serialization.Tests
 {
    [TestFixture]
-    public class RegionSettingsSerializerTests : OpenSimTestCase
+    public class RegionSettingsSerializerTests
    {
        private string m_serializedRs = @"<?xml version=""1.0"" encoding=""utf-16""?>
 <RegionSettings>
@@ -27,6 +27,7 @@

 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Text;
@@ -37,8 +38,6 @@ using log4net;
 using log4net.Appender;
 using log4net.Core;
 using log4net.Repository;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Monitoring;
@@ -46,12 +45,16 @@ using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using Timer=System.Timers.Timer;

+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+
 namespace OpenSim.Framework.Servers
 {
    /// <summary>
    /// Common base for the main OpenSimServers (user, grid, inventory, region, etc)
    /// </summary>
-    public abstract class BaseOpenSimServer : ServerBase
+    public abstract class BaseOpenSimServer
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

@@ -60,6 +63,27 @@ namespace OpenSim.Framework.Servers
        /// server.
        /// </summary>
        private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
+
+        protected CommandConsole m_console;
+        protected OpenSimAppender m_consoleAppender;
+        protected IAppender m_logFileAppender = null; 
+
+        /// <summary>
+        /// Time at which this server was started
+        /// </summary>
+        protected DateTime m_startuptime;
+
+        /// <summary>
+        /// Record the initial startup directory for info purposes
+        /// </summary>
+        protected string m_startupDirectory = Environment.CurrentDirectory;
+
+        /// <summary>
+        /// Server version information.  Usually VersionInfo + information about git commit, operating system, etc.
+        /// </summary>
+        protected string m_version;
+
+        protected string m_pidFile = String.Empty;
        
        /// <summary>
        /// Random uuid for private data 
@@ -72,13 +96,30 @@ namespace OpenSim.Framework.Servers
            get { return m_httpServer; }
        }

-        public BaseOpenSimServer() : base()
+        public BaseOpenSimServer()
        {
+            m_startuptime = DateTime.Now;
+            m_version = VersionInfo.Version;
+            
            // Random uuid for private data
            m_osSecret = UUID.Random().ToString();

            m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics);
            m_periodicDiagnosticsTimer.Enabled = true;
+
+            // This thread will go on to become the console listening thread
+            Thread.CurrentThread.Name = "ConsoleThread";
+
+            ILoggerRepository repository = LogManager.GetRepository();
+            IAppender[] appenders = repository.GetAppenders();
+
+            foreach (IAppender appender in appenders)
+            {
+                if (appender.Name == "LogFileAppender")
+                {
+                    m_logFileAppender = appender;
+                }
+            }
        }
        
        /// <summary>
@@ -86,18 +127,72 @@ namespace OpenSim.Framework.Servers
        /// </summary>
        protected virtual void StartupSpecific()
        {
-            if (m_console == null)
-                return;
+            if (m_console != null)
+            {
+                ILoggerRepository repository = LogManager.GetRepository();
+                IAppender[] appenders = repository.GetAppenders();

-            RegisterCommonCommands();
-            
-            m_console.Commands.AddCommand("General", false, "quit",
-                    "quit",
-                    "Quit the application", HandleQuit);
+                foreach (IAppender appender in appenders)
+                {
+                    if (appender.Name == "Console")
+                    {
+                        m_consoleAppender = (OpenSimAppender)appender;
+                        break;
+                    }
+                }

-            m_console.Commands.AddCommand("General", false, "shutdown",
-                    "shutdown",
-                    "Quit the application", HandleQuit);
+                if (null == m_consoleAppender)
+                {
+                    Notice("No appender named Console found (see the log4net config file for this executable)!");
+                }
+                else
+                {
+                    m_consoleAppender.Console = m_console;
+                    
+                    // If there is no threshold set then the threshold is effectively everything.
+                    if (null == m_consoleAppender.Threshold)
+                        m_consoleAppender.Threshold = Level.All;
+                    
+                    Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
+                }
+                
+                m_console.Commands.AddCommand("General", false, "quit",
+                        "quit",
+                        "Quit the application", HandleQuit);
+
+                m_console.Commands.AddCommand("General", false, "shutdown",
+                        "shutdown",
+                        "Quit the application", HandleQuit);
+
+                m_console.Commands.AddCommand("General", false, "set log level",
+                        "set log level <level>",
+                        "Set the console logging level", HandleLogLevel);
+
+                m_console.Commands.AddCommand("General", false, "show info",
+                        "show info",
+                        "Show general information about the server", HandleShow);
+
+                m_console.Commands.AddCommand("General", false, "show threads",
+                        "show threads",
+                        "Show thread status", HandleShow);
+
+                m_console.Commands.AddCommand("General", false, "show uptime",
+                        "show uptime",
+                        "Show server uptime", HandleShow);
+
+                m_console.Commands.AddCommand("General", false, "show version",
+                        "show version",
+                        "Show server version", HandleShow);
+
+                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("General", false, "threads show",
+                        "threads show",
+                        "Show thread status.  Synonym for \"show threads\"",
+                        (string module, string[] args) => Notice(GetThreadsReport()));
+            }
        }
        
        /// <summary>
@@ -129,12 +224,75 @@ namespace OpenSim.Framework.Servers
            m_log.Debug(sb);
        }

+        /// <summary>
+        /// Get a report about the registered threads in this server.
+        /// </summary>
+        protected string GetThreadsReport()
+        {
+            // This should be a constant field.
+            string reportFormat = "{0,6}   {1,35}   {2,16}   {3,13}   {4,10}   {5,30}";
+
+            StringBuilder sb = new StringBuilder();
+            Watchdog.ThreadWatchdogInfo[] threads = Watchdog.GetThreadsInfo();
+
+            sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine);
+
+            int timeNow = Environment.TickCount & Int32.MaxValue;
+
+            sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "LIFETIME (MS)", "PRIORITY", "STATE");
+            sb.Append(Environment.NewLine);
+
+            foreach (Watchdog.ThreadWatchdogInfo twi in threads)
+            {
+                Thread t = twi.Thread;
+                
+                sb.AppendFormat(
+                    reportFormat,
+                    t.ManagedThreadId,
+                    t.Name,
+                    timeNow - twi.LastTick,
+                    timeNow - twi.FirstTick,
+                    t.Priority,
+                    t.ThreadState);
+
+                sb.Append("\n");
+            }
+
+            sb.Append("\n");
+
+            // 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();
+        }
+
+        /// <summary>
+        /// Return a report about the uptime of this server
+        /// </summary>
+        /// <returns></returns>
+        protected string GetUptimeReport()
+        {
+            StringBuilder sb = new StringBuilder(String.Format("Time now is {0}\n", DateTime.Now));
+            sb.Append(String.Format("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime));
+            sb.Append(String.Format("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime));
+
+            return sb.ToString();
+        }
+
        /// <summary>
        /// Performs initialisation of the scene, such as loading configuration from disk.
        /// </summary>
        public virtual void Startup()
        {
            m_log.Info("[STARTUP]: Beginning startup processing");
+
+            EnhanceVersionInformation();
            
            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
@@ -169,7 +327,257 @@ namespace OpenSim.Framework.Servers
        private void HandleQuit(string module, string[] args)
        {
            Shutdown();
-        }      
+        }
+
+        private void HandleLogLevel(string module, string[] cmd)
+        {
+            if (null == m_consoleAppender)
+            {
+                Notice("No appender named Console found (see the log4net config file for this executable)!");
+                return;
+            }
+      
+            if (cmd.Length > 3)
+            {
+                string rawLevel = cmd[3];
+                
+                ILoggerRepository repository = LogManager.GetRepository();
+                Level consoleLevel = repository.LevelMap[rawLevel];
+                
+                if (consoleLevel != null)
+                    m_consoleAppender.Threshold = consoleLevel;
+                else
+                    Notice(
+                        String.Format(
+                            "{0} is not a valid logging level.  Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF",
+                            rawLevel));
+            }
+
+            Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
+        }
+
+        /// <summary>
+        /// Show help information
+        /// </summary>
+        /// <param name="helpArgs"></param>
+        protected virtual void ShowHelp(string[] helpArgs)
+        {
+            Notice("");
+            
+            if (helpArgs.Length == 0)
+            {
+                Notice("set log level [level] - change the console logging level only.  For example, off or debug.");
+                Notice("show info - show server information (e.g. startup path).");
+                Notice("show threads - list tracked threads");
+                Notice("show uptime - show server startup time and uptime.");
+                Notice("show version - show server version.");
+                Notice("");
+
+                return;
+            }
+        }
+
+        public virtual void HandleShow(string module, string[] cmd)
+        {
+            List<string> args = new List<string>(cmd);
+
+            args.RemoveAt(0);
+
+            string[] showParams = args.ToArray();
+
+            switch (showParams[0])
+            {
+                case "info":
+                    ShowInfo();
+                    break;
+
+                case "threads":
+                    Notice(GetThreadsReport());
+                    break;
+
+                case "uptime":
+                    Notice(GetUptimeReport());
+                    break;
+
+                case "version":
+                    Notice(GetVersionText());
+                    break;
+            }
+        }
+
+        public virtual void HandleThreadsAbort(string module, string[] cmd)
+        {
+            if (cmd.Length != 3)
+            {
+                MainConsole.Instance.Output("Usage: threads abort <thread-id>");
+                return;
+            }
+
+            int threadId;
+            if (!int.TryParse(cmd[2], out threadId))
+            {
+                MainConsole.Instance.Output("ERROR: Thread id must be an integer");
+                return;
+            }
+
+            if (Watchdog.AbortThread(threadId))
+                MainConsole.Instance.OutputFormat("Aborted thread with id {0}", threadId);
+            else
+                MainConsole.Instance.OutputFormat("ERROR - Thread with id {0} not found in managed threads", threadId);
+        }
+        
+        protected void ShowInfo()
+        {
+            Notice(GetVersionText());
+            Notice("Startup directory: " + m_startupDirectory);                
+            if (null != m_consoleAppender)
+                Notice(String.Format("Console log level: {0}", m_consoleAppender.Threshold));              
+        }
+        
+        protected string GetVersionText()
+        {
+            return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion);
+        }
+
+        /// <summary>
+        /// Console output is only possible if a console has been established.
+        /// That is something that cannot be determined within this class. So
+        /// all attempts to use the console MUST be verified.
+        /// </summary>
+        /// <param name="msg"></param>
+        protected void Notice(string msg)
+        {
+            if (m_console != null)
+            {
+                m_console.Output(msg);
+            }
+        }
+        
+        /// <summary>
+        /// Console output is only possible if a console has been established.
+        /// That is something that cannot be determined within this class. So
+        /// all attempts to use the console MUST be verified.
+        /// </summary>
+        /// <param name="format"></param>        
+        /// <param name="components"></param>
+        protected void Notice(string format, params string[] components)
+        {
+            if (m_console != null)
+                m_console.OutputFormat(format, components);
+        }
+
+        /// <summary>
+        /// Enhance the version string with extra information if it's available.
+        /// </summary>
+        protected void EnhanceVersionInformation()
+        {
+            string buildVersion = string.Empty;
+
+            // The subversion information is deprecated and will be removed at a later date
+            // Add subversion revision information if available
+            // Try file "svn_revision" in the current directory first, then the .svn info.
+            // This allows to make the revision available in simulators not running from the source tree.
+            // FIXME: Making an assumption about the directory we're currently in - we do this all over the place
+            // elsewhere as well
+            string gitDir = "../.git/";
+            string gitRefPointerPath = gitDir + "HEAD";
+
+            string svnRevisionFileName = "svn_revision";
+            string svnFileName = ".svn/entries";
+            string manualVersionFileName = ".version";
+            string inputLine;
+            int strcmp;
+
+            if (File.Exists(manualVersionFileName))
+            {
+                using (StreamReader CommitFile = File.OpenText(manualVersionFileName))
+                    buildVersion = CommitFile.ReadLine();
+
+                m_version += buildVersion ?? "";
+            }
+            else if (File.Exists(gitRefPointerPath))
+            {
+//                m_log.DebugFormat("[OPENSIM]: Found {0}", gitRefPointerPath);
+
+                string rawPointer = "";
+
+                using (StreamReader pointerFile = File.OpenText(gitRefPointerPath))
+                    rawPointer = pointerFile.ReadLine();
+
+//                m_log.DebugFormat("[OPENSIM]: rawPointer [{0}]", rawPointer);
+
+                Match m = Regex.Match(rawPointer, "^ref: (.+)$");
+
+                if (m.Success)
+                {
+//                    m_log.DebugFormat("[OPENSIM]: Matched [{0}]", m.Groups[1].Value);
+
+                    string gitRef = m.Groups[1].Value;
+                    string gitRefPath = gitDir + gitRef;
+                    if (File.Exists(gitRefPath))
+                    {
+//                        m_log.DebugFormat("[OPENSIM]: Found gitRefPath [{0}]", gitRefPath);
+
+                        using (StreamReader refFile = File.OpenText(gitRefPath))
+                        {
+                            string gitHash = refFile.ReadLine();
+                            m_version += gitHash.Substring(0, 7);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // Remove the else logic when subversion mirror is no longer used
+                if (File.Exists(svnRevisionFileName))
+                {
+                    StreamReader RevisionFile = File.OpenText(svnRevisionFileName);
+                    buildVersion = RevisionFile.ReadLine();
+                    buildVersion.Trim();
+                    RevisionFile.Close();
+                }
+
+                if (string.IsNullOrEmpty(buildVersion) && File.Exists(svnFileName))
+                {
+                    StreamReader EntriesFile = File.OpenText(svnFileName);
+                    inputLine = EntriesFile.ReadLine();
+                    while (inputLine != null)
+                    {
+                        // using the dir svn revision at the top of entries file
+                        strcmp = String.Compare(inputLine, "dir");
+                        if (strcmp == 0)
+                       {
+                            buildVersion = EntriesFile.ReadLine();
+                            break;
+                        }
+                        else
+                        {
+                            inputLine = EntriesFile.ReadLine();
+                        }
+                    }
+                    EntriesFile.Close();
+                }
+
+                m_version += string.IsNullOrEmpty(buildVersion) ? "      " : ("." + buildVersion + "     ").Substring(0, 6);
+            }
+        }
+        
+        protected void CreatePIDFile(string path)
+        {
+            try
+            {
+                string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
+                FileStream fs = File.Create(path);
+
+                Byte[] buf = Encoding.ASCII.GetBytes(pidstring);
+                fs.Write(buf, 0, buf.Length);
+                fs.Close();
+                m_pidFile = path;
+            }
+            catch (Exception)
+            {
+            }
+        }
        
        public string osSecret {
            // Secret uuid for the simulator
@@ -188,5 +596,20 @@ namespace OpenSim.Framework.Servers
                return StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version);
            }
        }
+           
+        protected void RemovePIDFile()
+        {
+            if (m_pidFile != String.Empty)
+            {
+                try
+                {
+                    File.Delete(m_pidFile);
+                    m_pidFile = String.Empty;
+                }
+                catch (Exception)
+                {
+                }
+            }
+        }
    }
-}
+}
@@ -436,7 +436,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 //                    reqnum = String.Format("{0}:{1}",request.RemoteIPEndPoint,request.Headers["opensim-request-id"]);
                 //m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl);

-                Culture.SetCurrentCulture();
+                Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true);

 //                //  This is the REST agent interface. We require an agent to properly identify
 //                //  itself. If the REST handler recognizes the prefix it will attempt to
@@ -630,11 +630,11 @@ namespace OpenSim.Framework.Servers.HttpServer
            }
            catch (IOException e)
            {
-                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.StackTrace), e);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
            }
            catch (Exception e)
            {
-                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.StackTrace), e);
+                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
                SendHTML500(response);
            }
            finally
@@ -642,7 +642,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                // Every month or so this will wrap and give bad numbers, not really a problem
                // since its just for reporting
                int tickdiff = requestEndTick - requestStartTick;
-                if (tickdiff > 3000 && requestHandler != null && requestHandler.Name != "GetTexture")
+                if (tickdiff > 3000)
                {
                    m_log.InfoFormat(
                        "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} {4} from {5} took {6}ms",
@@ -719,11 +719,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                if (DebugLevel == 5)
                {
                    const int sampleLength = 80;
-                    char[] sampleChars = new char[sampleLength + 3];
+                    char[] sampleChars = new char[sampleLength];
                    reader.Read(sampleChars, 0, sampleLength);
-                    sampleChars[80] = '.';
-                    sampleChars[81] = '.';
-                    sampleChars[82] = '.';
                    output = new string(sampleChars);
                }
                else
@@ -731,7 +728,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    output = reader.ReadToEnd();
                }

-                m_log.DebugFormat("[BASE HTTP SERVER]: {0}", output.Replace("\n", @"\n"));
+                m_log.DebugFormat("[BASE HTTP SERVER]: {0}...", output.Replace("\n", @"\n"));
            }
        }

@@ -1282,6 +1279,59 @@ namespace OpenSim.Framework.Servers.HttpServer
            map["login"] = OSD.FromString("false");
            return map;
        }
+        /// <summary>
+        /// A specific agent handler was provided. Such a handler is expecetd to have an
+        /// intimate, and highly specific relationship with the client. Consequently,
+        /// nothing is done here.
+        /// </summary>
+        /// <param name="handler"></param>
+        /// <param name="request"></param>
+        /// <param name="response"></param>
+
+        private bool HandleAgentRequest(IHttpAgentHandler handler, OSHttpRequest request, OSHttpResponse response)
+        {
+            // In the case of REST, then handler is responsible for ALL aspects of
+            // the request/response handling. Nothing is done here, not even encoding.
+
+            try
+            {
+                return handler.Handle(request, response);
+            }
+            catch (Exception e)
+            {
+                // If the handler did in fact close the stream, then this will blow
+                // chunks. So that that doesn't disturb anybody we throw away any
+                // and all exceptions raised. We've done our best to release the
+                // client.
+                try
+                {
+                    m_log.Warn("[HTTP-AGENT]: Error - " + e.Message);
+                    response.SendChunked   = false;
+                    response.KeepAlive     = true;
+                    response.StatusCode    = (int)OSHttpStatusCode.ServerErrorInternalError;
+                    //response.OutputStream.Close();
+                    try
+                    {
+                        response.Send();
+                        //response.FreeContext();
+                    }
+                    catch (SocketException f)
+                    {
+                        // This has to be here to prevent a Linux/Mono crash
+                        m_log.Warn(
+                            String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", f.Message), f);
+                    }
+                }
+                catch(Exception)
+                {
+                }
+            }
+
+            // Indicate that the request has been "handled"
+
+            return true;
+
+        }

        public byte[] HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
        {
@@ -1623,7 +1673,6 @@ namespace OpenSim.Framework.Servers.HttpServer

                // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events
                m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000);
-                m_PollServiceManager.Start();
                HTTPDRunning = true;

                //HttpListenerContext context;
@@ -1674,8 +1723,6 @@ namespace OpenSim.Framework.Servers.HttpServer
            HTTPDRunning = false;
            try
            {
-                m_PollServiceManager.Stop();
-
                m_httpListener2.ExceptionThrown -= httpServerException;
                //m_httpListener2.DisconnectHandler = null;

@@ -45,26 +45,19 @@ namespace OpenSim.Framework.Servers.HttpServer
        private uint m_WorkerThreadCount = 0;
        private Thread[] m_workerThreads;
        private PollServiceWorkerThread[] m_PollServiceWorkerThreads;
-        private volatile bool m_running = true;
-        private int m_pollTimeout;
+        private bool m_running = true;

        public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout)
        {
            m_server = pSrv;
            m_WorkerThreadCount = pWorkerThreadCount;
-            m_pollTimeout = pTimeout;
-        }
-
-        public void Start()
-        {
-            m_running = true;
            m_workerThreads = new Thread[m_WorkerThreadCount];
            m_PollServiceWorkerThreads = new PollServiceWorkerThread[m_WorkerThreadCount];

            //startup worker threads
            for (uint i = 0; i < m_WorkerThreadCount; i++)
            {
-                m_PollServiceWorkerThreads[i] = new PollServiceWorkerThread(m_server, m_pollTimeout);
+                m_PollServiceWorkerThreads[i] = new PollServiceWorkerThread(m_server, pTimeout);
                m_PollServiceWorkerThreads[i].ReQueue += ReQueueEvent;

                m_workerThreads[i]
@@ -143,10 +136,8 @@ namespace OpenSim.Framework.Servers.HttpServer
            
        }

-        public void Stop()
+        ~PollServiceRequestManager()
        {
-            m_running = false;
-
            foreach (object o in m_requests)
            {
                PollServiceHttpRequest req = (PollServiceHttpRequest) o;
@@ -160,6 +151,8 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
                t.Abort();
            }
+            
+            m_running = false;
        }
    }
 }
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Framework.Servers.HttpServer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("c4ea5baa-81c4-4867-a645-1ec360c1f164")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Framework.Servers")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b48e8b3e-5c5c-4673-b31f-21e13b8e568b")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,677 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using log4net;
-using log4net.Appender;
-using log4net.Core;
-using log4net.Repository;
-using Nini.Config;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Monitoring;
-
-namespace OpenSim.Framework.Servers
-{
-    public class ServerBase
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public IConfigSource Config { get; protected set; }
-
-        /// <summary>
-        /// Console to be used for any command line output.  Can be null, in which case there should be no output.
-        /// </summary>
-        protected ICommandConsole m_console;
-
-        protected OpenSimAppender m_consoleAppender;
-        protected FileAppender m_logFileAppender; 
-
-        protected DateTime m_startuptime;
-        protected string m_startupDirectory = Environment.CurrentDirectory;
-
-        protected string m_pidFile = String.Empty;
-
-        /// <summary>
-        /// Server version information.  Usually VersionInfo + information about git commit, operating system, etc.
-        /// </summary>
-        protected string m_version;
-
-        public ServerBase()
-        {
-            m_startuptime = DateTime.Now;
-            m_version = VersionInfo.Version;
-            EnhanceVersionInformation();
-        }
-
-        protected void CreatePIDFile(string path)
-        {
-            try
-            {
-                string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
-
-                using (FileStream fs = File.Create(path))
-                {
-                    Byte[] buf = Encoding.ASCII.GetBytes(pidstring);
-                    fs.Write(buf, 0, buf.Length);
-                }
-
-                m_pidFile = path;
-
-                m_log.InfoFormat("[SERVER BASE]: Created pid file {0}", m_pidFile);
-            }
-            catch (Exception e)
-            {
-                m_log.Warn(string.Format("[SERVER BASE]: Could not create PID file at {0} ", path), e);
-            }
-        }
-           
-        protected void RemovePIDFile()
-        {
-            if (m_pidFile != String.Empty)
-            {
-                try
-                {
-                    File.Delete(m_pidFile);
-                }
-                catch (Exception e)
-                {
-                    m_log.Error(string.Format("[SERVER BASE]: Error whilst removing {0} ", m_pidFile), e);
-                }
-
-                m_pidFile = String.Empty;
-            }
-        }
-
-        public void RegisterCommonAppenders(IConfig startupConfig)
-        {
-            ILoggerRepository repository = LogManager.GetRepository();
-            IAppender[] appenders = repository.GetAppenders();
-
-            foreach (IAppender appender in appenders)
-            {
-                if (appender.Name == "Console")
-                {
-                    m_consoleAppender = (OpenSimAppender)appender;
-                }
-                else if (appender.Name == "LogFileAppender")
-                {
-                    m_logFileAppender = (FileAppender)appender;
-                }
-            }
-
-            if (null == m_consoleAppender)
-            {
-                Notice("No appender named Console found (see the log4net config file for this executable)!");
-            }
-            else
-            {
-                // FIXME: This should be done through an interface rather than casting.
-                m_consoleAppender.Console = (ConsoleBase)m_console;
-                
-                // If there is no threshold set then the threshold is effectively everything.
-                if (null == m_consoleAppender.Threshold)
-                    m_consoleAppender.Threshold = Level.All;
-                
-                Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
-            }
-
-            if (m_logFileAppender != null && startupConfig != null)
-            {
-                string cfgFileName = startupConfig.GetString("LogFile", null);
-                if (cfgFileName != null)
-                {
-                    m_logFileAppender.File = cfgFileName;
-                    m_logFileAppender.ActivateOptions();
-                }
-
-                m_log.InfoFormat("[SERVER BASE]: Logging started to file {0}", m_logFileAppender.File);
-            }
-        }
-
-        /// <summary>
-        /// Register common commands once m_console has been set if it is going to be set
-        /// </summary>
-        public void RegisterCommonCommands()
-        {
-            if (m_console == null)
-                return;
-
-            m_console.Commands.AddCommand(
-                "General", false, "show info", "show info", "Show general information about the server", HandleShow);
-
-            m_console.Commands.AddCommand(
-                "General", false, "show version", "show version", "Show server version", HandleShow);
-
-            m_console.Commands.AddCommand(
-                "General", false, "show uptime", "show uptime", "Show server uptime", HandleShow);
-
-            m_console.Commands.AddCommand(
-                "General", false, "get log level", "get log level", "Get the current console logging level", 
-                (mod, cmd) => ShowLogLevel());
-
-            m_console.Commands.AddCommand(
-                "General", false, "set log level", "set log level <level>", 
-                "Set the console logging level for this session.", HandleSetLogLevel);
-
-            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(
-                "General", false, "config get",
-                "config get [<section>] [<key>]",
-                "Synonym for config show",
-                HandleConfig);
-            
-            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(
-                "General", false, "config save",
-                "config save <path>",
-                "Save current configuration to a file at the given path", HandleConfig);
-
-            m_console.Commands.AddCommand(
-                "General", false, "command-script",
-                "command-script <script>",
-                "Run a command script from file", HandleScript);
-
-            m_console.Commands.AddCommand(
-                "General", false, "show threads",
-                "show threads",
-                "Show thread status", HandleShow);
-
-            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(
-                "General", false, "threads show",
-                "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)
-        {
-            Notice("Manually invoking runtime garbage collection");
-            GC.Collect();
-        }
-
-        public virtual void HandleShow(string module, string[] cmd)
-        {
-            List<string> args = new List<string>(cmd);
-
-            args.RemoveAt(0);
-
-            string[] showParams = args.ToArray();
-
-            switch (showParams[0])
-            {
-                case "info":
-                    ShowInfo();
-                    break;
-
-                case "version":
-                    Notice(GetVersionText());
-                    break;
-
-                case "uptime":
-                    Notice(GetUptimeReport());
-                    break;
-
-                case "threads":
-                    Notice(GetThreadsReport());
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Change and load configuration file data.
-        /// </summary>
-        /// <param name="module"></param>
-        /// <param name="cmd"></param>
-        private void HandleConfig(string module, string[] cmd)
-        {
-            List<string> args = new List<string>(cmd);
-            args.RemoveAt(0);
-            string[] cmdparams = args.ToArray();
-
-            if (cmdparams.Length > 0)
-            {
-                string firstParam = cmdparams[0].ToLower();
-                
-                switch (firstParam)
-                {
-                    case "set":
-                        if (cmdparams.Length < 4)
-                        {
-                            Notice("Syntax: config set <section> <key> <value>");
-                            Notice("Example: config set ScriptEngine.DotNetEngine NumberOfScriptThreads 5");
-                        }
-                        else
-                        {
-                            IConfig c;
-                            IConfigSource source = new IniConfigSource();
-                            c = source.AddConfig(cmdparams[1]);
-                            if (c != null)
-                            {
-                                string _value = String.Join(" ", cmdparams, 3, cmdparams.Length - 3);
-                                c.Set(cmdparams[2], _value);
-                                Config.Merge(source);
-
-                                Notice("In section [{0}], set {1} = {2}", c.Name, cmdparams[2], _value);
-                            }
-                        }
-                        break;
-
-                    case "get":
-                    case "show":
-                        if (cmdparams.Length == 1)
-                        {
-                            foreach (IConfig config in Config.Configs)
-                            {
-                                Notice("[{0}]", config.Name);
-                                string[] keys = config.GetKeys();
-                                foreach (string key in keys)
-                                    Notice("  {0} = {1}", key, config.GetString(key));
-                            }
-                        }
-                        else if (cmdparams.Length == 2 || cmdparams.Length == 3)
-                        {
-                            IConfig config = Config.Configs[cmdparams[1]];
-                            if (config == null)
-                            {
-                                Notice("Section \"{0}\" does not exist.",cmdparams[1]);
-                                break;
-                            }
-                            else
-                            {
-                                if (cmdparams.Length == 2)
-                                {
-                                    Notice("[{0}]", config.Name);
-                                    foreach (string key in config.GetKeys())
-                                        Notice("  {0} = {1}", key, config.GetString(key));                                
-                                }
-                                else
-                                {
-                                    Notice(
-                                        "config get {0} {1} : {2}", 
-                                        cmdparams[1], cmdparams[2], config.GetString(cmdparams[2]));
-                                }
-                            }
-                        }
-                        else
-                        {
-                            Notice("Syntax: config {0} [<section>] [<key>]", firstParam);
-                            Notice("Example: config {0} ScriptEngine.DotNetEngine NumberOfScriptThreads", firstParam);
-                        }
-
-                        break;
-
-                    case "save":
-                        if (cmdparams.Length < 2)
-                        {
-                            Notice("Syntax: config save <path>");
-                            return;
-                        }
-
-                        string path = cmdparams[1];
-                        Notice("Saving configuration file: {0}", path);
-
-                        if (Config is IniConfigSource)
-                        {
-                            IniConfigSource iniCon = (IniConfigSource)Config;
-                            iniCon.Save(path);
-                        }
-                        else if (Config is XmlConfigSource)
-                        {
-                            XmlConfigSource xmlCon = (XmlConfigSource)Config;
-                            xmlCon.Save(path);
-                        }
-
-                        break;
-                }
-            }
-        }
-
-        private void HandleSetLogLevel(string module, string[] cmd)
-        {
-            if (cmd.Length != 4)
-            {
-                Notice("Usage: set log level <level>");
-                return;
-            }
-
-            if (null == m_consoleAppender)
-            {
-                Notice("No appender named Console found (see the log4net config file for this executable)!");
-                return;
-            }
-
-            string rawLevel = cmd[3];
-            
-            ILoggerRepository repository = LogManager.GetRepository();
-            Level consoleLevel = repository.LevelMap[rawLevel];
-            
-            if (consoleLevel != null)
-                m_consoleAppender.Threshold = consoleLevel;
-            else
-                Notice(
-                    "{0} is not a valid logging level.  Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF",
-                    rawLevel);
-
-            ShowLogLevel();
-        }
-
-        private void ShowLogLevel()
-        {
-            Notice("Console log level is {0}", m_consoleAppender.Threshold);
-        }
-
-        protected virtual void HandleScript(string module, string[] parms)
-        {
-            if (parms.Length != 2)
-            {
-                Notice("Usage: command-script <path-to-script");
-                return;
-            }
-
-            RunCommandScript(parms[1]);
-        }
-
-        /// <summary>
-        /// Run an optional startup list of commands
-        /// </summary>
-        /// <param name="fileName"></param>
-        protected void RunCommandScript(string fileName)
-        {
-            if (m_console == null)
-                return;
-
-            if (File.Exists(fileName))
-            {
-                m_log.Info("[SERVER BASE]: Running " + fileName);
-
-                using (StreamReader readFile = File.OpenText(fileName))
-                {
-                    string currentCommand;
-                    while ((currentCommand = readFile.ReadLine()) != null)
-                    {
-                        currentCommand = currentCommand.Trim();
-                        if (!(currentCommand == ""
-                            || currentCommand.StartsWith(";")
-                            || currentCommand.StartsWith("//")
-                            || currentCommand.StartsWith("#")))
-                        {
-                            m_log.Info("[SERVER BASE]: Running '" + currentCommand + "'");
-                            m_console.RunCommand(currentCommand);
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Return a report about the uptime of this server
-        /// </summary>
-        /// <returns></returns>
-        protected string GetUptimeReport()
-        {
-            StringBuilder sb = new StringBuilder(String.Format("Time now is {0}\n", DateTime.Now));
-            sb.Append(String.Format("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime));
-            sb.Append(String.Format("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime));
-
-            return sb.ToString();
-        }
-
-        protected void ShowInfo()
-        {
-            Notice(GetVersionText());
-            Notice("Startup directory: " + m_startupDirectory);                
-            if (null != m_consoleAppender)
-                Notice(String.Format("Console log level: {0}", m_consoleAppender.Threshold));              
-        }
-
-        /// <summary>
-        /// Enhance the version string with extra information if it's available.
-        /// </summary>
-        protected void EnhanceVersionInformation()
-        {
-            string buildVersion = string.Empty;
-
-            // The subversion information is deprecated and will be removed at a later date
-            // Add subversion revision information if available
-            // Try file "svn_revision" in the current directory first, then the .svn info.
-            // This allows to make the revision available in simulators not running from the source tree.
-            // FIXME: Making an assumption about the directory we're currently in - we do this all over the place
-            // elsewhere as well
-            string gitDir = "../.git/";
-            string gitRefPointerPath = gitDir + "HEAD";
-
-            string svnRevisionFileName = "svn_revision";
-            string svnFileName = ".svn/entries";
-            string manualVersionFileName = ".version";
-            string inputLine;
-            int strcmp;
-
-            if (File.Exists(manualVersionFileName))
-            {
-                using (StreamReader CommitFile = File.OpenText(manualVersionFileName))
-                    buildVersion = CommitFile.ReadLine();
-
-                m_version += buildVersion ?? "";
-            }
-            else if (File.Exists(gitRefPointerPath))
-            {
-//                m_log.DebugFormat("[SERVER BASE]: Found {0}", gitRefPointerPath);
-
-                string rawPointer = "";
-
-                using (StreamReader pointerFile = File.OpenText(gitRefPointerPath))
-                    rawPointer = pointerFile.ReadLine();
-
-//                m_log.DebugFormat("[SERVER BASE]: rawPointer [{0}]", rawPointer);
-
-                Match m = Regex.Match(rawPointer, "^ref: (.+)$");
-
-                if (m.Success)
-                {
-//                    m_log.DebugFormat("[SERVER BASE]: Matched [{0}]", m.Groups[1].Value);
-
-                    string gitRef = m.Groups[1].Value;
-                    string gitRefPath = gitDir + gitRef;
-                    if (File.Exists(gitRefPath))
-                    {
-//                        m_log.DebugFormat("[SERVER BASE]: Found gitRefPath [{0}]", gitRefPath);
-
-                        using (StreamReader refFile = File.OpenText(gitRefPath))
-                        {
-                            string gitHash = refFile.ReadLine();
-                            m_version += gitHash.Substring(0, 7);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                // Remove the else logic when subversion mirror is no longer used
-                if (File.Exists(svnRevisionFileName))
-                {
-                    StreamReader RevisionFile = File.OpenText(svnRevisionFileName);
-                    buildVersion = RevisionFile.ReadLine();
-                    buildVersion.Trim();
-                    RevisionFile.Close();
-                }
-
-                if (string.IsNullOrEmpty(buildVersion) && File.Exists(svnFileName))
-                {
-                    StreamReader EntriesFile = File.OpenText(svnFileName);
-                    inputLine = EntriesFile.ReadLine();
-                    while (inputLine != null)
-                    {
-                        // using the dir svn revision at the top of entries file
-                        strcmp = String.Compare(inputLine, "dir");
-                        if (strcmp == 0)
-                       {
-                            buildVersion = EntriesFile.ReadLine();
-                            break;
-                        }
-                        else
-                        {
-                            inputLine = EntriesFile.ReadLine();
-                        }
-                    }
-                    EntriesFile.Close();
-                }
-
-                m_version += string.IsNullOrEmpty(buildVersion) ? "      " : ("." + buildVersion + "     ").Substring(0, 6);
-            }
-        }
-
-        protected string GetVersionText()
-        {
-            return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion);
-        }
-
-        /// <summary>
-        /// Get a report about the registered threads in this server.
-        /// </summary>
-        protected string GetThreadsReport()
-        {
-            // This should be a constant field.
-            string reportFormat = "{0,6}   {1,35}   {2,16}   {3,13}   {4,10}   {5,30}";
-
-            StringBuilder sb = new StringBuilder();
-            Watchdog.ThreadWatchdogInfo[] threads = Watchdog.GetThreadsInfo();
-
-            sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine);
-
-            int timeNow = Environment.TickCount & Int32.MaxValue;
-
-            sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "LIFETIME (MS)", "PRIORITY", "STATE");
-            sb.Append(Environment.NewLine);
-
-            foreach (Watchdog.ThreadWatchdogInfo twi in threads)
-            {
-                Thread t = twi.Thread;
-                
-                sb.AppendFormat(
-                    reportFormat,
-                    t.ManagedThreadId,
-                    t.Name,
-                    timeNow - twi.LastTick,
-                    timeNow - twi.FirstTick,
-                    t.Priority,
-                    t.ThreadState);
-
-                sb.Append("\n");
-            }
-
-            sb.Append("\n");
-
-            // 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();
-        }
-
-        public virtual void HandleThreadsAbort(string module, string[] cmd)
-        {
-            if (cmd.Length != 3)
-            {
-                MainConsole.Instance.Output("Usage: threads abort <thread-id>");
-                return;
-            }
-
-            int threadId;
-            if (!int.TryParse(cmd[2], out threadId))
-            {
-                MainConsole.Instance.Output("ERROR: Thread id must be an integer");
-                return;
-            }
-
-            if (Watchdog.AbortThread(threadId))
-                MainConsole.Instance.OutputFormat("Aborted thread with id {0}", threadId);
-            else
-                MainConsole.Instance.OutputFormat("ERROR - Thread with id {0} not found in managed threads", threadId);
-        } 
-
-        /// <summary>
-        /// Console output is only possible if a console has been established.
-        /// That is something that cannot be determined within this class. So
-        /// all attempts to use the console MUST be verified.
-        /// </summary>
-        /// <param name="msg"></param>
-        protected void Notice(string msg)
-        {
-            if (m_console != null)
-            {
-                m_console.Output(msg);
-            }
-        }
-        
-        /// <summary>
-        /// Console output is only possible if a console has been established.
-        /// That is something that cannot be determined within this class. So
-        /// all attempts to use the console MUST be verified.
-        /// </summary>
-        /// <param name="format"></param>        
-        /// <param name="components"></param>
-        protected void Notice(string format, params object[] components)
-        {
-            if (m_console != null)
-                m_console.OutputFormat(format, components);
-        }
-    }
-}
@@ -35,12 +35,11 @@ using HttpServer;
 using HttpServer.FormDecoders;
 using NUnit.Framework;
 using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Tests.Common;

 namespace OpenSim.Framework.Servers.Tests
 {
    [TestFixture]
-    public class OSHttpTests : OpenSimTestCase
+    public class OSHttpTests
    {
        // we need an IHttpClientContext for our tests
        public class TestHttpClientContext: IHttpClientContext
@@ -29,12 +29,11 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using NUnit.Framework;
-using OpenSim.Tests.Common;

 namespace OpenSim.Framework.Servers.Tests
 {
    [TestFixture]
-    public class VersionInfoTests : OpenSimTestCase
+    public class VersionInfoTests
    {
        [Test]
        public void TestVersionLength()
@@ -29,8 +29,8 @@ namespace OpenSim
 {
    public class VersionInfo
    {
-        private const string VERSION_NUMBER = "0.7.5";
-        private const Flavour VERSION_FLAVOUR = Flavour.RC2;
+        private const string VERSION_NUMBER = "0.7.4";
+        private const Flavour VERSION_FLAVOUR = Flavour.Extended;

        public enum Flavour
        {
@@ -35,12 +35,10 @@ using OpenMetaverse;
 namespace OpenSim.Framework
 {
    /// <summary>
-    /// A dictionary containing task inventory items.  Indexed by item UUID.
+    /// A dictionary for task inventory.
    /// </summary>
-    /// <remarks>
    /// This class is not thread safe.  Callers must synchronize on Dictionary methods or Clone() this object before
    /// iterating over it.
-    /// </remarks>
    public class TaskInventoryDictionary : Dictionary<UUID, TaskInventoryItem>,
                                           ICloneable, IXmlSerializable
    {
@@ -73,6 +73,9 @@ namespace OpenSim.Framework

        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 {
                return _assetID;
@@ -350,13 +353,14 @@ namespace OpenSim.Framework
            }
        }

-        /// <summary>
-        /// This used ONLY during copy. It can't be relied on at other times!
-        /// </summary>
-        /// <remarks>
-        /// For true script running status, use IEntityInventory.TryGetScriptInstanceRunning() for now.
-        /// </remarks>
-        public bool ScriptRunning { get; set; }
+        public bool ScriptRunning {
+            get {
+                return _scriptRunning;
+            }
+            set {
+                _scriptRunning = value;
+            }
+        }

        // See ICloneable

@@ -384,7 +388,6 @@ namespace OpenSim.Framework

        public TaskInventoryItem()
        {
-            ScriptRunning = true;
            CreationDate = (uint)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
        }
    }
@@ -24,17 +24,16 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using NUnit.Framework;
-using OpenSim.Tests.Common;
+

 namespace OpenSim.Framework.Tests
 {
    [TestFixture]
-    public class AgentCircuitDataTest : OpenSimTestCase
+    public class AgentCircuitDataTest
    {
        private UUID AgentId;
        private AvatarAppearance AvAppearance;
@@ -38,7 +38,7 @@ using Animation = OpenSim.Framework.Animation;
 namespace OpenSim.Framework.Tests
 {
    [TestFixture]
-    public class AnimationTests : OpenSimTestCase
+    public class AnimationTests
    {
        private Animation anim1 = null;
        private Animation anim2 = null;
--- a/Show More
+++ b/Show More