Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concurrent thread use provoking mono crashes.

Same rationale as commit 13690582.

.gitignore

@@ -26,14 +26,9 @@
 bin/Debug/*.dll
 bin/*.dll.mdb
 bin/*.db
-bin/*.db-journal
 bin/addin-db-*
 bin/*.dll
 bin/OpenSim.vshost.exe.config
-bin/OpenSim.32BitLaunch.vshost.exe.config
-bin/OpenSim.32BitLaunch.log
-UpgradeLog.XML
-_UpgradeReport_Files/
 bin/ScriptEngines/*-*-*-*-*
 bin/ScriptEngines/*.dll
 bin/ScriptEngines/*/*.dll
@@ -66,7 +61,6 @@ Examples/*.dll
 OpenSim.build
 OpenSim.sln
 OpenSim.suo
-OpenSim.userprefs
 Prebuild/Prebuild.build
 Prebuild/Prebuild.sln
 TestResult.xml
@@ -95,5 +89,3 @@ OpenSim/Region/ScriptEngine/test-results/
 OpenSim/Tests/Common/test-results/
 OpenSim/Tests/test-results/
 test-results/
-doc/html
-doc/doxygen.error.log

.nant/local.include

@@ -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">

BUILDING.txt

@@ -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

CONTRIBUTORS.txt

@@ -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. 
@@ -71,7 +71,6 @@ what it is today.
 * CharlieO
 * ChrisDown
 * Chris Yeoh (IBM)
-* controlbreak
 * coyled
 * Daedius
 * Dong Jun Lan (IBM)
@@ -87,13 +86,8 @@ what it is today.
 * Grumly57
 * GuduleLapointe
 * Ewe Loon
-* Fernando Oliveira
 * Fly-Man
 * Flyte Xevious
-* Garmin Kawaguichi
-* Gryc Ueusp
-* Hiro Lecker
-* Iain Oliver
 * Imaze Rhiano
 * Intimidated
 * Jeremy Bongio (IBM)
@@ -112,7 +106,6 @@ what it is today.
 * M.Igarashi
 * maimedleech
 * Mana Janus
-* MarcelEdward
 * Mic Bowman
 * Michelle Argus
 * Michael Cortez (The Flotsam Project, http://osflotsam.org/)
@@ -142,11 +135,9 @@ what it is today.
 * Ruud Lathorp
 * SachaMagne
 * Salahzar Stenvaag
-* satguru p srivastava
 * sempuki
 * SignpostMarv
 * SpotOn3D
-* Stefan_Boom / stoehr
 * Strawberry Fride
 * Talun
 * TechplexEngineer (Blake Bourque)
@@ -183,14 +174,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)
@@ -211,5 +200,3 @@ In addition, we would like to thank:
 * The Mono Project
 * The NANT Developers
 * Microsoft (.NET, MSSQL-Adapters)
-*x
-  

OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs

@@ -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.");
@@ -122,10 +122,9 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                             Thread.CurrentThread.ManagedThreadId.ToString() +
                             ")");
                 
-                bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
+                m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
                 m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
-                if (changed)
-		  regionsToLoad[i].EstateSettings.Save();
+                regionsToLoad[i].EstateSettings.Save();
                 
                 if (scene != null)
                 {
@@ -136,6 +135,9 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                     }
                 }
             }
+
+            m_openSim.ModuleLoader.PostInitialise();
+            m_openSim.ModuleLoader.ClearCache();
         }
 
         public void Dispose()

OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs

@@ -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.

OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -572,7 +572,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 region.ExternalHostName = (string) requestData["external_address"];
 
-                bool persist = Convert.ToBoolean(requestData["persist"]);
+                bool persist = Convert.ToBoolean((string) requestData["persist"]);
                 if (persist)
                 {
                     // default place for region configuration files is in the
@@ -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");
             }
@@ -981,8 +982,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     string lastName = (string) requestData["user_lastname"];
                     string password = (string) requestData["user_password"];
 
-                    uint regionXLocation = Convert.ToUInt32(requestData["start_region_x"]);
-                    uint regionYLocation = Convert.ToUInt32(requestData["start_region_y"]);
+                    uint regionXLocation = Convert.ToUInt32((Int32) requestData["start_region_x"]);
+                    uint regionYLocation = Convert.ToUInt32((Int32) requestData["start_region_y"]);
 
                     string email = ""; // empty string for email
                     if (requestData.Contains("user_email"))
@@ -1179,9 +1180,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     if (requestData.ContainsKey("user_password")) password = (string) requestData["user_password"];
                     if (requestData.ContainsKey("start_region_x"))
-                        regionXLocation = Convert.ToUInt32(requestData["start_region_x"]);
+                        regionXLocation = Convert.ToUInt32((Int32) requestData["start_region_x"]);
                     if (requestData.ContainsKey("start_region_y"))
-                        regionYLocation = Convert.ToUInt32(requestData["start_region_y"]);
+                        regionYLocation = Convert.ToUInt32((Int32) requestData["start_region_y"]);
 
             //        if (requestData.ContainsKey("start_lookat_x"))
             //            ulaX = Convert.ToUInt32((Int32) requestData["start_lookat_x"]);
@@ -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);

OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs

@@ -312,16 +312,14 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 // Now that everything is setup we can proceed to
                 // add THIS agent to the HTTP server's handler list
 
-                // FIXME: If this code is ever to be re-enabled (most of it is disabled already) then this will
-                // have to be handled through the AddHttpHandler interface.
-//                if (!AddAgentHandler(Rest.Name,this))
-//                {
-//                    Rest.Log.ErrorFormat("{0} Unable to activate handler interface", MsgId);
-//                    foreach (IRest handler in handlers)
-//                    {
-//                        handler.Close();
-//                    }
-//                }
+                if (!AddAgentHandler(Rest.Name,this))
+                {
+                    Rest.Log.ErrorFormat("{0} Unable to activate handler interface", MsgId);
+                    foreach (IRest handler in handlers)
+                    {
+                        handler.Close();
+                    }
+                }
 
             }
             catch (Exception e)
@@ -344,13 +342,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
         {
             Rest.Log.InfoFormat("{0} Plugin is terminating", MsgId);
 
-            // FIXME: If this code is ever to be re-enabled (most of it is disabled already) then this will
-            // have to be handled through the AddHttpHandler interface.
-//            try
-//            {
-//                RemoveAgentHandler(Rest.Name, this);
-//            }
-//            catch (KeyNotFoundException){}
+            try
+            {
+                RemoveAgentHandler(Rest.Name, this);
+            }
+            catch (KeyNotFoundException){}
 
             foreach (IRest handler in handlers)
             {

OpenSim/ApplicationPlugins/Rest/RestPlugin.cs

@@ -297,9 +297,7 @@ namespace OpenSim.ApplicationPlugins.Rest
         {
             if (!IsEnabled) return false;
             _agents.Add(agentName, handler);
-//            return _httpd.AddAgentHandler(agentName, handler);
-            
-            return false;
+            return _httpd.AddAgentHandler(agentName, handler);
         }
 
         /// <summary>
@@ -318,7 +316,7 @@ namespace OpenSim.ApplicationPlugins.Rest
             if (_agents[agentName] == handler)
             {
                 _agents.Remove(agentName);
-//                return _httpd.RemoveAgentHandler(agentName, handler);
+                return _httpd.RemoveAgentHandler(agentName, handler);
             }
             return false;
         }
@@ -360,10 +358,10 @@ namespace OpenSim.ApplicationPlugins.Rest
                 _httpd.RemoveStreamHandler(h.HttpMethod, h.Path);
             }
             _handlers = null;
-//            foreach (KeyValuePair<string, IHttpAgentHandler> h in _agents)
-//            {
-//                _httpd.RemoveAgentHandler(h.Key, h.Value);
-//            }
+            foreach (KeyValuePair<string, IHttpAgentHandler> h in _agents)
+            {
+                _httpd.RemoveAgentHandler(h.Key, h.Value);
+            }
             _agents = null;
         }
 

OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs

@@ -223,9 +223,9 @@ namespace OpenSim.Capabilities.Handlers
                     // sending back the last byte instead of an error status
                     if (start >= texture.Data.Length)
                     {
-//                        m_log.DebugFormat(
-//                            "[GETTEXTURE]: Client requested range for texture {0} starting at {1} but texture has end of {2}",
-//                            texture.ID, start, texture.Data.Length);
+                        m_log.DebugFormat(
+                            "[GETTEXTURE]: Client requested range for texture {0} starting at {1} but texture has end of {2}",
+                            texture.ID, start, texture.Data.Length);
 
                         // Stricly speaking, as per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html, we should be sending back
                         // Requested Range Not Satisfiable (416) here.  However, it appears that at least recent implementations
@@ -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;
-                    }
                 }
             }
 

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

@@ -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()

OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs

@@ -163,7 +163,7 @@ namespace OpenSim.Capabilities.Handlers
                     invFetch.owner_id, invFetch.folder_id, invFetch.owner_id,
                     invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents);
 
-            if (inv != null && inv.Folders != null)
+            if (inv.Folders != null)
             {
                 foreach (InventoryFolderBase invFolder in inv.Folders)
                 {
@@ -173,7 +173,7 @@ namespace OpenSim.Capabilities.Handlers
                 descendents += inv.Folders.Count;
             }
 
-            if (inv != null && inv.Items != null)
+            if (inv.Items != null)
             {
                 foreach (InventoryItemBase invItem in inv.Items)
                 {

OpenSim/Capabilities/LLSDEnvironmentSettings.cs

@@ -1,68 +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;
-
-namespace OpenSim.Framework.Capabilities
-{
-    [OSDMap]
-    public class LLSDEnvironmentRequest
-    {
-        public UUID messageID;
-        public UUID regionID;
-    }
-
-    [OSDMap]
-    public class LLSDEnvironmentSetResponse
-    {
-        public UUID regionID;
-        public UUID messageID;
-        public Boolean success;
-        public String fail_reason;
-    }
-
-    public class EnvironmentSettings
-    {
-        /// <summary>
-        /// generates a empty llsd settings response for viewer
-        /// </summary>
-        /// <param name="messageID">the message UUID</param>
-        /// <param name="regionID">the region UUID</param>
-        public static string EmptySettings(UUID messageID, UUID regionID)
-        {
-            OSDArray arr = new OSDArray();
-            LLSDEnvironmentRequest msg = new LLSDEnvironmentRequest();
-            msg.messageID = messageID;
-            msg.regionID = regionID;
-            arr.Array.Add(msg);
-            return LLSDHelpers.SerialiseLLSDReply(arr);
-        }
-    }
-
-}

OpenSim/Capabilities/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/ConsoleClient/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Data/IPresenceData.cs

@@ -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);
     }
 }

OpenSim/Data/IRegionData.cs

@@ -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;

OpenSim/Data/IXAssetDataPlugin.cs

@@ -1,47 +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.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data
-{
-    /// <summary>
-    /// This interface exists to distinguish between the normal IAssetDataPlugin and the one used by XAssetService
-    /// for now.
-    /// </summary>
-    public interface IXAssetDataPlugin : IPlugin
-    {
-        AssetBase GetAsset(UUID uuid);
-        void StoreAsset(AssetBase asset);
-        bool ExistsAsset(UUID uuid);
-        List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
-        void Initialise(string connect);
-        bool Delete(string id);
-    }
-}

OpenSim/Data/IXGroupData.cs

@@ -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);
-    }
-}

OpenSim/Data/IXInventoryData.cs

@@ -40,11 +40,6 @@ namespace OpenSim.Data
         public UUID folderID;
         public UUID agentID;
         public UUID parentFolderID;
-
-        public XInventoryFolder Clone()
-        {
-            return (XInventoryFolder)MemberwiseClone();
-        }
     }
 
     public class XInventoryItem
@@ -69,11 +64,6 @@ namespace OpenSim.Data
         public UUID avatarID;
         public UUID parentFolderID;
         public int inventoryGroupPermissions;
-
-        public XInventoryItem Clone()
-        {
-            return (XInventoryItem)MemberwiseClone();
-        }
     }
 
     public interface IXInventoryData
@@ -116,22 +106,7 @@ namespace OpenSim.Data
         /// <returns>true if the delete was successful, false if it was not</returns>
         bool DeleteItems(string[] fields, string[] vals);
 
-        /// <summary>
-        /// Move an item to another folder.
-        /// </summary>
-        /// <returns>/returns>
-        /// <param name='id'>UUID of the item</param>
-        /// <param name='newParent'>UUID of the new parent folder.</param>
-        bool MoveItem(string id, string newParentFolderID);
-
-        /// <summary>
-        /// Move a folder to another folder.
-        /// </summary>
-        /// <returns>/returns>
-        /// <param name='id'>UUID of the item</param>
-        /// <param name='newParent'>UUID of the new parent folder.</param>
-        bool MoveFolder(string id, string newParentFolderID);
-
+        bool MoveItem(string id, string newParent);
         XInventoryItem[] GetActiveGestures(UUID principalID);
         int GetAssetPermissions(UUID principalID, UUID assetID);
     }

OpenSim/Data/MSSQL/MSSQLManager.cs

@@ -104,11 +104,6 @@ namespace OpenSim.Data.MSSQL
             {
                 return SqlDbType.BigInt;
             }
-            if (type == typeof(DateTime))
-            {
-                return SqlDbType.DateTime;
-            }
-
             return SqlDbType.VarChar;
         }
 

OpenSim/Data/MSSQL/MSSQLPresenceData.cs

@@ -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;
-        }
     }
 }

OpenSim/Data/MSSQL/MSSQLRegionData.cs

@@ -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
 {

OpenSim/Data/MSSQL/MSSQLSimulationData.cs

@@ -1181,72 +1181,6 @@ VALUES
             //            }
             #endregion
         }
-
-        #region Environment Settings
-        public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            string sql = "select * from [regionenvironment] where region_id = @region_id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-                conn.Open();
-                using (SqlDataReader result = cmd.ExecuteReader())
-                {
-                    if (!result.Read())
-                    {
-                        return String.Empty;
-                    }
-                    else
-                    {
-                        return Convert.ToString(result["llsd_settings"]);
-                    }
-                }
-            }
-        }
-
-        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            {
-                string sql = "DELETE FROM [regionenvironment] WHERE region_id = @region_id";
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
-
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
-                }
-
-                sql = "INSERT INTO [regionenvironment] (region_id, llsd_settings) VALUES (@region_id, @llsd_settings)";
-
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
-
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-                    cmd.Parameters.Add(_Database.CreateParameter("@llsd_settings", settings));
-
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
-                }
-            }
-        }
-
-        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            string sql = "delete from [regionenvironment] where region_id = @region_id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
-
-                conn.Open();
-                cmd.ExecuteNonQuery();
-            }
-        }
-        #endregion
-
         /// <summary>
         /// Loads the settings of a region.
         /// </summary>
@@ -1436,7 +1370,7 @@ VALUES
             newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]);
             newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]);
             newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]);
-            newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]);
+            newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
             newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
             newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
             newSettings.SunVector = new Vector3(
@@ -1865,7 +1799,7 @@ VALUES
             parameters.Add(_Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit));
             parameters.Add(_Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit));
             parameters.Add(_Database.CreateParameter("use_estate_sun", settings.UseEstateSun));
-            parameters.Add(_Database.CreateParameter("Sandbox", settings.Sandbox));
+            parameters.Add(_Database.CreateParameter("sandbox", settings.Sandbox));
             parameters.Add(_Database.CreateParameter("fixed_sun", settings.FixedSun));
             parameters.Add(_Database.CreateParameter("sun_position", settings.SunPosition));
             parameters.Add(_Database.CreateParameter("sunvectorx", settings.SunVector.X));
@@ -2202,18 +2136,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;
-        }
     }
 }

OpenSim/Data/MSSQL/MSSQLXInventoryData.cs

@@ -43,12 +43,12 @@ namespace OpenSim.Data.MSSQL
 //        private static readonly ILog m_log = LogManager.GetLogger(
 //                MethodBase.GetCurrentMethod().DeclaringType);
 
-        private MSSQLFolderHandler m_Folders;
+        private MSSQLGenericTableHandler<XInventoryFolder> m_Folders;
         private MSSQLItemHandler m_Items;
 
         public MSSQLXInventoryData(string conn, string realm)
         {
-            m_Folders = new MSSQLFolderHandler(
+            m_Folders = new MSSQLGenericTableHandler<XInventoryFolder>(
                     conn, "inventoryfolders", "InventoryStore");
             m_Items = new MSSQLItemHandler(
                     conn, "inventoryitems", String.Empty);
@@ -85,7 +85,6 @@ namespace OpenSim.Data.MSSQL
         {
             return m_Folders.Delete(field, val);
         }
-
         public bool DeleteFolders(string[] fields, string[] vals)
         {
             return m_Folders.Delete(fields, vals);
@@ -95,22 +94,15 @@ namespace OpenSim.Data.MSSQL
         {
             return m_Items.Delete(field, val);
         }
-
         public bool DeleteItems(string[] fields, string[] vals)
         {
             return m_Items.Delete(fields, vals);
         }
-
         public bool MoveItem(string id, string newParent)
         {
             return m_Items.MoveItem(id, newParent);
         }
 
-        public bool MoveFolder(string id, string newParent)
-        {
-            return m_Folders.MoveFolder(id, newParent);
-        }
-
         public XInventoryItem[] GetActiveGestures(UUID principalID)
         {
             return m_Items.GetActiveGestures(principalID);
@@ -122,7 +114,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,163 +123,70 @@ 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())
             {
-                using (SqlCommand cmd = new SqlCommand())
-                {
 
-                    cmd.CommandText = String.Format("update {0} set parentFolderID = @ParentFolderID where inventoryID = @InventoryID", m_Realm);
-                    cmd.Parameters.Add(m_database.CreateParameter("@ParentFolderID", newParent));
-                    cmd.Parameters.Add(m_database.CreateParameter("@InventoryID", id));
-                    cmd.Connection = conn;
-                    conn.Open();
-
-                    if (cmd.ExecuteNonQuery() == 0)
-                        return false;
-                }
+                cmd.CommandText = String.Format("update {0} set parentFolderID = @ParentFolderID where inventoryID = @InventoryID", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("@ParentFolderID", newParent));
+                cmd.Parameters.Add(m_database.CreateParameter("@InventoryID", id));
+                cmd.Connection = conn;
+                conn.Open();
+                return cmd.ExecuteNonQuery() == 0 ? false : true;
             }
-
-            IncrementFolderVersion(oldParent);
-            IncrementFolderVersion(newParent);
-
-            return true;
         }
 
         public XInventoryItem[] GetActiveGestures(UUID principalID)
         {
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
             {
-                using (SqlCommand cmd = new SqlCommand())
-                {
-                    cmd.CommandText = String.Format("select * from inventoryitems where avatarId = @uuid and assetType = @type and flags = 1", m_Realm);
+                cmd.CommandText = String.Format("select * from inventoryitems where avatarId = @uuid and assetType = @type and flags = 1", m_Realm);
 
-                    cmd.Parameters.Add(m_database.CreateParameter("@uuid", principalID.ToString()));
-                    cmd.Parameters.Add(m_database.CreateParameter("@type", (int)AssetType.Gesture));
-                    cmd.Connection = conn;
-                    conn.Open();
-                    return DoQuery(cmd);
-                }
+                cmd.Parameters.Add(m_database.CreateParameter("@uuid", principalID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@type", (int)AssetType.Gesture));
+                cmd.Connection = conn;
+                conn.Open();
+                return DoQuery(cmd);
             }
         }
 
         public int GetAssetPermissions(UUID principalID, UUID assetID)
         {
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
             {
-                using (SqlCommand cmd = new SqlCommand())
+                cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = @PrincipalID and assetID = @AssetID group by assetID", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@AssetID", assetID.ToString()));
+                cmd.Connection = conn;
+                conn.Open();
+                using (SqlDataReader reader = cmd.ExecuteReader())
                 {
-                    cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = @PrincipalID and assetID = @AssetID group by assetID", m_Realm);
-                    cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
-                    cmd.Parameters.Add(m_database.CreateParameter("@AssetID", assetID.ToString()));
-                    cmd.Connection = conn;
-                    conn.Open();
-                    using (SqlDataReader reader = cmd.ExecuteReader())
+
+                    int perms = 0;
+
+                    if (reader.Read())
                     {
-
-                        int perms = 0;
-
-                        if (reader.Read())
-                        {
-                            perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
-                        }
-
-                        return perms;
+                        perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
                     }
 
+                    return perms;
                 }
+
             }
         }
-
         public override bool Store(XInventoryItem item)
         {
             if (!base.Store(item))
                 return false;
-
-            IncrementFolderVersion(item.parentFolderID);
-
-            return true;
-        }
-    }
-
-    public class MSSQLFolderHandler : MSSQLInventoryHandler<XInventoryFolder>
-    {
-        public MSSQLFolderHandler(string c, string t, string m) :
-            base(c, t, m)
-        {
-        }
-
-        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;
-
+            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))
             {
-                using (SqlCommand cmd = new SqlCommand())
-                {
-
-                    cmd.CommandText = String.Format("update {0} set parentFolderID = @ParentFolderID where folderID = @folderID", m_Realm);
-                    cmd.Parameters.Add(m_database.CreateParameter("@ParentFolderID", newParentFolderID));
-                    cmd.Parameters.Add(m_database.CreateParameter("@folderID", id));
-                    cmd.Connection = conn;
-                    conn.Open();
-
-                    if (cmd.ExecuteNonQuery() == 0)
-                        return false;
-                }
-            }
-
-            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);
+                conn.Open();
 
+                    cmd.Parameters.AddWithValue("@folderID", item.parentFolderID.ToString());
                     try
                     {
                         cmd.ExecuteNonQuery();
@@ -295,11 +194,9 @@ namespace OpenSim.Data.MSSQL
                     catch (Exception)
                     {
                         return false;
-                    }
-                }
+                    }                
             }
-
             return true;
         }
     }
-}
+}

OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Data/MSSQL/Resources/RegionStore.migrations

@@ -1134,17 +1134,3 @@ ALTER TABLE landaccesslist ADD Expires integer NOT NULL  DEFAULT 0;
 
 COMMIT
 
-:VERSION 37       #---------------- Environment Settings
-
-BEGIN TRANSACTION
-
-CREATE TABLE [dbo].[regionenvironment](
-	[region_id] [uniqueidentifier] NOT NULL,
-	[llsd_settings] [varchar](max) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
- PRIMARY KEY CLUSTERED
-(
-	[region_id] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY]
-
-COMMIT

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -163,52 +163,53 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand cmd =
+                    MySqlCommand cmd =
                         new MySqlCommand(
                             "replace INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, asset_flags, CreatorID, data)" +
                             "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?CreatorID, ?data)",
-                            dbcon))
+                            dbcon);
+
+                    string assetName = asset.Name;
+                    if (asset.Name.Length > 64)
                     {
-                        string assetName = asset.Name;
-                        if (asset.Name.Length > 64)
+                        assetName = asset.Name.Substring(0, 64);
+                        m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
+                    }
+
+                    string assetDescription = asset.Description;
+                    if (asset.Description.Length > 64)
+                    {
+                        assetDescription = asset.Description.Substring(0, 64);
+                        m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
+                    }
+
+                    // need to ensure we dispose
+                    try
+                    {
+                        using (cmd)
                         {
-                            assetName = asset.Name.Substring(0, 64);
-                            m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
-                        }
-    
-                        string assetDescription = asset.Description;
-                        if (asset.Description.Length > 64)
-                        {
-                            assetDescription = asset.Description.Substring(0, 64);
-                            m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
-                        }
-    
-                        try
-                        {
-                            using (cmd)
-                            {
-                                // create unix epoch time
-                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                                cmd.Parameters.AddWithValue("?id", asset.ID);
-                                cmd.Parameters.AddWithValue("?name", assetName);
-                                cmd.Parameters.AddWithValue("?description", assetDescription);
-                                cmd.Parameters.AddWithValue("?assetType", asset.Type);
-                                cmd.Parameters.AddWithValue("?local", asset.Local);
-                                cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
-                                cmd.Parameters.AddWithValue("?create_time", now);
-                                cmd.Parameters.AddWithValue("?access_time", now);
-                                cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
-                                cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
-                                cmd.Parameters.AddWithValue("?data", asset.Data);
-                                cmd.ExecuteNonQuery();
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
-                                asset.FullID, asset.Name, e.Message);
+                            // create unix epoch time
+                            int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
+                            cmd.Parameters.AddWithValue("?id", asset.ID);
+                            cmd.Parameters.AddWithValue("?name", assetName);
+                            cmd.Parameters.AddWithValue("?description", assetDescription);
+                            cmd.Parameters.AddWithValue("?assetType", asset.Type);
+                            cmd.Parameters.AddWithValue("?local", asset.Local);
+                            cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
+                            cmd.Parameters.AddWithValue("?create_time", now);
+                            cmd.Parameters.AddWithValue("?access_time", now);
+                            cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
+                            cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
+                            cmd.Parameters.AddWithValue("?data", asset.Data);
+                            cmd.ExecuteNonQuery();
+                            cmd.Dispose();
                         }
                     }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
+                            asset.FullID, asset.Name, e.Message);
+                    }
                 }
             }
         }
@@ -220,31 +221,33 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
+                    MySqlCommand cmd =
+                        new MySqlCommand("update assets set access_time=?access_time where id=?id",
+                                         dbcon);
 
-                    using (MySqlCommand cmd
-                        = new MySqlCommand("update assets set access_time=?access_time where id=?id", dbcon))
+                    // need to ensure we dispose
+                    try
                     {
-                        try
+                        using (cmd)
                         {
-                            using (cmd)
-                            {
-                                // create unix epoch time
-                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                                cmd.Parameters.AddWithValue("?id", asset.ID);
-                                cmd.Parameters.AddWithValue("?access_time", now);
-                                cmd.ExecuteNonQuery();
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[ASSETS DB]: " +
-                                "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
-                                + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
+                            // create unix epoch time
+                            int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
+                            cmd.Parameters.AddWithValue("?id", asset.ID);
+                            cmd.Parameters.AddWithValue("?access_time", now);
+                            cmd.ExecuteNonQuery();
+                            cmd.Dispose();
                         }
                     }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[ASSETS DB]: " +
+                            "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
+                            + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
+                    }
                 }
             }
+
         }
 
         /// <summary>
@@ -307,41 +310,35 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
+                    MySqlCommand cmd = new MySqlCommand("SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count", dbcon);
+                    cmd.Parameters.AddWithValue("?start", start);
+                    cmd.Parameters.AddWithValue("?count", count);
 
-                    using (MySqlCommand cmd
-                        = new MySqlCommand(
-                            "SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count",
-                            dbcon))
+                    try
                     {
-                        cmd.Parameters.AddWithValue("?start", start);
-                        cmd.Parameters.AddWithValue("?count", count);
-    
-                        try
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
                         {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader())
+                            while (dbReader.Read())
                             {
-                                while (dbReader.Read())
-                                {
-                                    AssetMetadata metadata = new AssetMetadata();
-                                    metadata.Name = (string)dbReader["name"];
-                                    metadata.Description = (string)dbReader["description"];
-                                    metadata.Type = (sbyte)dbReader["assetType"];
-                                    metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
-                                    metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-                                    metadata.FullID = DBGuid.FromDB(dbReader["id"]);
-                                    metadata.CreatorID = dbReader["CreatorID"].ToString();
-    
-                                    // Current SHA1s are not stored/computed.
-                                    metadata.SHA1 = new byte[] { };
-    
-                                    retList.Add(metadata);
-                                }
+                                AssetMetadata metadata = new AssetMetadata();
+                                metadata.Name = (string)dbReader["name"];
+                                metadata.Description = (string)dbReader["description"];
+                                metadata.Type = (sbyte)dbReader["assetType"];
+                                metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
+                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
+                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
+                                metadata.CreatorID = dbReader["CreatorID"].ToString();
+
+                                // Current SHA1s are not stored/computed.
+                                metadata.SHA1 = new byte[] { };
+
+                                retList.Add(metadata);
                             }
                         }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[ASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
-                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error("[ASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
                     }
                 }
             }
@@ -356,12 +353,11 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
+                    MySqlCommand cmd = new MySqlCommand("delete from assets where id=?id", dbcon);
+                    cmd.Parameters.AddWithValue("?id", id);
+                    cmd.ExecuteNonQuery();
 
-                    using (MySqlCommand cmd = new MySqlCommand("delete from assets where id=?id", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", id);
-                        cmd.ExecuteNonQuery();
-                    }
+                    cmd.Dispose();
                 }
             }
 
@@ -370,4 +366,4 @@ namespace OpenSim.Data.MySQL
 
         #endregion
     }
-}
+}

OpenSim/Data/MySQL/MySQLAuthenticationData.cs

@@ -70,52 +70,41 @@ namespace OpenSim.Data.MySQL
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
+                MySqlCommand cmd = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID", dbcon);
+                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
 
-                using (MySqlCommand cmd
-                    = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID", dbcon))
+                IDataReader result = cmd.ExecuteReader();
+
+                if (result.Read())
                 {
-                    cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+                    ret.PrincipalID = principalID;
 
-                    IDataReader result = cmd.ExecuteReader();
-    
-                    if (result.Read())
+                    if (m_ColumnNames == null)
                     {
-                        ret.PrincipalID = principalID;
-    
-                        CheckColumnNames(result);
-    
-                        foreach (string s in m_ColumnNames)
-                        {
-                            if (s == "UUID")
-                                continue;
-    
-                            ret.Data[s] = result[s].ToString();
-                        }
-    
-                        return ret;
+                        m_ColumnNames = new List<string>();
+
+                        DataTable schemaTable = result.GetSchemaTable();
+                        foreach (DataRow row in schemaTable.Rows)
+                            m_ColumnNames.Add(row["ColumnName"].ToString());
                     }
-                    else
+
+                    foreach (string s in m_ColumnNames)
                     {
-                        return null;
+                        if (s == "UUID")
+                            continue;
+
+                        ret.Data[s] = result[s].ToString();
                     }
+
+                    return ret;
+                }
+                else
+                {
+                    return null;
                 }
             }
         }
 
-        private void CheckColumnNames(IDataReader result)
-        {
-            if (m_ColumnNames != null)
-                return;
-
-            List<string> columnNames = new List<string>();
-
-            DataTable schemaTable = result.GetSchemaTable();
-            foreach (DataRow row in schemaTable.Rows)
-                columnNames.Add(row["ColumnName"].ToString());
-
-            m_ColumnNames = columnNames;
-        }
-
         public bool Store(AuthenticationData data)
         {
             if (data.Data.ContainsKey("UUID"))
@@ -123,53 +112,57 @@ namespace OpenSim.Data.MySQL
 
             string[] fields = new List<string>(data.Data.Keys).ToArray();
 
-            using (MySqlCommand cmd = new MySqlCommand())
+            MySqlCommand cmd = new MySqlCommand();
+
+            string update = "update `"+m_Realm+"` set ";
+            bool first = true;
+            foreach (string field in fields)
             {
-                string update = "update `"+m_Realm+"` set ";
-                bool first = true;
-                foreach (string field in fields)
-                {
-                    if (!first)
-                        update += ", ";
-                    update += "`" + field + "` = ?"+field;
-    
-                    first = false;
-    
-                    cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
-                }
-    
-                update += " where UUID = ?principalID";
-    
-                cmd.CommandText = update;
-                cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
-    
+                if (!first)
+                    update += ", ";
+                update += "`" + field + "` = ?"+field;
+
+                first = false;
+
+                cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
+            }
+
+            update += " where UUID = ?principalID";
+
+            cmd.CommandText = update;
+            cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
+
+            if (ExecuteNonQuery(cmd) < 1)
+            {
+                string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
+                        String.Join("`, `", fields) +
+                        "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
+
+                cmd.CommandText = insert;
+
                 if (ExecuteNonQuery(cmd) < 1)
                 {
-                    string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
-                            String.Join("`, `", fields) +
-                            "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
-    
-                    cmd.CommandText = insert;
-    
-                    if (ExecuteNonQuery(cmd) < 1)
-                        return false;
+                    cmd.Dispose();
+                    return false;
                 }
             }
 
+            cmd.Dispose();
+
             return true;
         }
 
         public bool SetDataItem(UUID principalID, string item, string value)
         {
-            using (MySqlCommand cmd
-                = new MySqlCommand("update `" + m_Realm + "` set `" + item + "` = ?" + item + " where UUID = ?UUID"))
-            {
-                cmd.Parameters.AddWithValue("?"+item, value);
-                cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
-    
-                if (ExecuteNonQuery(cmd) > 0)
-                    return true;
-            }
+            MySqlCommand cmd = new MySqlCommand("update `" + m_Realm +
+                    "` set `" + item + "` = ?" + item + " where UUID = ?UUID");
+
+
+            cmd.Parameters.AddWithValue("?"+item, value);
+            cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
+
+            if (ExecuteNonQuery(cmd) > 0)
+                return true;
 
             return false;
         }
@@ -179,18 +172,18 @@ namespace OpenSim.Data.MySQL
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            using (MySqlCommand cmd
-                = new MySqlCommand(
-                    "insert into tokens (UUID, token, validity) values (?principalID, ?token, date_add(now(), interval ?lifetime minute))"))
+            MySqlCommand cmd = new MySqlCommand("insert into tokens (UUID, token, validity) values (?principalID, ?token, date_add(now(), interval ?lifetime minute))");
+            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+            cmd.Parameters.AddWithValue("?token", token);
+            cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
+
+            if (ExecuteNonQuery(cmd) > 0)
             {
-                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-                cmd.Parameters.AddWithValue("?token", token);
-                cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
-    
-                if (ExecuteNonQuery(cmd) > 0)
-                    return true;
+                cmd.Dispose();
+                return true;
             }
 
+            cmd.Dispose();
             return false;
         }
 
@@ -199,29 +192,30 @@ namespace OpenSim.Data.MySQL
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            using (MySqlCommand cmd
-                = new MySqlCommand(
-                    "update tokens set validity = date_add(now(), interval ?lifetime minute) where UUID = ?principalID and token = ?token and validity > now()"))
-            {
-                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-                cmd.Parameters.AddWithValue("?token", token);
-                cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
+            MySqlCommand cmd = new MySqlCommand("update tokens set validity = date_add(now(), interval ?lifetime minute) where UUID = ?principalID and token = ?token and validity > now()");
+            cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
+            cmd.Parameters.AddWithValue("?token", token);
+            cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
 
-                if (ExecuteNonQuery(cmd) > 0)
-                    return true;
+            if (ExecuteNonQuery(cmd) > 0)
+            {
+                cmd.Dispose();
+                return true;
             }
 
+            cmd.Dispose();
+
             return false;
         }
 
         private void DoExpire()
         {
-            using (MySqlCommand cmd = new MySqlCommand("delete from tokens where validity < now()"))
-            {
-                ExecuteNonQuery(cmd);
-            }
+            MySqlCommand cmd = new MySqlCommand("delete from tokens where validity < now()");
+            ExecuteNonQuery(cmd);
+
+            cmd.Dispose();
 
             m_LastExpire = System.Environment.TickCount;
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLAvatarData.cs

@@ -52,15 +52,14 @@ namespace OpenSim.Data.MySQL
 
         public bool Delete(UUID principalID, string name)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                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);
-    
-                if (ExecuteNonQuery(cmd) > 0)
-                    return true;
-            }
+            MySqlCommand cmd = new MySqlCommand();
+
+            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);
+
+            if (ExecuteNonQuery(cmd) > 0)
+                return true;
 
             return false;
         }

OpenSim/Data/MySQL/MySQLFriendsData.cs

@@ -49,38 +49,34 @@ namespace OpenSim.Data.MySQL
 
         public bool Delete(string principalID, string friend)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                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);
+            MySqlCommand cmd = new MySqlCommand();
 
-                ExecuteNonQuery(cmd);
-            }
+            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);
 
             return true;
         }
 
         public FriendsData[] GetFriends(UUID principalID)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                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", principalID.ToString());
+            MySqlCommand cmd = new MySqlCommand();
 
-                return DoQuery(cmd);
-            }
+            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", principalID.ToString());
+
+            return DoQuery(cmd);
         }
 
         public FriendsData[] GetFriends(string principalID)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                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 LIKE ?PrincipalID", m_Realm);
-                cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString() + '%');
+            MySqlCommand cmd = new MySqlCommand();
 
-                return DoQuery(cmd);
-            }
+            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 LIKE ?PrincipalID", m_Realm);
+            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString() + '%');
+            return DoQuery(cmd);
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLGenericTableHandler.cs

@@ -91,17 +91,15 @@ namespace OpenSim.Data.MySQL
             if (m_ColumnNames != null)
                 return;
 
-            List<string> columnNames = new List<string>();
+            m_ColumnNames = new List<string>();
 
             DataTable schemaTable = reader.GetSchemaTable();
             foreach (DataRow row in schemaTable.Rows)
             {
                 if (row["ColumnName"] != null &&
                         (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
-                    columnNames.Add(row["ColumnName"].ToString());
+                    m_ColumnNames.Add(row["ColumnName"].ToString());
             }
-
-            m_ColumnNames = columnNames;
         }
 
         public virtual T[] Get(string field, string key)
@@ -219,8 +217,6 @@ namespace OpenSim.Data.MySQL
 
         public virtual bool Store(T row)
         {
-//            m_log.DebugFormat("[MYSQL GENERIC TABLE HANDLER]: Store(T row) invoked");
-
             using (MySqlCommand cmd = new MySqlCommand())
             {
                 string query = "";
@@ -275,10 +271,6 @@ namespace OpenSim.Data.MySQL
 
         public virtual bool Delete(string[] fields, string[] keys)
         {
-//            m_log.DebugFormat(
-//                "[MYSQL GENERIC TABLE HANDLER]: Delete(string[] fields, string[] keys) invoked with {0}:{1}",
-//                string.Join(",", fields), string.Join(",", keys));
-
             if (fields.Length != keys.Length)
                 return false;
 

OpenSim/Data/MySQL/MySQLInventoryData.cs

@@ -467,43 +467,43 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand result = new MySqlCommand(sql, dbcon))
+                    MySqlCommand result = new MySqlCommand(sql, dbcon);
+                    result.Parameters.AddWithValue("?inventoryID", item.ID.ToString());
+                    result.Parameters.AddWithValue("?assetID", item.AssetID.ToString());
+                    result.Parameters.AddWithValue("?assetType", item.AssetType.ToString());
+                    result.Parameters.AddWithValue("?parentFolderID", item.Folder.ToString());
+                    result.Parameters.AddWithValue("?avatarID", item.Owner.ToString());
+                    result.Parameters.AddWithValue("?inventoryName", itemName);
+                    result.Parameters.AddWithValue("?inventoryDescription", itemDesc);
+                    result.Parameters.AddWithValue("?inventoryNextPermissions", item.NextPermissions.ToString());
+                    result.Parameters.AddWithValue("?inventoryCurrentPermissions",
+                                                   item.CurrentPermissions.ToString());
+                    result.Parameters.AddWithValue("?invType", item.InvType);
+                    result.Parameters.AddWithValue("?creatorID", item.CreatorId);
+                    result.Parameters.AddWithValue("?inventoryBasePermissions", item.BasePermissions);
+                    result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.EveryOnePermissions);
+                    result.Parameters.AddWithValue("?inventoryGroupPermissions", item.GroupPermissions);
+                    result.Parameters.AddWithValue("?salePrice", item.SalePrice);
+                    result.Parameters.AddWithValue("?saleType", unchecked((sbyte)item.SaleType));
+                    result.Parameters.AddWithValue("?creationDate", item.CreationDate);
+                    result.Parameters.AddWithValue("?groupID", item.GroupID);
+                    result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
+                    result.Parameters.AddWithValue("?flags", item.Flags);
+
+                    lock (m_dbLock)
                     {
-                        result.Parameters.AddWithValue("?inventoryID", item.ID.ToString());
-                        result.Parameters.AddWithValue("?assetID", item.AssetID.ToString());
-                        result.Parameters.AddWithValue("?assetType", item.AssetType.ToString());
-                        result.Parameters.AddWithValue("?parentFolderID", item.Folder.ToString());
-                        result.Parameters.AddWithValue("?avatarID", item.Owner.ToString());
-                        result.Parameters.AddWithValue("?inventoryName", itemName);
-                        result.Parameters.AddWithValue("?inventoryDescription", itemDesc);
-                        result.Parameters.AddWithValue("?inventoryNextPermissions", item.NextPermissions.ToString());
-                        result.Parameters.AddWithValue("?inventoryCurrentPermissions",
-                                                       item.CurrentPermissions.ToString());
-                        result.Parameters.AddWithValue("?invType", item.InvType);
-                        result.Parameters.AddWithValue("?creatorID", item.CreatorId);
-                        result.Parameters.AddWithValue("?inventoryBasePermissions", item.BasePermissions);
-                        result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.EveryOnePermissions);
-                        result.Parameters.AddWithValue("?inventoryGroupPermissions", item.GroupPermissions);
-                        result.Parameters.AddWithValue("?salePrice", item.SalePrice);
-                        result.Parameters.AddWithValue("?saleType", unchecked((sbyte)item.SaleType));
-                        result.Parameters.AddWithValue("?creationDate", item.CreationDate);
-                        result.Parameters.AddWithValue("?groupID", item.GroupID);
-                        result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
-                        result.Parameters.AddWithValue("?flags", item.Flags);
-    
-                        lock (m_dbLock)
-                            result.ExecuteNonQuery();
-    
-                        result.Dispose();
+                        result.ExecuteNonQuery();
                     }
 
-                    using (MySqlCommand result = new MySqlCommand("update inventoryfolders set version=version+1 where folderID = ?folderID", dbcon))
-                    {
-                        result.Parameters.AddWithValue("?folderID", item.Folder.ToString());
+                    result.Dispose();
 
-                        lock (m_dbLock)
-                            result.ExecuteNonQuery();
+                    result = new MySqlCommand("update inventoryfolders set version=version+1 where folderID = ?folderID", dbcon);
+                    result.Parameters.AddWithValue("?folderID", item.Folder.ToString());
+                    lock (m_dbLock)
+                    {
+                        result.ExecuteNonQuery();
                     }
+                    result.Dispose();
                 }
             }
             catch (MySqlException e)
@@ -533,12 +533,12 @@ namespace OpenSim.Data.MySQL
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?uuid", itemID.ToString());
+                    MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", dbcon);
+                    cmd.Parameters.AddWithValue("?uuid", itemID.ToString());
 
-                        lock (m_dbLock)
-                            cmd.ExecuteNonQuery();
+                    lock (m_dbLock)
+                    {
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
@@ -579,27 +579,25 @@ namespace OpenSim.Data.MySQL
             {
                 dbcon.Open();
 
-                using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
-                {
-                    cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
-                    cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
-                    cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
-                    cmd.Parameters.AddWithValue("?folderName", folderName);
-                    cmd.Parameters.AddWithValue("?type", folder.Type);
-                    cmd.Parameters.AddWithValue("?version", folder.Version);
+                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+                cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
+                cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
+                cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
+                cmd.Parameters.AddWithValue("?folderName", folderName);
+                cmd.Parameters.AddWithValue("?type", folder.Type);
+                cmd.Parameters.AddWithValue("?version", folder.Version);
 
-                    try
+                try
+                {
+                    lock (m_dbLock)
                     {
-                        lock (m_dbLock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error(e.ToString());
+                        cmd.ExecuteNonQuery();
                     }
                 }
+                catch (Exception e)
+                {
+                    m_log.Error(e.ToString());
+                }
             }
         }
 
@@ -626,23 +624,21 @@ namespace OpenSim.Data.MySQL
             {
                 dbcon.Open();
 
-                using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
+                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+                cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
+                cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
+
+                try
                 {
-                    cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
-                    cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
-    
-                    try
+                    lock (m_dbLock)
                     {
-                        lock (m_dbLock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error(e.ToString());
+                        cmd.ExecuteNonQuery();
                     }
                 }
+                catch (Exception e)
+                {
+                    m_log.Error(e.ToString());
+                }
             }
         }
 

OpenSim/Data/MySQL/MySQLPresenceData.cs

@@ -63,14 +63,13 @@ namespace OpenSim.Data.MySQL
 
         public void LogoutRegionAgents(UUID regionID)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
-    
-                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-    
-                ExecuteNonQuery(cmd);
-            }
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
+
+            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+
+            ExecuteNonQuery(cmd);
         }
 
         public bool ReportAgent(UUID sessionID, UUID regionID)
@@ -82,32 +81,17 @@ namespace OpenSim.Data.MySQL
             if (regionID == UUID.Zero)
                 return false;
 
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
-    
-                cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
-                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-    
-                if (ExecuteNonQuery(cmd) == 0)
-                    return false;
-            }
+            MySqlCommand cmd = new MySqlCommand();
 
-            return true;
-        }
+            cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
 
-        public bool VerifyAgent(UUID agentId, UUID secureSessionID)
-        {
-            PresenceData[] ret = Get("SecureSessionID",
-                    secureSessionID.ToString());
+            cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
+            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
 
-            if (ret.Length == 0)
-                return false;
-
-            if(ret[0].UserID != agentId.ToString())
+            if (ExecuteNonQuery(cmd) == 0)
                 return false;
 
             return true;
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLRegionData.cs

@@ -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
 {
@@ -162,7 +162,17 @@ namespace OpenSim.Data.MySQL
                         ret.sizeX = Convert.ToInt32(result["sizeX"]);
                         ret.sizeY = Convert.ToInt32(result["sizeY"]);
 
-                        CheckColumnNames(result);
+                        if (m_ColumnNames == null)
+                        {
+                            m_ColumnNames = new List<string>();
+
+                            DataTable schemaTable = result.GetSchemaTable();
+                            foreach (DataRow row in schemaTable.Rows)
+                            {
+                                if (row["ColumnName"] != null)
+                                    m_ColumnNames.Add(row["ColumnName"].ToString());
+                            }
+                        }
 
                         foreach (string s in m_ColumnNames)
                         {
@@ -177,11 +187,7 @@ namespace OpenSim.Data.MySQL
                             if (s == "locY")
                                 continue;
 
-                            object value = result[s];
-                            if (value is DBNull)
-                                ret.Data[s] = null;
-                            else
-                                ret.Data[s] = result[s].ToString();
+                            ret.Data[s] = result[s].ToString();
                         }
 
                         retList.Add(ret);
@@ -192,23 +198,6 @@ namespace OpenSim.Data.MySQL
             return retList;
         }
 
-        private void CheckColumnNames(IDataReader result)
-        {
-            if (m_ColumnNames != null)
-                return;
-
-            List<string> columnNames = new List<string>();
-
-            DataTable schemaTable = result.GetSchemaTable();
-            foreach (DataRow row in schemaTable.Rows)
-            {
-                if (row["ColumnName"] != null)
-                    columnNames.Add(row["ColumnName"].ToString());
-            }
-
-            m_ColumnNames = columnNames;
-        }
-
         public bool Store(RegionData data)
         {
             if (data.Data.ContainsKey("uuid"))
@@ -329,12 +318,11 @@ namespace OpenSim.Data.MySQL
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
-            using (MySqlCommand cmd = new MySqlCommand(command))
-            {
-                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-    
-                return RunCommand(cmd);
-            }
+            MySqlCommand cmd = new MySqlCommand(command);
+
+            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+
+            return RunCommand(cmd);
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -129,114 +129,114 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
+                    MySqlCommand cmd = dbcon.CreateCommand();
 
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    foreach (SceneObjectPart prim in obj.Parts)
                     {
-                        foreach (SceneObjectPart prim in obj.Parts)
-                        {
-                            cmd.Parameters.Clear();
-    
-                            cmd.CommandText = "replace into prims (" +
-                                    "UUID, CreationDate, " +
-                                    "Name, Text, Description, " +
-                                    "SitName, TouchName, ObjectFlags, " +
-                                    "OwnerMask, NextOwnerMask, GroupMask, " +
-                                    "EveryoneMask, BaseMask, PositionX, " +
-                                    "PositionY, PositionZ, GroupPositionX, " +
-                                    "GroupPositionY, GroupPositionZ, VelocityX, " +
-                                    "VelocityY, VelocityZ, AngularVelocityX, " +
-                                    "AngularVelocityY, AngularVelocityZ, " +
-                                    "AccelerationX, AccelerationY, " +
-                                    "AccelerationZ, RotationX, " +
-                                    "RotationY, RotationZ, " +
-                                    "RotationW, SitTargetOffsetX, " +
-                                    "SitTargetOffsetY, SitTargetOffsetZ, " +
-                                    "SitTargetOrientW, SitTargetOrientX, " +
-                                    "SitTargetOrientY, SitTargetOrientZ, " +
-                                    "RegionUUID, CreatorID, " +
-                                    "OwnerID, GroupID, " +
-                                    "LastOwnerID, SceneGroupID, " +
-                                    "PayPrice, PayButton1, " +
-                                    "PayButton2, PayButton3, " +
-                                    "PayButton4, LoopedSound, " +
-                                    "LoopedSoundGain, TextureAnimation, " +
-                                    "OmegaX, OmegaY, OmegaZ, " +
-                                    "CameraEyeOffsetX, CameraEyeOffsetY, " +
-                                    "CameraEyeOffsetZ, CameraAtOffsetX, " +
-                                    "CameraAtOffsetY, CameraAtOffsetZ, " +
-                                    "ForceMouselook, ScriptAccessPin, " +
-                                    "AllowedDrop, DieAtEdge, " +
-                                    "SalePrice, SaleType, " +
-                                    "ColorR, ColorG, ColorB, ColorA, " +
-                                    "ParticleSystem, ClickAction, Material, " +
-                                    "CollisionSound, CollisionSoundVolume, " +
-                                    "PassTouches, " +
-                                    "LinkNumber, MediaURL) values (" + "?UUID, " +
-                                    "?CreationDate, ?Name, ?Text, " +
-                                    "?Description, ?SitName, ?TouchName, " +
-                                    "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
-                                    "?GroupMask, ?EveryoneMask, ?BaseMask, " +
-                                    "?PositionX, ?PositionY, ?PositionZ, " +
-                                    "?GroupPositionX, ?GroupPositionY, " +
-                                    "?GroupPositionZ, ?VelocityX, " +
-                                    "?VelocityY, ?VelocityZ, ?AngularVelocityX, " +
-                                    "?AngularVelocityY, ?AngularVelocityZ, " +
-                                    "?AccelerationX, ?AccelerationY, " +
-                                    "?AccelerationZ, ?RotationX, " +
-                                    "?RotationY, ?RotationZ, " +
-                                    "?RotationW, ?SitTargetOffsetX, " +
-                                    "?SitTargetOffsetY, ?SitTargetOffsetZ, " +
-                                    "?SitTargetOrientW, ?SitTargetOrientX, " +
-                                    "?SitTargetOrientY, ?SitTargetOrientZ, " +
-                                    "?RegionUUID, ?CreatorID, ?OwnerID, " +
-                                    "?GroupID, ?LastOwnerID, ?SceneGroupID, " +
-                                    "?PayPrice, ?PayButton1, ?PayButton2, " +
-                                    "?PayButton3, ?PayButton4, ?LoopedSound, " +
-                                    "?LoopedSoundGain, ?TextureAnimation, " +
-                                    "?OmegaX, ?OmegaY, ?OmegaZ, " +
-                                    "?CameraEyeOffsetX, ?CameraEyeOffsetY, " +
-                                    "?CameraEyeOffsetZ, ?CameraAtOffsetX, " +
-                                    "?CameraAtOffsetY, ?CameraAtOffsetZ, " +
-                                    "?ForceMouselook, ?ScriptAccessPin, " +
-                                    "?AllowedDrop, ?DieAtEdge, ?SalePrice, " +
-                                    "?SaleType, ?ColorR, ?ColorG, " +
-                                    "?ColorB, ?ColorA, ?ParticleSystem, " +
-                                    "?ClickAction, ?Material, ?CollisionSound, " +
-                                    "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL)";
-    
-                            FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
-    
-                            ExecuteNonQuery(cmd);
-    
-                            cmd.Parameters.Clear();
-    
-                            cmd.CommandText = "replace into primshapes (" +
-                                    "UUID, Shape, ScaleX, ScaleY, " +
-                                    "ScaleZ, PCode, PathBegin, PathEnd, " +
-                                    "PathScaleX, PathScaleY, PathShearX, " +
-                                    "PathShearY, PathSkew, PathCurve, " +
-                                    "PathRadiusOffset, PathRevolutions, " +
-                                    "PathTaperX, PathTaperY, PathTwist, " +
-                                    "PathTwistBegin, ProfileBegin, ProfileEnd, " +
-                                    "ProfileCurve, ProfileHollow, Texture, " +
-                                    "ExtraParams, State, Media) values (?UUID, " +
-                                    "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
-                                    "?PCode, ?PathBegin, ?PathEnd, " +
-                                    "?PathScaleX, ?PathScaleY, " +
-                                    "?PathShearX, ?PathShearY, " +
-                                    "?PathSkew, ?PathCurve, ?PathRadiusOffset, " +
-                                    "?PathRevolutions, ?PathTaperX, " +
-                                    "?PathTaperY, ?PathTwist, " +
-                                    "?PathTwistBegin, ?ProfileBegin, " +
-                                    "?ProfileEnd, ?ProfileCurve, " +
-                                    "?ProfileHollow, ?Texture, ?ExtraParams, " +
-                                    "?State, ?Media)";
-    
-                            FillShapeCommand(cmd, prim);
-    
-                            ExecuteNonQuery(cmd);
-                        }
+                        cmd.Parameters.Clear();
+
+                        cmd.CommandText = "replace into prims (" +
+                                "UUID, CreationDate, " +
+                                "Name, Text, Description, " +
+                                "SitName, TouchName, ObjectFlags, " +
+                                "OwnerMask, NextOwnerMask, GroupMask, " +
+                                "EveryoneMask, BaseMask, PositionX, " +
+                                "PositionY, PositionZ, GroupPositionX, " +
+                                "GroupPositionY, GroupPositionZ, VelocityX, " +
+                                "VelocityY, VelocityZ, AngularVelocityX, " +
+                                "AngularVelocityY, AngularVelocityZ, " +
+                                "AccelerationX, AccelerationY, " +
+                                "AccelerationZ, RotationX, " +
+                                "RotationY, RotationZ, " +
+                                "RotationW, SitTargetOffsetX, " +
+                                "SitTargetOffsetY, SitTargetOffsetZ, " +
+                                "SitTargetOrientW, SitTargetOrientX, " +
+                                "SitTargetOrientY, SitTargetOrientZ, " +
+                                "RegionUUID, CreatorID, " +
+                                "OwnerID, GroupID, " +
+                                "LastOwnerID, SceneGroupID, " +
+                                "PayPrice, PayButton1, " +
+                                "PayButton2, PayButton3, " +
+                                "PayButton4, LoopedSound, " +
+                                "LoopedSoundGain, TextureAnimation, " +
+                                "OmegaX, OmegaY, OmegaZ, " +
+                                "CameraEyeOffsetX, CameraEyeOffsetY, " +
+                                "CameraEyeOffsetZ, CameraAtOffsetX, " +
+                                "CameraAtOffsetY, CameraAtOffsetZ, " +
+                                "ForceMouselook, ScriptAccessPin, " +
+                                "AllowedDrop, DieAtEdge, " +
+                                "SalePrice, SaleType, " +
+                                "ColorR, ColorG, ColorB, ColorA, " +
+                                "ParticleSystem, ClickAction, Material, " +
+                                "CollisionSound, CollisionSoundVolume, " +
+                                "PassTouches, " +
+                                "LinkNumber, MediaURL) values (" + "?UUID, " +
+                                "?CreationDate, ?Name, ?Text, " +
+                                "?Description, ?SitName, ?TouchName, " +
+                                "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
+                                "?GroupMask, ?EveryoneMask, ?BaseMask, " +
+                                "?PositionX, ?PositionY, ?PositionZ, " +
+                                "?GroupPositionX, ?GroupPositionY, " +
+                                "?GroupPositionZ, ?VelocityX, " +
+                                "?VelocityY, ?VelocityZ, ?AngularVelocityX, " +
+                                "?AngularVelocityY, ?AngularVelocityZ, " +
+                                "?AccelerationX, ?AccelerationY, " +
+                                "?AccelerationZ, ?RotationX, " +
+                                "?RotationY, ?RotationZ, " +
+                                "?RotationW, ?SitTargetOffsetX, " +
+                                "?SitTargetOffsetY, ?SitTargetOffsetZ, " +
+                                "?SitTargetOrientW, ?SitTargetOrientX, " +
+                                "?SitTargetOrientY, ?SitTargetOrientZ, " +
+                                "?RegionUUID, ?CreatorID, ?OwnerID, " +
+                                "?GroupID, ?LastOwnerID, ?SceneGroupID, " +
+                                "?PayPrice, ?PayButton1, ?PayButton2, " +
+                                "?PayButton3, ?PayButton4, ?LoopedSound, " +
+                                "?LoopedSoundGain, ?TextureAnimation, " +
+                                "?OmegaX, ?OmegaY, ?OmegaZ, " +
+                                "?CameraEyeOffsetX, ?CameraEyeOffsetY, " +
+                                "?CameraEyeOffsetZ, ?CameraAtOffsetX, " +
+                                "?CameraAtOffsetY, ?CameraAtOffsetZ, " +
+                                "?ForceMouselook, ?ScriptAccessPin, " +
+                                "?AllowedDrop, ?DieAtEdge, ?SalePrice, " +
+                                "?SaleType, ?ColorR, ?ColorG, " +
+                                "?ColorB, ?ColorA, ?ParticleSystem, " +
+                                "?ClickAction, ?Material, ?CollisionSound, " +
+                                "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL)";
+
+                        FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
+
+                        ExecuteNonQuery(cmd);
+
+                        cmd.Parameters.Clear();
+
+                        cmd.CommandText = "replace into primshapes (" +
+                                "UUID, Shape, ScaleX, ScaleY, " +
+                                "ScaleZ, PCode, PathBegin, PathEnd, " +
+                                "PathScaleX, PathScaleY, PathShearX, " +
+                                "PathShearY, PathSkew, PathCurve, " +
+                                "PathRadiusOffset, PathRevolutions, " +
+                                "PathTaperX, PathTaperY, PathTwist, " +
+                                "PathTwistBegin, ProfileBegin, ProfileEnd, " +
+                                "ProfileCurve, ProfileHollow, Texture, " +
+                                "ExtraParams, State, Media) values (?UUID, " +
+                                "?Shape, ?ScaleX, ?ScaleY, ?ScaleZ, " +
+                                "?PCode, ?PathBegin, ?PathEnd, " +
+                                "?PathScaleX, ?PathScaleY, " +
+                                "?PathShearX, ?PathShearY, " +
+                                "?PathSkew, ?PathCurve, ?PathRadiusOffset, " +
+                                "?PathRevolutions, ?PathTaperX, " +
+                                "?PathTaperY, ?PathTwist, " +
+                                "?PathTwistBegin, ?ProfileBegin, " +
+                                "?ProfileEnd, ?ProfileCurve, " +
+                                "?ProfileHollow, ?Texture, ?ExtraParams, " +
+                                "?State, ?Media)";
+
+                        FillShapeCommand(cmd, prim);
+
+                        ExecuteNonQuery(cmd);
                     }
+                    
+                    cmd.Dispose();
                 }
             }
         }
@@ -719,99 +719,95 @@ namespace OpenSim.Data.MySQL
             RegionLightShareData nWP = new RegionLightShareData();
             nWP.OnSave += StoreRegionWindlightSettings;
 
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+
+                string command = "select * from `regionwindlight` where region_id = ?regionID";
+
+                using (MySqlCommand cmd = new MySqlCommand(command))
                 {
-                    dbcon.Open();
-    
-                    string command = "select * from `regionwindlight` where region_id = ?regionID";
-    
-                    using (MySqlCommand cmd = new MySqlCommand(command))
+                    cmd.Connection = dbcon;
+
+                    cmd.Parameters.AddWithValue("?regionID", regionUUID.ToString());
+
+                    IDataReader result = ExecuteReader(cmd);
+                    if (!result.Read())
                     {
-                        cmd.Connection = dbcon;
-    
-                        cmd.Parameters.AddWithValue("?regionID", regionUUID.ToString());
-    
-                        IDataReader result = ExecuteReader(cmd);
-                        if (!result.Read())
-                        {
-                            //No result, so store our default windlight profile and return it
-                            nWP.regionID = regionUUID;
-                            StoreRegionWindlightSettings(nWP);
-                            return nWP;
-                        }
-                        else
-                        {
-                            nWP.regionID = DBGuid.FromDB(result["region_id"]);
-                            nWP.waterColor.X = Convert.ToSingle(result["water_color_r"]);
-                            nWP.waterColor.Y = Convert.ToSingle(result["water_color_g"]);
-                            nWP.waterColor.Z = Convert.ToSingle(result["water_color_b"]);
-                            nWP.waterFogDensityExponent = Convert.ToSingle(result["water_fog_density_exponent"]);
-                            nWP.underwaterFogModifier = Convert.ToSingle(result["underwater_fog_modifier"]);
-                            nWP.reflectionWaveletScale.X = Convert.ToSingle(result["reflection_wavelet_scale_1"]);
-                            nWP.reflectionWaveletScale.Y = Convert.ToSingle(result["reflection_wavelet_scale_2"]);
-                            nWP.reflectionWaveletScale.Z = Convert.ToSingle(result["reflection_wavelet_scale_3"]);
-                            nWP.fresnelScale = Convert.ToSingle(result["fresnel_scale"]);
-                            nWP.fresnelOffset = Convert.ToSingle(result["fresnel_offset"]);
-                            nWP.refractScaleAbove = Convert.ToSingle(result["refract_scale_above"]);
-                            nWP.refractScaleBelow = Convert.ToSingle(result["refract_scale_below"]);
-                            nWP.blurMultiplier = Convert.ToSingle(result["blur_multiplier"]);
-                            nWP.bigWaveDirection.X = Convert.ToSingle(result["big_wave_direction_x"]);
-                            nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]);
-                            nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]);
-                            nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]);
-                            UUID.TryParse(result["normal_map_texture"].ToString(), out nWP.normalMapTexture);
-                            nWP.horizon.X = Convert.ToSingle(result["horizon_r"]);
-                            nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]);
-                            nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]);
-                            nWP.horizon.W = Convert.ToSingle(result["horizon_i"]);
-                            nWP.hazeHorizon = Convert.ToSingle(result["haze_horizon"]);
-                            nWP.blueDensity.X = Convert.ToSingle(result["blue_density_r"]);
-                            nWP.blueDensity.Y = Convert.ToSingle(result["blue_density_g"]);
-                            nWP.blueDensity.Z = Convert.ToSingle(result["blue_density_b"]);
-                            nWP.blueDensity.W = Convert.ToSingle(result["blue_density_i"]);
-                            nWP.hazeDensity = Convert.ToSingle(result["haze_density"]);
-                            nWP.densityMultiplier = Convert.ToSingle(result["density_multiplier"]);
-                            nWP.distanceMultiplier = Convert.ToSingle(result["distance_multiplier"]);
-                            nWP.maxAltitude = Convert.ToUInt16(result["max_altitude"]);
-                            nWP.sunMoonColor.X = Convert.ToSingle(result["sun_moon_color_r"]);
-                            nWP.sunMoonColor.Y = Convert.ToSingle(result["sun_moon_color_g"]);
-                            nWP.sunMoonColor.Z = Convert.ToSingle(result["sun_moon_color_b"]);
-                            nWP.sunMoonColor.W = Convert.ToSingle(result["sun_moon_color_i"]);
-                            nWP.sunMoonPosition = Convert.ToSingle(result["sun_moon_position"]);
-                            nWP.ambient.X = Convert.ToSingle(result["ambient_r"]);
-                            nWP.ambient.Y = Convert.ToSingle(result["ambient_g"]);
-                            nWP.ambient.Z = Convert.ToSingle(result["ambient_b"]);
-                            nWP.ambient.W = Convert.ToSingle(result["ambient_i"]);
-                            nWP.eastAngle = Convert.ToSingle(result["east_angle"]);
-                            nWP.sunGlowFocus = Convert.ToSingle(result["sun_glow_focus"]);
-                            nWP.sunGlowSize = Convert.ToSingle(result["sun_glow_size"]);
-                            nWP.sceneGamma = Convert.ToSingle(result["scene_gamma"]);
-                            nWP.starBrightness = Convert.ToSingle(result["star_brightness"]);
-                            nWP.cloudColor.X = Convert.ToSingle(result["cloud_color_r"]);
-                            nWP.cloudColor.Y = Convert.ToSingle(result["cloud_color_g"]);
-                            nWP.cloudColor.Z = Convert.ToSingle(result["cloud_color_b"]);
-                            nWP.cloudColor.W = Convert.ToSingle(result["cloud_color_i"]);
-                            nWP.cloudXYDensity.X = Convert.ToSingle(result["cloud_x"]);
-                            nWP.cloudXYDensity.Y = Convert.ToSingle(result["cloud_y"]);
-                            nWP.cloudXYDensity.Z = Convert.ToSingle(result["cloud_density"]);
-                            nWP.cloudCoverage = Convert.ToSingle(result["cloud_coverage"]);
-                            nWP.cloudScale = Convert.ToSingle(result["cloud_scale"]);
-                            nWP.cloudDetailXYDensity.X = Convert.ToSingle(result["cloud_detail_x"]);
-                            nWP.cloudDetailXYDensity.Y = Convert.ToSingle(result["cloud_detail_y"]);
-                            nWP.cloudDetailXYDensity.Z = Convert.ToSingle(result["cloud_detail_density"]);
-                            nWP.cloudScrollX = Convert.ToSingle(result["cloud_scroll_x"]);
-                            nWP.cloudScrollXLock = Convert.ToBoolean(result["cloud_scroll_x_lock"]);
-                            nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
-                            nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
-                            nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
-                            nWP.valid = true;
-                        }
+                        //No result, so store our default windlight profile and return it
+                        nWP.regionID = regionUUID;
+                        StoreRegionWindlightSettings(nWP);
+                        return nWP;
+                    }
+                    else
+                    {
+                        nWP.regionID = DBGuid.FromDB(result["region_id"]);
+                        nWP.waterColor.X = Convert.ToSingle(result["water_color_r"]);
+                        nWP.waterColor.Y = Convert.ToSingle(result["water_color_g"]);
+                        nWP.waterColor.Z = Convert.ToSingle(result["water_color_b"]);
+                        nWP.waterFogDensityExponent = Convert.ToSingle(result["water_fog_density_exponent"]);
+                        nWP.underwaterFogModifier = Convert.ToSingle(result["underwater_fog_modifier"]);
+                        nWP.reflectionWaveletScale.X = Convert.ToSingle(result["reflection_wavelet_scale_1"]);
+                        nWP.reflectionWaveletScale.Y = Convert.ToSingle(result["reflection_wavelet_scale_2"]);
+                        nWP.reflectionWaveletScale.Z = Convert.ToSingle(result["reflection_wavelet_scale_3"]);
+                        nWP.fresnelScale = Convert.ToSingle(result["fresnel_scale"]);
+                        nWP.fresnelOffset = Convert.ToSingle(result["fresnel_offset"]);
+                        nWP.refractScaleAbove = Convert.ToSingle(result["refract_scale_above"]);
+                        nWP.refractScaleBelow = Convert.ToSingle(result["refract_scale_below"]);
+                        nWP.blurMultiplier = Convert.ToSingle(result["blur_multiplier"]);
+                        nWP.bigWaveDirection.X = Convert.ToSingle(result["big_wave_direction_x"]);
+                        nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]);
+                        nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]);
+                        nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]);
+                        UUID.TryParse(result["normal_map_texture"].ToString(), out nWP.normalMapTexture);
+                        nWP.horizon.X = Convert.ToSingle(result["horizon_r"]);
+                        nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]);
+                        nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]);
+                        nWP.horizon.W = Convert.ToSingle(result["horizon_i"]);
+                        nWP.hazeHorizon = Convert.ToSingle(result["haze_horizon"]);
+                        nWP.blueDensity.X = Convert.ToSingle(result["blue_density_r"]);
+                        nWP.blueDensity.Y = Convert.ToSingle(result["blue_density_g"]);
+                        nWP.blueDensity.Z = Convert.ToSingle(result["blue_density_b"]);
+                        nWP.blueDensity.W = Convert.ToSingle(result["blue_density_i"]);
+                        nWP.hazeDensity = Convert.ToSingle(result["haze_density"]);
+                        nWP.densityMultiplier = Convert.ToSingle(result["density_multiplier"]);
+                        nWP.distanceMultiplier = Convert.ToSingle(result["distance_multiplier"]);
+                        nWP.maxAltitude = Convert.ToUInt16(result["max_altitude"]);
+                        nWP.sunMoonColor.X = Convert.ToSingle(result["sun_moon_color_r"]);
+                        nWP.sunMoonColor.Y = Convert.ToSingle(result["sun_moon_color_g"]);
+                        nWP.sunMoonColor.Z = Convert.ToSingle(result["sun_moon_color_b"]);
+                        nWP.sunMoonColor.W = Convert.ToSingle(result["sun_moon_color_i"]);
+                        nWP.sunMoonPosition = Convert.ToSingle(result["sun_moon_position"]);
+                        nWP.ambient.X = Convert.ToSingle(result["ambient_r"]);
+                        nWP.ambient.Y = Convert.ToSingle(result["ambient_g"]);
+                        nWP.ambient.Z = Convert.ToSingle(result["ambient_b"]);
+                        nWP.ambient.W = Convert.ToSingle(result["ambient_i"]);
+                        nWP.eastAngle = Convert.ToSingle(result["east_angle"]);
+                        nWP.sunGlowFocus = Convert.ToSingle(result["sun_glow_focus"]);
+                        nWP.sunGlowSize = Convert.ToSingle(result["sun_glow_size"]);
+                        nWP.sceneGamma = Convert.ToSingle(result["scene_gamma"]);
+                        nWP.starBrightness = Convert.ToSingle(result["star_brightness"]);
+                        nWP.cloudColor.X = Convert.ToSingle(result["cloud_color_r"]);
+                        nWP.cloudColor.Y = Convert.ToSingle(result["cloud_color_g"]);
+                        nWP.cloudColor.Z = Convert.ToSingle(result["cloud_color_b"]);
+                        nWP.cloudColor.W = Convert.ToSingle(result["cloud_color_i"]);
+                        nWP.cloudXYDensity.X = Convert.ToSingle(result["cloud_x"]);
+                        nWP.cloudXYDensity.Y = Convert.ToSingle(result["cloud_y"]);
+                        nWP.cloudXYDensity.Z = Convert.ToSingle(result["cloud_density"]);
+                        nWP.cloudCoverage = Convert.ToSingle(result["cloud_coverage"]);
+                        nWP.cloudScale = Convert.ToSingle(result["cloud_scale"]);
+                        nWP.cloudDetailXYDensity.X = Convert.ToSingle(result["cloud_detail_x"]);
+                        nWP.cloudDetailXYDensity.Y = Convert.ToSingle(result["cloud_detail_y"]);
+                        nWP.cloudDetailXYDensity.Z = Convert.ToSingle(result["cloud_detail_density"]);
+                        nWP.cloudScrollX = Convert.ToSingle(result["cloud_scroll_x"]);
+                        nWP.cloudScrollXLock = Convert.ToBoolean(result["cloud_scroll_x_lock"]);
+                        nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
+                        nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
+                        nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
+                        nWP.valid = true;
                     }
                 }
             }
-
             return nWP;
         }
 
@@ -857,199 +853,122 @@ namespace OpenSim.Data.MySQL
 
         public void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+
+                using (MySqlCommand cmd = dbcon.CreateCommand())
                 {
-                    dbcon.Open();
-    
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "REPLACE INTO `regionwindlight` (`region_id`, `water_color_r`, `water_color_g`, ";
-                        cmd.CommandText += "`water_color_b`, `water_fog_density_exponent`, `underwater_fog_modifier`, ";
-                        cmd.CommandText += "`reflection_wavelet_scale_1`, `reflection_wavelet_scale_2`, `reflection_wavelet_scale_3`, ";
-                        cmd.CommandText += "`fresnel_scale`, `fresnel_offset`, `refract_scale_above`, `refract_scale_below`, ";
-                        cmd.CommandText += "`blur_multiplier`, `big_wave_direction_x`, `big_wave_direction_y`, `little_wave_direction_x`, ";
-                        cmd.CommandText += "`little_wave_direction_y`, `normal_map_texture`, `horizon_r`, `horizon_g`, `horizon_b`, ";
-                        cmd.CommandText += "`horizon_i`, `haze_horizon`, `blue_density_r`, `blue_density_g`, `blue_density_b`, ";
-                        cmd.CommandText += "`blue_density_i`, `haze_density`, `density_multiplier`, `distance_multiplier`, `max_altitude`, ";
-                        cmd.CommandText += "`sun_moon_color_r`, `sun_moon_color_g`, `sun_moon_color_b`, `sun_moon_color_i`, `sun_moon_position`, ";
-                        cmd.CommandText += "`ambient_r`, `ambient_g`, `ambient_b`, `ambient_i`, `east_angle`, `sun_glow_focus`, `sun_glow_size`, ";
-                        cmd.CommandText += "`scene_gamma`, `star_brightness`, `cloud_color_r`, `cloud_color_g`, `cloud_color_b`, `cloud_color_i`, ";
-                        cmd.CommandText += "`cloud_x`, `cloud_y`, `cloud_density`, `cloud_coverage`, `cloud_scale`, `cloud_detail_x`, ";
-                        cmd.CommandText += "`cloud_detail_y`, `cloud_detail_density`, `cloud_scroll_x`, `cloud_scroll_x_lock`, `cloud_scroll_y`, ";
-                        cmd.CommandText += "`cloud_scroll_y_lock`, `draw_classic_clouds`) VALUES (?region_id, ?water_color_r, ";
-                        cmd.CommandText += "?water_color_g, ?water_color_b, ?water_fog_density_exponent, ?underwater_fog_modifier, ?reflection_wavelet_scale_1, ";
-                        cmd.CommandText += "?reflection_wavelet_scale_2, ?reflection_wavelet_scale_3, ?fresnel_scale, ?fresnel_offset, ?refract_scale_above, ";
-                        cmd.CommandText += "?refract_scale_below, ?blur_multiplier, ?big_wave_direction_x, ?big_wave_direction_y, ?little_wave_direction_x, ";
-                        cmd.CommandText += "?little_wave_direction_y, ?normal_map_texture, ?horizon_r, ?horizon_g, ?horizon_b, ?horizon_i, ?haze_horizon, ";
-                        cmd.CommandText += "?blue_density_r, ?blue_density_g, ?blue_density_b, ?blue_density_i, ?haze_density, ?density_multiplier, ";
-                        cmd.CommandText += "?distance_multiplier, ?max_altitude, ?sun_moon_color_r, ?sun_moon_color_g, ?sun_moon_color_b, ";
-                        cmd.CommandText += "?sun_moon_color_i, ?sun_moon_position, ?ambient_r, ?ambient_g, ?ambient_b, ?ambient_i, ?east_angle, ";
-                        cmd.CommandText += "?sun_glow_focus, ?sun_glow_size, ?scene_gamma, ?star_brightness, ?cloud_color_r, ?cloud_color_g, ";
-                        cmd.CommandText += "?cloud_color_b, ?cloud_color_i, ?cloud_x, ?cloud_y, ?cloud_density, ?cloud_coverage, ?cloud_scale, ";
-                        cmd.CommandText += "?cloud_detail_x, ?cloud_detail_y, ?cloud_detail_density, ?cloud_scroll_x, ?cloud_scroll_x_lock, ";
-                        cmd.CommandText += "?cloud_scroll_y, ?cloud_scroll_y_lock, ?draw_classic_clouds)";
-    
-                        cmd.Parameters.AddWithValue("region_id", wl.regionID);
-                        cmd.Parameters.AddWithValue("water_color_r", wl.waterColor.X);
-                        cmd.Parameters.AddWithValue("water_color_g", wl.waterColor.Y);
-                        cmd.Parameters.AddWithValue("water_color_b", wl.waterColor.Z);
-                        cmd.Parameters.AddWithValue("water_fog_density_exponent", wl.waterFogDensityExponent);
-                        cmd.Parameters.AddWithValue("underwater_fog_modifier", wl.underwaterFogModifier);
-                        cmd.Parameters.AddWithValue("reflection_wavelet_scale_1", wl.reflectionWaveletScale.X);
-                        cmd.Parameters.AddWithValue("reflection_wavelet_scale_2", wl.reflectionWaveletScale.Y);
-                        cmd.Parameters.AddWithValue("reflection_wavelet_scale_3", wl.reflectionWaveletScale.Z);
-                        cmd.Parameters.AddWithValue("fresnel_scale", wl.fresnelScale);
-                        cmd.Parameters.AddWithValue("fresnel_offset", wl.fresnelOffset);
-                        cmd.Parameters.AddWithValue("refract_scale_above", wl.refractScaleAbove);
-                        cmd.Parameters.AddWithValue("refract_scale_below", wl.refractScaleBelow);
-                        cmd.Parameters.AddWithValue("blur_multiplier", wl.blurMultiplier);
-                        cmd.Parameters.AddWithValue("big_wave_direction_x", wl.bigWaveDirection.X);
-                        cmd.Parameters.AddWithValue("big_wave_direction_y", wl.bigWaveDirection.Y);
-                        cmd.Parameters.AddWithValue("little_wave_direction_x", wl.littleWaveDirection.X);
-                        cmd.Parameters.AddWithValue("little_wave_direction_y", wl.littleWaveDirection.Y);
-                        cmd.Parameters.AddWithValue("normal_map_texture", wl.normalMapTexture);
-                        cmd.Parameters.AddWithValue("horizon_r", wl.horizon.X);
-                        cmd.Parameters.AddWithValue("horizon_g", wl.horizon.Y);
-                        cmd.Parameters.AddWithValue("horizon_b", wl.horizon.Z);
-                        cmd.Parameters.AddWithValue("horizon_i", wl.horizon.W);
-                        cmd.Parameters.AddWithValue("haze_horizon", wl.hazeHorizon);
-                        cmd.Parameters.AddWithValue("blue_density_r", wl.blueDensity.X);
-                        cmd.Parameters.AddWithValue("blue_density_g", wl.blueDensity.Y);
-                        cmd.Parameters.AddWithValue("blue_density_b", wl.blueDensity.Z);
-                        cmd.Parameters.AddWithValue("blue_density_i", wl.blueDensity.W);
-                        cmd.Parameters.AddWithValue("haze_density", wl.hazeDensity);
-                        cmd.Parameters.AddWithValue("density_multiplier", wl.densityMultiplier);
-                        cmd.Parameters.AddWithValue("distance_multiplier", wl.distanceMultiplier);
-                        cmd.Parameters.AddWithValue("max_altitude", wl.maxAltitude);
-                        cmd.Parameters.AddWithValue("sun_moon_color_r", wl.sunMoonColor.X);
-                        cmd.Parameters.AddWithValue("sun_moon_color_g", wl.sunMoonColor.Y);
-                        cmd.Parameters.AddWithValue("sun_moon_color_b", wl.sunMoonColor.Z);
-                        cmd.Parameters.AddWithValue("sun_moon_color_i", wl.sunMoonColor.W);
-                        cmd.Parameters.AddWithValue("sun_moon_position", wl.sunMoonPosition);
-                        cmd.Parameters.AddWithValue("ambient_r", wl.ambient.X);
-                        cmd.Parameters.AddWithValue("ambient_g", wl.ambient.Y);
-                        cmd.Parameters.AddWithValue("ambient_b", wl.ambient.Z);
-                        cmd.Parameters.AddWithValue("ambient_i", wl.ambient.W);
-                        cmd.Parameters.AddWithValue("east_angle", wl.eastAngle);
-                        cmd.Parameters.AddWithValue("sun_glow_focus", wl.sunGlowFocus);
-                        cmd.Parameters.AddWithValue("sun_glow_size", wl.sunGlowSize);
-                        cmd.Parameters.AddWithValue("scene_gamma", wl.sceneGamma);
-                        cmd.Parameters.AddWithValue("star_brightness", wl.starBrightness);
-                        cmd.Parameters.AddWithValue("cloud_color_r", wl.cloudColor.X);
-                        cmd.Parameters.AddWithValue("cloud_color_g", wl.cloudColor.Y);
-                        cmd.Parameters.AddWithValue("cloud_color_b", wl.cloudColor.Z);
-                        cmd.Parameters.AddWithValue("cloud_color_i", wl.cloudColor.W);
-                        cmd.Parameters.AddWithValue("cloud_x", wl.cloudXYDensity.X);
-                        cmd.Parameters.AddWithValue("cloud_y", wl.cloudXYDensity.Y);
-                        cmd.Parameters.AddWithValue("cloud_density", wl.cloudXYDensity.Z);
-                        cmd.Parameters.AddWithValue("cloud_coverage", wl.cloudCoverage);
-                        cmd.Parameters.AddWithValue("cloud_scale", wl.cloudScale);
-                        cmd.Parameters.AddWithValue("cloud_detail_x", wl.cloudDetailXYDensity.X);
-                        cmd.Parameters.AddWithValue("cloud_detail_y", wl.cloudDetailXYDensity.Y);
-                        cmd.Parameters.AddWithValue("cloud_detail_density", wl.cloudDetailXYDensity.Z);
-                        cmd.Parameters.AddWithValue("cloud_scroll_x", wl.cloudScrollX);
-                        cmd.Parameters.AddWithValue("cloud_scroll_x_lock", wl.cloudScrollXLock);
-                        cmd.Parameters.AddWithValue("cloud_scroll_y", wl.cloudScrollY);
-                        cmd.Parameters.AddWithValue("cloud_scroll_y_lock", wl.cloudScrollYLock);
-                        cmd.Parameters.AddWithValue("draw_classic_clouds", wl.drawClassicClouds);
-                        
-                        ExecuteNonQuery(cmd);
-                    }
+                    cmd.CommandText = "REPLACE INTO `regionwindlight` (`region_id`, `water_color_r`, `water_color_g`, ";
+                    cmd.CommandText += "`water_color_b`, `water_fog_density_exponent`, `underwater_fog_modifier`, ";
+                    cmd.CommandText += "`reflection_wavelet_scale_1`, `reflection_wavelet_scale_2`, `reflection_wavelet_scale_3`, ";
+                    cmd.CommandText += "`fresnel_scale`, `fresnel_offset`, `refract_scale_above`, `refract_scale_below`, ";
+                    cmd.CommandText += "`blur_multiplier`, `big_wave_direction_x`, `big_wave_direction_y`, `little_wave_direction_x`, ";
+                    cmd.CommandText += "`little_wave_direction_y`, `normal_map_texture`, `horizon_r`, `horizon_g`, `horizon_b`, ";
+                    cmd.CommandText += "`horizon_i`, `haze_horizon`, `blue_density_r`, `blue_density_g`, `blue_density_b`, ";
+                    cmd.CommandText += "`blue_density_i`, `haze_density`, `density_multiplier`, `distance_multiplier`, `max_altitude`, ";
+                    cmd.CommandText += "`sun_moon_color_r`, `sun_moon_color_g`, `sun_moon_color_b`, `sun_moon_color_i`, `sun_moon_position`, ";
+                    cmd.CommandText += "`ambient_r`, `ambient_g`, `ambient_b`, `ambient_i`, `east_angle`, `sun_glow_focus`, `sun_glow_size`, ";
+                    cmd.CommandText += "`scene_gamma`, `star_brightness`, `cloud_color_r`, `cloud_color_g`, `cloud_color_b`, `cloud_color_i`, ";
+                    cmd.CommandText += "`cloud_x`, `cloud_y`, `cloud_density`, `cloud_coverage`, `cloud_scale`, `cloud_detail_x`, ";
+                    cmd.CommandText += "`cloud_detail_y`, `cloud_detail_density`, `cloud_scroll_x`, `cloud_scroll_x_lock`, `cloud_scroll_y`, ";
+                    cmd.CommandText += "`cloud_scroll_y_lock`, `draw_classic_clouds`) VALUES (?region_id, ?water_color_r, ";
+                    cmd.CommandText += "?water_color_g, ?water_color_b, ?water_fog_density_exponent, ?underwater_fog_modifier, ?reflection_wavelet_scale_1, ";
+                    cmd.CommandText += "?reflection_wavelet_scale_2, ?reflection_wavelet_scale_3, ?fresnel_scale, ?fresnel_offset, ?refract_scale_above, ";
+                    cmd.CommandText += "?refract_scale_below, ?blur_multiplier, ?big_wave_direction_x, ?big_wave_direction_y, ?little_wave_direction_x, ";
+                    cmd.CommandText += "?little_wave_direction_y, ?normal_map_texture, ?horizon_r, ?horizon_g, ?horizon_b, ?horizon_i, ?haze_horizon, ";
+                    cmd.CommandText += "?blue_density_r, ?blue_density_g, ?blue_density_b, ?blue_density_i, ?haze_density, ?density_multiplier, ";
+                    cmd.CommandText += "?distance_multiplier, ?max_altitude, ?sun_moon_color_r, ?sun_moon_color_g, ?sun_moon_color_b, ";
+                    cmd.CommandText += "?sun_moon_color_i, ?sun_moon_position, ?ambient_r, ?ambient_g, ?ambient_b, ?ambient_i, ?east_angle, ";
+                    cmd.CommandText += "?sun_glow_focus, ?sun_glow_size, ?scene_gamma, ?star_brightness, ?cloud_color_r, ?cloud_color_g, ";
+                    cmd.CommandText += "?cloud_color_b, ?cloud_color_i, ?cloud_x, ?cloud_y, ?cloud_density, ?cloud_coverage, ?cloud_scale, ";
+                    cmd.CommandText += "?cloud_detail_x, ?cloud_detail_y, ?cloud_detail_density, ?cloud_scroll_x, ?cloud_scroll_x_lock, ";
+                    cmd.CommandText += "?cloud_scroll_y, ?cloud_scroll_y_lock, ?draw_classic_clouds)";
+
+                    cmd.Parameters.AddWithValue("region_id", wl.regionID);
+                    cmd.Parameters.AddWithValue("water_color_r", wl.waterColor.X);
+                    cmd.Parameters.AddWithValue("water_color_g", wl.waterColor.Y);
+                    cmd.Parameters.AddWithValue("water_color_b", wl.waterColor.Z);
+                    cmd.Parameters.AddWithValue("water_fog_density_exponent", wl.waterFogDensityExponent);
+                    cmd.Parameters.AddWithValue("underwater_fog_modifier", wl.underwaterFogModifier);
+                    cmd.Parameters.AddWithValue("reflection_wavelet_scale_1", wl.reflectionWaveletScale.X);
+                    cmd.Parameters.AddWithValue("reflection_wavelet_scale_2", wl.reflectionWaveletScale.Y);
+                    cmd.Parameters.AddWithValue("reflection_wavelet_scale_3", wl.reflectionWaveletScale.Z);
+                    cmd.Parameters.AddWithValue("fresnel_scale", wl.fresnelScale);
+                    cmd.Parameters.AddWithValue("fresnel_offset", wl.fresnelOffset);
+                    cmd.Parameters.AddWithValue("refract_scale_above", wl.refractScaleAbove);
+                    cmd.Parameters.AddWithValue("refract_scale_below", wl.refractScaleBelow);
+                    cmd.Parameters.AddWithValue("blur_multiplier", wl.blurMultiplier);
+                    cmd.Parameters.AddWithValue("big_wave_direction_x", wl.bigWaveDirection.X);
+                    cmd.Parameters.AddWithValue("big_wave_direction_y", wl.bigWaveDirection.Y);
+                    cmd.Parameters.AddWithValue("little_wave_direction_x", wl.littleWaveDirection.X);
+                    cmd.Parameters.AddWithValue("little_wave_direction_y", wl.littleWaveDirection.Y);
+                    cmd.Parameters.AddWithValue("normal_map_texture", wl.normalMapTexture);
+                    cmd.Parameters.AddWithValue("horizon_r", wl.horizon.X);
+                    cmd.Parameters.AddWithValue("horizon_g", wl.horizon.Y);
+                    cmd.Parameters.AddWithValue("horizon_b", wl.horizon.Z);
+                    cmd.Parameters.AddWithValue("horizon_i", wl.horizon.W);
+                    cmd.Parameters.AddWithValue("haze_horizon", wl.hazeHorizon);
+                    cmd.Parameters.AddWithValue("blue_density_r", wl.blueDensity.X);
+                    cmd.Parameters.AddWithValue("blue_density_g", wl.blueDensity.Y);
+                    cmd.Parameters.AddWithValue("blue_density_b", wl.blueDensity.Z);
+                    cmd.Parameters.AddWithValue("blue_density_i", wl.blueDensity.W);
+                    cmd.Parameters.AddWithValue("haze_density", wl.hazeDensity);
+                    cmd.Parameters.AddWithValue("density_multiplier", wl.densityMultiplier);
+                    cmd.Parameters.AddWithValue("distance_multiplier", wl.distanceMultiplier);
+                    cmd.Parameters.AddWithValue("max_altitude", wl.maxAltitude);
+                    cmd.Parameters.AddWithValue("sun_moon_color_r", wl.sunMoonColor.X);
+                    cmd.Parameters.AddWithValue("sun_moon_color_g", wl.sunMoonColor.Y);
+                    cmd.Parameters.AddWithValue("sun_moon_color_b", wl.sunMoonColor.Z);
+                    cmd.Parameters.AddWithValue("sun_moon_color_i", wl.sunMoonColor.W);
+                    cmd.Parameters.AddWithValue("sun_moon_position", wl.sunMoonPosition);
+                    cmd.Parameters.AddWithValue("ambient_r", wl.ambient.X);
+                    cmd.Parameters.AddWithValue("ambient_g", wl.ambient.Y);
+                    cmd.Parameters.AddWithValue("ambient_b", wl.ambient.Z);
+                    cmd.Parameters.AddWithValue("ambient_i", wl.ambient.W);
+                    cmd.Parameters.AddWithValue("east_angle", wl.eastAngle);
+                    cmd.Parameters.AddWithValue("sun_glow_focus", wl.sunGlowFocus);
+                    cmd.Parameters.AddWithValue("sun_glow_size", wl.sunGlowSize);
+                    cmd.Parameters.AddWithValue("scene_gamma", wl.sceneGamma);
+                    cmd.Parameters.AddWithValue("star_brightness", wl.starBrightness);
+                    cmd.Parameters.AddWithValue("cloud_color_r", wl.cloudColor.X);
+                    cmd.Parameters.AddWithValue("cloud_color_g", wl.cloudColor.Y);
+                    cmd.Parameters.AddWithValue("cloud_color_b", wl.cloudColor.Z);
+                    cmd.Parameters.AddWithValue("cloud_color_i", wl.cloudColor.W);
+                    cmd.Parameters.AddWithValue("cloud_x", wl.cloudXYDensity.X);
+                    cmd.Parameters.AddWithValue("cloud_y", wl.cloudXYDensity.Y);
+                    cmd.Parameters.AddWithValue("cloud_density", wl.cloudXYDensity.Z);
+                    cmd.Parameters.AddWithValue("cloud_coverage", wl.cloudCoverage);
+                    cmd.Parameters.AddWithValue("cloud_scale", wl.cloudScale);
+                    cmd.Parameters.AddWithValue("cloud_detail_x", wl.cloudDetailXYDensity.X);
+                    cmd.Parameters.AddWithValue("cloud_detail_y", wl.cloudDetailXYDensity.Y);
+                    cmd.Parameters.AddWithValue("cloud_detail_density", wl.cloudDetailXYDensity.Z);
+                    cmd.Parameters.AddWithValue("cloud_scroll_x", wl.cloudScrollX);
+                    cmd.Parameters.AddWithValue("cloud_scroll_x_lock", wl.cloudScrollXLock);
+                    cmd.Parameters.AddWithValue("cloud_scroll_y", wl.cloudScrollY);
+                    cmd.Parameters.AddWithValue("cloud_scroll_y_lock", wl.cloudScrollYLock);
+                    cmd.Parameters.AddWithValue("draw_classic_clouds", wl.drawClassicClouds);
+                    
+                    ExecuteNonQuery(cmd);
                 }
             }
         }
 
         public void RemoveRegionWindlightSettings(UUID regionID)
         {
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-    
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "delete from `regionwindlight` where `region_id`=?regionID";
-                        cmd.Parameters.AddWithValue("?regionID", regionID.ToString());
-                        ExecuteNonQuery(cmd);
-                    }
-                }
-            }
-        }
+                dbcon.Open();
 
-        #region RegionEnvironmentSettings
-        public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                using (MySqlCommand cmd = dbcon.CreateCommand())
                 {
-                    dbcon.Open();
-    
-                    string command = "select * from `regionenvironment` where region_id = ?region_id";
-    
-                    using (MySqlCommand cmd = new MySqlCommand(command))
-                    {
-                        cmd.Connection = dbcon;
-    
-                        cmd.Parameters.AddWithValue("?region_id", regionUUID.ToString());
-    
-                        IDataReader result = ExecuteReader(cmd);
-                        if (!result.Read())
-                        {
-                            return String.Empty;
-                        }
-                        else
-                        {
-                            return Convert.ToString(result["llsd_settings"]);
-                        }
-                    }
+                    cmd.CommandText = "delete from `regionwindlight` where `region_id`=?regionID";
+                    cmd.Parameters.AddWithValue("?regionID", regionID.ToString());
+                    ExecuteNonQuery(cmd);
                 }
             }
         }
 
-        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-    
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "REPLACE INTO `regionenvironment` (`region_id`, `llsd_settings`) VALUES (?region_id, ?llsd_settings)";
-    
-                        cmd.Parameters.AddWithValue("region_id", regionUUID);
-                        cmd.Parameters.AddWithValue("llsd_settings", settings);
-    
-                        ExecuteNonQuery(cmd);
-                    }
-                }
-            }
-        }
-
-        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-    
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "delete from `regionenvironment` where region_id = ?region_id";
-                        cmd.Parameters.AddWithValue("?region_id", regionUUID.ToString());
-                        ExecuteNonQuery(cmd);
-                    }
-                }
-            }
-        }
-        #endregion
-
         public void StoreRegionSettings(RegionSettings rs)
         {
             lock (m_dbLock)
@@ -1364,7 +1283,7 @@ namespace OpenSim.Data.MySQL
             newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]);
             newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]);
             newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]);
-            newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]);
+            newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]);
             newSettings.SunVector = new Vector3 (
                                                  Convert.ToSingle(row["sunvectorx"]),
                                                  Convert.ToSingle(row["sunvectory"]),
@@ -1881,40 +1800,41 @@ namespace OpenSim.Data.MySQL
             {
                 RemoveItems(primID);
 
-                if (items.Count == 0)
-                    return;
-
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    MySqlCommand cmd = dbcon.CreateCommand();
+
+                    if (items.Count == 0)
+                        return;
+
+                    cmd.CommandText = "insert into primitems (" +
+                            "invType, assetType, name, " +
+                            "description, creationDate, nextPermissions, " +
+                            "currentPermissions, basePermissions, " +
+                            "everyonePermissions, groupPermissions, " +
+                            "flags, itemID, primID, assetID, " +
+                            "parentFolderID, creatorID, ownerID, " +
+                            "groupID, lastOwnerID) values (?invType, " +
+                            "?assetType, ?name, ?description, " +
+                            "?creationDate, ?nextPermissions, " +
+                            "?currentPermissions, ?basePermissions, " +
+                            "?everyonePermissions, ?groupPermissions, " +
+                            "?flags, ?itemID, ?primID, ?assetID, " +
+                            "?parentFolderID, ?creatorID, ?ownerID, " +
+                            "?groupID, ?lastOwnerID)";
+
+                    foreach (TaskInventoryItem item in items)
                     {
-                        cmd.CommandText = "insert into primitems (" +
-                                "invType, assetType, name, " +
-                                "description, creationDate, nextPermissions, " +
-                                "currentPermissions, basePermissions, " +
-                                "everyonePermissions, groupPermissions, " +
-                                "flags, itemID, primID, assetID, " +
-                                "parentFolderID, creatorID, ownerID, " +
-                                "groupID, lastOwnerID) values (?invType, " +
-                                "?assetType, ?name, ?description, " +
-                                "?creationDate, ?nextPermissions, " +
-                                "?currentPermissions, ?basePermissions, " +
-                                "?everyonePermissions, ?groupPermissions, " +
-                                "?flags, ?itemID, ?primID, ?assetID, " +
-                                "?parentFolderID, ?creatorID, ?ownerID, " +
-                                "?groupID, ?lastOwnerID)";
-    
-                        foreach (TaskInventoryItem item in items)
-                        {
-                            cmd.Parameters.Clear();
-    
-                            FillItemCommand(cmd, item);
-    
-                            ExecuteNonQuery(cmd);
-                        }
+                        cmd.Parameters.Clear();
+
+                        FillItemCommand(cmd, item);
+
+                        ExecuteNonQuery(cmd);
                     }
+
+                    cmd.Dispose();
                 }
             }
         }
@@ -1985,74 +1905,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;
-        }
     }
 }

OpenSim/Data/MySQL/MySQLUserAccountData.cs

@@ -62,24 +62,23 @@ namespace OpenSim.Data.MySQL
             if (words.Length > 2)
                 return new UserAccountData[0];
 
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                if (words.Length == 1)
-                {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search)", m_Realm);
-                    cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
-                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-                }
-                else
-                {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst or LastName like ?searchLast)", m_Realm);
-                    cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
-                    cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
-                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
-                }
+            MySqlCommand cmd = new MySqlCommand();
 
-                return DoQuery(cmd);
+            if (words.Length == 1)
+            {
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search)", m_Realm);
+                cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
             }
+            else
+            {
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst or LastName like ?searchLast)", m_Realm);
+                cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
+                cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
+            }
+
+            return DoQuery(cmd);
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLXAssetData.cs

@@ -1,500 +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.Data;
-using System.IO;
-using System.IO.Compression;
-using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using log4net;
-using MySql.Data.MySqlClient;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Data;
-
-namespace OpenSim.Data.MySQL
-{
-    public class MySQLXAssetData : IXAssetDataPlugin
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        protected virtual Assembly Assembly
-        {
-            get { return GetType().Assembly; }
-        }
-
-        private bool m_enableCompression = false;
-        private string m_connectionString;
-        private object m_dbLock = new object();
-
-        /// <summary>
-        /// We can reuse this for all hashing since all methods are single-threaded through m_dbBLock
-        /// </summary>
-        private HashAlgorithm hasher = new SHA256CryptoServiceProvider();
-
-        #region IPlugin Members
-
-        public string Version { get { return "1.0.0.0"; } }
-
-        /// <summary>
-        /// <para>Initialises Asset interface</para>
-        /// <para>
-        /// <list type="bullet">
-        /// <item>Loads and initialises the MySQL storage plugin.</item>
-        /// <item>Warns and uses the obsolete mysql_connection.ini if connect string is empty.</item>
-        /// <item>Check for migration</item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        /// <param name="connect">connect string</param>
-        public void Initialise(string connect)
-        {
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: THIS PLUGIN IS STRICTLY EXPERIMENTAL.");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: DO NOT USE FOR ANY DATA THAT YOU DO NOT MIND LOSING.");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: DATABASE TABLES CAN CHANGE AT ANY TIME, CAUSING EXISTING DATA TO BE LOST.");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-            m_log.ErrorFormat("[MYSQL XASSETDATA]: ***********************************************************");
-
-            m_connectionString = connect;
-
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-                Migration m = new Migration(dbcon, Assembly, "XAssetStore");
-                m.Update();
-            }
-        }
-
-        public void Initialise()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Dispose() { }
-
-        /// <summary>
-        /// The name of this DB provider
-        /// </summary>
-        public string Name
-        {
-            get { return "MySQL XAsset storage engine"; }
-        }
-
-        #endregion
-
-        #region IAssetDataPlugin Members
-
-        /// <summary>
-        /// Fetch Asset <paramref name="assetID"/> from database
-        /// </summary>
-        /// <param name="assetID">Asset UUID to fetch</param>
-        /// <returns>Return the asset</returns>
-        /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks>
-        public AssetBase GetAsset(UUID assetID)
-        {
-//            m_log.DebugFormat("[MYSQL XASSET DATA]: Looking for asset {0}", assetID);
-
-            AssetBase asset = null;
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = new MySqlCommand(
-                        "SELECT name, description, asset_type, local, temporary, asset_flags, creator_id, data FROM xassetsmeta JOIN xassetsdata ON xassetsmeta.hash = xassetsdata.hash WHERE id=?id",
-                        dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", assetID.ToString());
-
-                        try
-                        {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                            {
-                                if (dbReader.Read())
-                                {
-                                    asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["asset_type"], dbReader["creator_id"].ToString());
-                                    asset.Data = (byte[])dbReader["data"];
-                                    asset.Description = (string)dbReader["description"];
-
-                                    string local = dbReader["local"].ToString();
-                                    if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase))
-                                        asset.Local = true;
-                                    else
-                                        asset.Local = false;
-
-                                    asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
-                                    asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-
-                                    if (m_enableCompression)
-                                    {
-                                        using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress))
-                                        {
-                                            MemoryStream outputStream = new MemoryStream();
-                                            WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
-    //                                        int compressedLength = asset.Data.Length;
-                                            asset.Data = outputStream.ToArray();
-    
-    //                                        m_log.DebugFormat(
-    //                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
-    //                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[MYSQL XASSET DATA]: MySql failure fetching asset " + assetID + ": " + e.Message);
-                        }
-                    }
-                }
-            }
-
-            return asset;
-        }
-
-        /// <summary>
-        /// Create an asset in database, or update it if existing.
-        /// </summary>
-        /// <param name="asset">Asset UUID to create</param>
-        /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
-        public void StoreAsset(AssetBase asset)
-        {
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlTransaction transaction = dbcon.BeginTransaction())
-                    {
-                        string assetName = asset.Name;
-                        if (asset.Name.Length > 64)
-                        {
-                            assetName = asset.Name.Substring(0, 64);
-                            m_log.Warn("[XASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
-                        }
-    
-                        string assetDescription = asset.Description;
-                        if (asset.Description.Length > 64)
-                        {
-                            assetDescription = asset.Description.Substring(0, 64);
-                            m_log.Warn("[XASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
-                        }
-
-                        if (m_enableCompression)
-                        {
-                            MemoryStream outputStream = new MemoryStream();
-
-                            using (GZipStream compressionStream = new GZipStream(outputStream, CompressionMode.Compress, false))
-                            {
-    //                            Console.WriteLine(WebUtil.CopyTo(new MemoryStream(asset.Data), compressionStream, int.MaxValue));
-                                // We have to close the compression stream in order to make sure it writes everything out to the underlying memory output stream.
-                                compressionStream.Close();
-                                byte[] compressedData = outputStream.ToArray();
-                                asset.Data = compressedData;
-                            }
-                        }
-
-                        byte[] hash = hasher.ComputeHash(asset.Data);
-
-//                        m_log.DebugFormat(
-//                            "[XASSET DB]: Compressed data size for {0} {1}, hash {2} is {3}",
-//                            asset.ID, asset.Name, hash, compressedData.Length);
-
-                        try
-                        {
-                            using (MySqlCommand cmd =
-                                new MySqlCommand(
-                                    "replace INTO xassetsmeta(id, hash, name, description, asset_type, local, temporary, create_time, access_time, asset_flags, creator_id)" +
-                                    "VALUES(?id, ?hash, ?name, ?description, ?asset_type, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?creator_id)",
-                                    dbcon))
-                            {
-                                // create unix epoch time
-                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                                cmd.Parameters.AddWithValue("?id", asset.ID);
-                                cmd.Parameters.AddWithValue("?hash", hash);
-                                cmd.Parameters.AddWithValue("?name", assetName);
-                                cmd.Parameters.AddWithValue("?description", assetDescription);
-                                cmd.Parameters.AddWithValue("?asset_type", asset.Type);
-                                cmd.Parameters.AddWithValue("?local", asset.Local);
-                                cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
-                                cmd.Parameters.AddWithValue("?create_time", now);
-                                cmd.Parameters.AddWithValue("?access_time", now);
-                                cmd.Parameters.AddWithValue("?creator_id", asset.Metadata.CreatorID);
-                                cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
-                                cmd.ExecuteNonQuery();
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset metadata {0} with name \"{1}\". Error: {2}",
-                                asset.FullID, asset.Name, e.Message);
-
-                            transaction.Rollback();
-
-                            return;
-                        }
-
-                        if (!ExistsData(dbcon, transaction, hash))
-                        {
-                            try
-                            {
-                                using (MySqlCommand cmd =
-                                    new MySqlCommand(
-                                        "INSERT INTO xassetsdata(hash, data) VALUES(?hash, ?data)",
-                                        dbcon))
-                                {
-                                    cmd.Parameters.AddWithValue("?hash", hash);
-                                    cmd.Parameters.AddWithValue("?data", asset.Data);
-                                    cmd.ExecuteNonQuery();
-                                }
-                            }
-                            catch (Exception e)
-                            {
-                                m_log.ErrorFormat("[XASSET DB]: MySQL failure creating asset data {0} with name \"{1}\". Error: {2}",
-                                    asset.FullID, asset.Name, e.Message);
-    
-                                transaction.Rollback();
-    
-                                return;
-                            }
-                        }
-    
-                        transaction.Commit();
-                    }
-                }
-            }
-        }
-
-//        private void UpdateAccessTime(AssetBase asset)
-//        {
-//            lock (m_dbLock)
-//            {
-//                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-//                {
-//                    dbcon.Open();
-//                    MySqlCommand cmd =
-//                        new MySqlCommand("update assets set access_time=?access_time where id=?id",
-//                                         dbcon);
-//
-//                    // need to ensure we dispose
-//                    try
-//                    {
-//                        using (cmd)
-//                        {
-//                            // create unix epoch time
-//                            int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-//                            cmd.Parameters.AddWithValue("?id", asset.ID);
-//                            cmd.Parameters.AddWithValue("?access_time", now);
-//                            cmd.ExecuteNonQuery();
-//                            cmd.Dispose();
-//                        }
-//                    }
-//                    catch (Exception e)
-//                    {
-//                        m_log.ErrorFormat(
-//                            "[ASSETS DB]: " +
-//                            "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
-//                            + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
-//                    }
-//                }
-//            }
-//
-//        }
-
-        /// <summary>
-        /// We assume we already have the m_dbLock.
-        /// </summary>
-        /// TODO: need to actually use the transaction.
-        /// <param name="dbcon"></param>
-        /// <param name="transaction"></param>
-        /// <param name="hash"></param>
-        /// <returns></returns>
-        private bool ExistsData(MySqlConnection dbcon, MySqlTransaction transaction, byte[] hash)
-        {
-//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
-
-            bool exists = false;
-
-            using (MySqlCommand cmd = new MySqlCommand("SELECT hash FROM xassetsdata WHERE hash=?hash", dbcon))
-            {
-                cmd.Parameters.AddWithValue("?hash", hash);
-
-                try
-                {
-                    using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                    {
-                        if (dbReader.Read())
-                        {
-//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
-                            exists = true;
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[XASSETS DB]: MySql failure in ExistsData fetching hash {0}.  Exception {1}{2}",
-                        hash, e.Message, e.StackTrace);
-                }
-            }
-
-            return exists;
-        }
-
-        /// <summary>
-        /// Check if the asset exists in the database
-        /// </summary>
-        /// <param name="uuid">The asset UUID</param>
-        /// <returns>true if it exists, false otherwise.</returns>
-        public bool ExistsAsset(UUID uuid)
-        {
-//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
-
-            bool assetExists = false;
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-                    using (MySqlCommand cmd = new MySqlCommand("SELECT id FROM xassetsmeta WHERE id=?id", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", uuid.ToString());
-
-                        try
-                        {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                            {
-                                if (dbReader.Read())
-                                {
-//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
-                                    assetExists = true;
-                                }
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[XASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString(), uuid);
-                        }
-                    }
-                }
-            }
-
-            return assetExists;
-        }
-
-        /// <summary>
-        /// Returns a list of AssetMetadata objects. The list is a subset of
-        /// the entire data set offset by <paramref name="start" /> containing
-        /// <paramref name="count" /> elements.
-        /// </summary>
-        /// <param name="start">The number of results to discard from the total data set.</param>
-        /// <param name="count">The number of rows the returned list should contain.</param>
-        /// <returns>A list of AssetMetadata objects.</returns>
-        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
-        {
-            List<AssetMetadata> retList = new List<AssetMetadata>(count);
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-                    MySqlCommand cmd = new MySqlCommand("SELECT name,description,asset_type,temporary,id,asset_flags,creator_id FROM xassetsmeta LIMIT ?start, ?count", dbcon);
-                    cmd.Parameters.AddWithValue("?start", start);
-                    cmd.Parameters.AddWithValue("?count", count);
-
-                    try
-                    {
-                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
-                        {
-                            while (dbReader.Read())
-                            {
-                                AssetMetadata metadata = new AssetMetadata();
-                                metadata.Name = (string)dbReader["name"];
-                                metadata.Description = (string)dbReader["description"];
-                                metadata.Type = (sbyte)dbReader["asset_type"];
-                                metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
-                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
-                                metadata.CreatorID = dbReader["creator_id"].ToString();
-
-                                // We'll ignore this for now - it appears unused!
-//                                metadata.SHA1 = dbReader["hash"]);
-
-                                retList.Add(metadata);
-                            }
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
-                    }
-                }
-            }
-
-            return retList;
-        }
-
-        public bool Delete(string id)
-        {
-//            m_log.DebugFormat("[XASSETS DB]: Deleting asset {0}", id);
-
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = new MySqlCommand("delete from xassetsmeta where id=?id", dbcon))
-                    {
-                        cmd.Parameters.AddWithValue("?id", id);
-                        cmd.ExecuteNonQuery();
-                    }
-
-                    // TODO: How do we deal with data from deleted assets?  Probably not easily reapable unless we
-                    // keep a reference count (?)
-                }
-            }
-
-            return true;
-        }
-
-        #endregion
-    }
-}

OpenSim/Data/MySQL/MySQLXInventoryData.cs

@@ -26,10 +26,9 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Linq;
 using System.Reflection;
+using System.Collections.Generic;
 using log4net;
 using MySql.Data.MySqlClient;
 using OpenMetaverse;
@@ -42,12 +41,12 @@ namespace OpenSim.Data.MySQL
     /// </summary>
     public class MySQLXInventoryData : IXInventoryData
     {
-        private MySqlFolderHandler m_Folders;
+        private MySQLGenericTableHandler<XInventoryFolder> m_Folders;
         private MySqlItemHandler m_Items;
 
         public MySQLXInventoryData(string conn, string realm)
         {
-            m_Folders = new MySqlFolderHandler(
+            m_Folders = new MySQLGenericTableHandler<XInventoryFolder>(
                     conn, "inventoryfolders", "InventoryStore");
             m_Items = new MySqlItemHandler(
                     conn, "inventoryitems", String.Empty);
@@ -106,11 +105,6 @@ namespace OpenSim.Data.MySQL
             return m_Items.MoveItem(id, newParent);
         }
 
-        public bool MoveFolder(string id, string newParent)
-        {
-            return m_Folders.MoveFolder(id, newParent);
-        }
-
         public XInventoryItem[] GetActiveGestures(UUID principalID)
         {
             return m_Items.GetActiveGestures(principalID);
@@ -122,71 +116,24 @@ 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);
-
         public MySqlItemHandler(string c, string t, string m) :
                 base(c, t, m)
         {
         }
 
-        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;
-
-            UUID oldParent = retrievedItems[0].parentFolderID;
-
             using (MySqlCommand cmd = new MySqlCommand())
             {
+
                 cmd.CommandText = String.Format("update {0} set parentFolderID = ?ParentFolderID where inventoryID = ?InventoryID", m_Realm);
                 cmd.Parameters.AddWithValue("?ParentFolderID", newParent);
                 cmd.Parameters.AddWithValue("?InventoryID", id);
 
-                if (ExecuteNonQuery(cmd) == 0)
-                    return false;
+                return ExecuteNonQuery(cmd) == 0 ? false : true;
             }
-
-            IncrementFolderVersion(oldParent);
-            IncrementFolderVersion(newParent);
-
-            return true;
         }
 
         public XInventoryItem[] GetActiveGestures(UUID principalID)
@@ -237,73 +184,6 @@ namespace OpenSim.Data.MySQL
             if (!base.Store(item))
                 return false;
 
-            IncrementFolderVersion(item.parentFolderID);
-
-            return true;
-        }
-    }
-
-    public class MySqlFolderHandler : MySqlInventoryHandler<XInventoryFolder>
-    {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public MySqlFolderHandler(string c, string t, string m) :
-                base(c, t, m)
-        {
-        }
-
-        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 (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.CommandText
-                    = String.Format(
-                        "update {0} set parentFolderID = ?ParentFolderID where folderID = ?folderID", m_Realm);
-                cmd.Parameters.AddWithValue("?ParentFolderID", newParentFolderID);
-                cmd.Parameters.AddWithValue("?folderID", id);
-
-                if (ExecuteNonQuery(cmd) == 0)
-                    return false;
-            }
-
-            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 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)
-        {
-            return IncrementFolderVersion(folderID.ToString());
-        }
-
-        protected bool IncrementFolderVersion(string folderID)
-        {
-//            m_log.DebugFormat("[MYSQL FOLDER HANDLER]: Incrementing version on folder {0}", folderID);
-//            Util.PrintCallStack();
-
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
@@ -313,7 +193,7 @@ namespace OpenSim.Data.MySQL
                     cmd.Connection = dbcon;
 
                     cmd.CommandText = String.Format("update inventoryfolders set version=version+1 where folderID = ?folderID");
-                    cmd.Parameters.AddWithValue("?folderID", folderID);
+                    cmd.Parameters.AddWithValue("?folderID", item.parentFolderID.ToString());
 
                     try
                     {
@@ -325,11 +205,9 @@ namespace OpenSim.Data.MySQL
                     }
                     cmd.Dispose();
                 }
-
                 dbcon.Close();
             }
-
             return true;
         }
     }
-}
+}

OpenSim/Data/MySQL/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Data/MySQL/Resources/GridUserStore.migrations

@@ -17,8 +17,3 @@ CREATE TABLE `GridUser` (
 ) ENGINE=InnoDB;
 
 COMMIT;
-
-:VERSION 2         # -------------------------- 
-BEGIN;
-
-COMMIT;

OpenSim/Data/MySQL/Resources/RegionStore.migrations

@@ -883,22 +883,4 @@ ALTER TABLE `regionsettings` MODIFY COLUMN `TelehubObject` VARCHAR(36) NOT NULL
 
 COMMIT;
 
-:VERSION 44         #--------------------- Environment Settings
 
-BEGIN;
-
-CREATE TABLE `regionenvironment` (
-  `region_id` varchar(36) NOT NULL,
-  `llsd_settings` TEXT NOT NULL,
-  PRIMARY KEY (`region_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-COMMIT;
-
-:VERSION 45
-
-BEGIN;
-
-CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`));
-
-COMMIT;

OpenSim/Data/MySQL/Resources/XAssetStore.migrations

@@ -1,27 +0,0 @@
-# -----------------
-:VERSION 1
-
-BEGIN;
-
-CREATE TABLE `xassetsmeta` (
-  `id` char(36) NOT NULL,
-  `hash` binary(32) NOT NULL,
-  `name` varchar(64) NOT NULL,
-  `description` varchar(64) NOT NULL,
-  `asset_type` tinyint(4) NOT NULL,
-  `local` tinyint(1) NOT NULL,
-  `temporary` tinyint(1) NOT NULL,
-  `create_time` int(11) NOT NULL,
-  `access_time` int(11) NOT NULL,
-  `asset_flags` int(11) NOT NULL,
-  `creator_id` varchar(128) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
-
-CREATE TABLE `xassetsdata` (
-  `hash` binary(32) NOT NULL,
-  `data` longblob NOT NULL,
-  PRIMARY KEY (`hash`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
-
-COMMIT;

OpenSim/Data/Null/NullPresenceData.cs

@@ -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;
-        }
-
     }
 }

OpenSim/Data/Null/NullRegionData.cs

@@ -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;

OpenSim/Data/Null/NullSimulationData.cs

@@ -76,27 +76,9 @@ namespace OpenSim.Data.Null
             //This connector doesn't support the windlight module yet
         }
 
-        #region Environment Settings
-        public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            //This connector doesn't support the Environment module yet
-            return string.Empty;
-        }
-
-        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            //This connector doesn't support the Environment module yet
-        }
-
-        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            //This connector doesn't support the Environment module yet
-        }
-        #endregion
-
         public RegionSettings LoadRegionSettings(UUID regionUUID)
-        {
-            RegionSettings rs = new RegionSettings();
+        {
+            RegionSettings rs = new RegionSettings();
             rs.RegionUUID = regionUUID;
             return rs;
         }
@@ -151,18 +133,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;
-        }
     }
 }

OpenSim/Data/Null/NullXGroupData.cs

@@ -1,90 +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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Data;
-
-namespace OpenSim.Data.Null
-{
-    public class NullXGroupData : NullGenericDataHandler, IXGroupData
-    {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private Dictionary<UUID, XGroup> m_groups = new Dictionary<UUID, XGroup>();
-
-        public NullXGroupData(string connectionString, string realm) {}
-
-        public bool StoreGroup(XGroup group)
-        {
-            lock (m_groups)
-            {
-                m_groups[group.groupID] = group.Clone();
-            }
-
-            return true;
-        }
-
-        public XGroup[] GetGroups(string field, string val)
-        {
-            return GetGroups(new string[] { field }, new string[] { val });
-        }
-
-        public XGroup[] GetGroups(string[] fields, string[] vals)
-        {
-            lock (m_groups)
-            {
-                List<XGroup> origGroups = Get<XGroup>(fields, vals, m_groups.Values.ToList());
-
-                return origGroups.Select(g => g.Clone()).ToArray();
-            }
-        }
-
-        public bool DeleteGroups(string field, string val)
-        {
-            return DeleteGroups(new string[] { field }, new string[] { val });
-        }
-
-        public bool DeleteGroups(string[] fields, string[] vals)
-        {
-            lock (m_groups)
-            {
-                XGroup[] groupsToDelete = GetGroups(fields, vals);
-                Array.ForEach(groupsToDelete, g => m_groups.Remove(g.groupID));
-            }
-
-            return true;
-        }
-    }
-}

OpenSim/Data/Null/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Data/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Data/SQLite/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Data/SQLite/Resources/RegionStore.migrations

@@ -564,14 +564,3 @@ COMMIT;
 BEGIN;
 ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
 COMMIT;
-
-:VERSION 26
-
-BEGIN;
-
-CREATE TABLE `regionenvironment` (
-  `region_id` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000' PRIMARY KEY,
-  `llsd_settings` TEXT NOT NULL
-);
-
-COMMIT;

OpenSim/Data/SQLite/SQLiteAssetData.cs

@@ -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;
         }
 

OpenSim/Data/SQLite/SQLiteAuthenticationData.cs

@@ -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;
         }
     }
-}
+}

OpenSim/Data/SQLite/SQLiteAvatarData.cs

@@ -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);
+            }
         }
     }
-}
+}

OpenSim/Data/SQLite/SQLiteEstateData.cs

@@ -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())
             {

OpenSim/Data/SQLite/SQLiteFramework.cs

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

OpenSim/Data/SQLite/SQLiteFriendsData.cs

@@ -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;
         }

OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs

@@ -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;
         }
     }
 }

OpenSim/Data/SQLite/SQLiteSimulationData.cs

@@ -61,7 +61,6 @@ namespace OpenSim.Data.SQLite
         private const string regionbanListSelect = "select * from regionban";
         private const string regionSettingsSelect = "select * from regionsettings";
         private const string regionWindlightSelect = "select * from regionwindlight";
-        private const string regionEnvironmentSelect = "select * from regionenvironment";
         private const string regionSpawnPointsSelect = "select * from spawn_points";
 
         private DataSet ds;
@@ -73,7 +72,6 @@ namespace OpenSim.Data.SQLite
         private SqliteDataAdapter landAccessListDa;
         private SqliteDataAdapter regionSettingsDa;
         private SqliteDataAdapter regionWindlightDa;
-        private SqliteDataAdapter regionEnvironmentDa;
         private SqliteDataAdapter regionSpawnPointsDa;
 
         private SqliteConnection m_conn;
@@ -148,9 +146,6 @@ namespace OpenSim.Data.SQLite
                 SqliteCommand regionWindlightSelectCmd = new SqliteCommand(regionWindlightSelect, m_conn);
                 regionWindlightDa = new SqliteDataAdapter(regionWindlightSelectCmd);
 
-                SqliteCommand regionEnvironmentSelectCmd = new SqliteCommand(regionEnvironmentSelect, m_conn);
-                regionEnvironmentDa = new SqliteDataAdapter(regionEnvironmentSelectCmd);
-
                 SqliteCommand regionSpawnPointsSelectCmd = new SqliteCommand(regionSpawnPointsSelect, m_conn);
                 regionSpawnPointsDa = new SqliteDataAdapter(regionSpawnPointsSelectCmd);
 
@@ -184,9 +179,6 @@ namespace OpenSim.Data.SQLite
                     ds.Tables.Add(createRegionWindlightTable());
                     setupRegionWindlightCommands(regionWindlightDa, m_conn);
 
-                    ds.Tables.Add(createRegionEnvironmentTable());
-                    setupRegionEnvironmentCommands(regionEnvironmentDa, m_conn);
-
                     ds.Tables.Add(createRegionSpawnPointsTable());
                     setupRegionSpawnPointsCommands(regionSpawnPointsDa, m_conn);
 
@@ -266,15 +258,6 @@ namespace OpenSim.Data.SQLite
                         m_log.ErrorFormat("[SQLITE REGION DB]: Caught fill error on regionwindlight table :{0}", e.Message);
                     }
 
-                    try
-                    {
-                        regionEnvironmentDa.Fill(ds.Tables["regionenvironment"]);
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.ErrorFormat("[SQLITE REGION DB]: Caught fill error on regionenvironment table :{0}", e.Message);
-                    }
-
                     try
                     {
                         regionSpawnPointsDa.Fill(ds.Tables["spawn_points"]);
@@ -295,13 +278,12 @@ namespace OpenSim.Data.SQLite
                     CreateDataSetMapping(landAccessListDa, "landaccesslist");
                     CreateDataSetMapping(regionSettingsDa, "regionsettings");
                     CreateDataSetMapping(regionWindlightDa, "regionwindlight");
-                    CreateDataSetMapping(regionEnvironmentDa, "regionenvironment");
                     CreateDataSetMapping(regionSpawnPointsDa, "spawn_points");
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[SQLITE REGION DB]: {0} - {1}", e.Message, e.StackTrace);
+                m_log.ErrorFormat("[SQLITE REGION DB]: ", e);
                 Environment.Exit(23);
             }
             return;
@@ -359,11 +341,6 @@ namespace OpenSim.Data.SQLite
                 regionWindlightDa.Dispose();
                 regionWindlightDa = null;
             }
-            if (regionEnvironmentDa != null)
-            {
-                regionEnvironmentDa.Dispose();
-                regionEnvironmentDa = null;
-            }
             if (regionSpawnPointsDa != null)
             {
                 regionSpawnPointsDa.Dispose();
@@ -497,63 +474,6 @@ namespace OpenSim.Data.SQLite
             }
         }
 
-        #region Region Environment Settings
-        public string LoadRegionEnvironmentSettings(UUID regionUUID)
-        {
-            lock (ds)
-            {
-                DataTable environmentTable = ds.Tables["regionenvironment"];
-                DataRow row = environmentTable.Rows.Find(regionUUID.ToString());
-                if (row == null)
-                {
-                    return String.Empty;
-                }
-
-                return (String)row["llsd_settings"];
-            }
-        }
-
-        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
-        {
-            lock (ds)
-            {
-                DataTable environmentTable = ds.Tables["regionenvironment"];
-                DataRow row = environmentTable.Rows.Find(regionUUID.ToString());
-
-                if (row == null)
-                {
-                    row = environmentTable.NewRow();
-                    row["region_id"] = regionUUID.ToString();
-                    row["llsd_settings"] = settings;
-                    environmentTable.Rows.Add(row);
-                }
-                else
-                {
-                    row["llsd_settings"] = settings;
-                }
-
-                regionEnvironmentDa.Update(ds, "regionenvironment");
-            }
-        }
-
-        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
-        {
-            lock (ds)
-            {
-                DataTable environmentTable = ds.Tables["regionenvironment"];
-                DataRow row = environmentTable.Rows.Find(regionUUID.ToString());
-
-                if (row != null)
-                {
-                    row.Delete();
-                }
-
-                regionEnvironmentDa.Update(ds, "regionenvironment");
-            }
-        }
-
-        #endregion
-
         public RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             lock (ds)
@@ -1366,13 +1286,6 @@ namespace OpenSim.Data.SQLite
             createCol(land, "UserLookAtZ", typeof(Double));
             createCol(land, "AuthbuyerID", typeof(String));
             createCol(land, "OtherCleanTime", typeof(Int32));
-            createCol(land, "Dwell", typeof(Int32));
-            createCol(land, "MediaType", typeof(String));
-            createCol(land, "MediaDescription", typeof(String));
-            createCol(land, "MediaSize", typeof(String));
-            createCol(land, "MediaLoop", typeof(Boolean));
-            createCol(land, "ObscureMedia", typeof(Boolean));
-            createCol(land, "ObscureMusic", typeof(Boolean));
 
             land.PrimaryKey = new DataColumn[] { land.Columns["UUID"] };
 
@@ -1517,17 +1430,6 @@ namespace OpenSim.Data.SQLite
             return regionwindlight;
         }
 
-        private static DataTable createRegionEnvironmentTable()
-        {
-            DataTable regionEnvironment = new DataTable("regionenvironment");
-            createCol(regionEnvironment, "region_id", typeof(String));
-            createCol(regionEnvironment, "llsd_settings", typeof(String));
-
-            regionEnvironment.PrimaryKey = new DataColumn[] { regionEnvironment.Columns["region_id"] };
-
-            return regionEnvironment;
-        }
-
         private static DataTable createRegionSpawnPointsTable()
         {
             DataTable spawn_points = new DataTable("spawn_points");
@@ -1788,16 +1690,9 @@ namespace OpenSim.Data.SQLite
             newData.PassHours = Convert.ToSingle(row["PassHours"]);
             newData.PassPrice = Convert.ToInt32(row["PassPrice"]);
             newData.SnapshotID = (UUID)(String)row["SnapshotUUID"];
-            newData.Dwell = Convert.ToInt32(row["Dwell"]);
-            newData.MediaType = (String)row["MediaType"];
-            newData.MediaDescription = (String)row["MediaDescription"];
-            newData.MediaWidth = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[0]);
-            newData.MediaHeight = Convert.ToInt32((((string)row["MediaSize"]).Split(','))[1]);
-            newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]);
-            newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
-            newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
             try
             {
+
                 newData.UserLocation =
                     new Vector3(Convert.ToSingle(row["UserLocationX"]), Convert.ToSingle(row["UserLocationY"]),
                                   Convert.ToSingle(row["UserLocationZ"]));
@@ -2209,13 +2104,12 @@ namespace OpenSim.Data.SQLite
             row["UserLookAtZ"] = land.UserLookAt.Z;
             row["AuthbuyerID"] = land.AuthBuyerID.ToString();
             row["OtherCleanTime"] = land.OtherCleanTime;
-            row["Dwell"] = land.Dwell;
             row["MediaType"] = land.MediaType;
             row["MediaDescription"] = land.MediaDescription;
-            row["MediaSize"] = String.Format("{0},{1}", land.MediaWidth, land.MediaHeight);
-            row["MediaLoop"] = land.MediaLoop;
-            row["ObscureMusic"] = land.ObscureMusic;
-            row["ObscureMedia"] = land.ObscureMedia;
+            row["MediaSize"] = land.MediaWidth.ToString() + "," + land.MediaHeight.ToString();
+            row["MediaLoop"] = land.MediaLoop.ToString();
+            row["ObscureMusic"] = land.ObscureMusic.ToString();
+            row["ObscureMedia"] = land.ObscureMedia.ToString();
         }
 
         /// <summary>
@@ -2263,7 +2157,7 @@ namespace OpenSim.Data.SQLite
             row["terrain_raise_limit"] = settings.TerrainRaiseLimit;
             row["terrain_lower_limit"] = settings.TerrainLowerLimit;
             row["use_estate_sun"] = settings.UseEstateSun;
-            row["sandbox"] = settings.Sandbox; // unlike other database modules, sqlite uses a lower case s for sandbox!
+            row["Sandbox"] = settings.Sandbox; // database uses upper case S for sandbox
             row["sunvectorx"] = settings.SunVector.X;
             row["sunvectory"] = settings.SunVector.Y;
             row["sunvectorz"] = settings.SunVector.Z;
@@ -2797,14 +2691,6 @@ namespace OpenSim.Data.SQLite
             da.UpdateCommand.Connection = conn;
         }
 
-        private void setupRegionEnvironmentCommands(SqliteDataAdapter da, SqliteConnection conn)
-        {
-            da.InsertCommand = createInsertCommand("regionenvironment", ds.Tables["regionenvironment"]);
-            da.InsertCommand.Connection = conn;
-            da.UpdateCommand = createUpdateCommand("regionenvironment", "region_id=:region_id", ds.Tables["regionenvironment"]);
-            da.UpdateCommand.Connection = conn;
-        }
-
         private void setupRegionSpawnPointsCommands(SqliteDataAdapter da, SqliteConnection conn)
         {
             da.InsertCommand = createInsertCommand("spawn_points", ds.Tables["spawn_points"]);
@@ -2905,17 +2791,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;
-        }
     }
 }

OpenSim/Data/SQLite/SQLiteUserAccountData.cs

@@ -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);
         }
     }
 }

OpenSim/Data/SQLite/SQLiteXInventoryData.cs

@@ -47,7 +47,7 @@ namespace OpenSim.Data.SQLite
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private SqliteFolderHandler m_Folders;
+        private SQLiteGenericTableHandler<XInventoryFolder> m_Folders;
         private SqliteItemHandler m_Items;
 
         public SQLiteXInventoryData(string conn, string realm)
@@ -55,7 +55,7 @@ namespace OpenSim.Data.SQLite
             if (Util.IsWindows())
                 Util.LoadArchSpecificWindowsDll("sqlite3.dll");
 
-            m_Folders = new SqliteFolderHandler(
+            m_Folders = new SQLiteGenericTableHandler<XInventoryFolder>(
                     conn, "inventoryfolders", "XInventoryStore");
             m_Items = new SqliteItemHandler(
                     conn, "inventoryitems", String.Empty);
@@ -114,11 +114,6 @@ namespace OpenSim.Data.SQLite
             return m_Items.MoveItem(id, newParent);
         }
 
-        public bool MoveFolder(string id, string newParent)
-        {
-            return m_Folders.MoveFolder(id, newParent);
-        }
-
         public XInventoryItem[] GetActiveGestures(UUID principalID)
         {
             return m_Items.GetActiveGestures(principalID);
@@ -130,106 +125,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;
 
@@ -244,81 +177,4 @@ namespace OpenSim.Data.SQLite
             return perms;
         }
     }
-
-    public class SqliteFolderHandler : SqliteInventoryHandler<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 });
-
-            if (folders.Length == 0)
-                return false;
-
-            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;
-        }
-    }
-}
+}

OpenSim/Data/Tests/AssetTests.cs

@@ -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>
     {
     }
 

OpenSim/Data/Tests/BasicDataServiceTest.cs

@@ -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>

OpenSim/Data/Tests/PropertyCompareConstraint.cs

@@ -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
         {

OpenSim/Data/Tests/PropertyScrambler.cs

@@ -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()

OpenSim/Data/Tests/RegionTests.cs

@@ -244,10 +244,10 @@ namespace OpenSim.Data.Tests
             SceneObjectPart[] newparts = newsog.Parts;
             Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
             
-            Assert.That(newsog.ContainsPart(tmp0), "Assert.That(newsog.ContainsPart(tmp0))");
-            Assert.That(newsog.ContainsPart(tmp1), "Assert.That(newsog.ContainsPart(tmp1))");
-            Assert.That(newsog.ContainsPart(tmp2), "Assert.That(newsog.ContainsPart(tmp2))");
-            Assert.That(newsog.ContainsPart(tmp3), "Assert.That(newsog.ContainsPart(tmp3))");
+            Assert.That(newsog.HasChildPrim(tmp0), "Assert.That(newsog.HasChildPrim(tmp0))");
+            Assert.That(newsog.HasChildPrim(tmp1), "Assert.That(newsog.HasChildPrim(tmp1))");
+            Assert.That(newsog.HasChildPrim(tmp2), "Assert.That(newsog.HasChildPrim(tmp2))");
+            Assert.That(newsog.HasChildPrim(tmp3), "Assert.That(newsog.HasChildPrim(tmp3))");
         }
         
         [Test]
@@ -632,6 +632,7 @@ namespace OpenSim.Data.Tests
                 .IgnoreProperty(x=>x.RegionUUID)
                 .IgnoreProperty(x=>x.Scene)
                 .IgnoreProperty(x=>x.Parts)
+                .IgnoreProperty(x=>x.PassCollision)
                 .IgnoreProperty(x=>x.RootPart));
         }
 

OpenSim/Framework/AssemblyInfo.cs

@@ -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")]

OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Framework/AssetPermissions.cs

@@ -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;
-        }
-
-
-    }
-}

OpenSim/Framework/AvatarAppearance.cs

@@ -330,9 +330,6 @@ namespace OpenSim.Framework
             SetVisualParams(visualParams);
         }
 
-        /// <summary>
-        /// Set avatar height by a calculation based on their visual parameters.
-        /// </summary>
         public virtual void SetHeight()
         {
             // Start with shortest possible female avatar height

OpenSim/Framework/ChildAgentDataUpdate.cs

@@ -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"]);

OpenSim/Framework/Client/IClientChat.cs

@@ -33,8 +33,7 @@ namespace OpenSim.Framework.Client
     {
         event ChatMessage OnChatFromClient;
 
-        void SendChatMessage(
-            string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, UUID ownerID, byte source,
-            byte audible);
+        void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
+                             byte audible);
     }
-}
+}

OpenSim/Framework/Communications/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Framework/Configuration/HTTP/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Framework/Configuration/XML/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Framework/Console/AssemblyInfo.cs

@@ -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.*")]

OpenSim/Framework/Console/CommandConsole.cs

@@ -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");

OpenSim/Framework/Console/ConsoleBase.cs

@@ -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)
         {

OpenSim/Framework/Console/ConsoleDisplayTable.cs

@@ -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);
         }
     }
 }

OpenSim/Framework/Console/ConsoleUtil.cs

@@ -1,248 +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.IO;
-using System.Linq;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-
-namespace OpenSim.Framework.Console
-{
-    public class ConsoleUtil
-    {
-    //    private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public const int LocalIdNotFound = 0;
-    
-        /// <summary>
-        /// Used by modules to display stock co-ordinate help, though possibly this should be under some general section
-        /// rather than in each help summary.
-        /// </summary>
-        public const string CoordHelp
-    = @"Each component of the coord is comma separated.  There must be no spaces between the commas.
-    If you don't care about the z component you can simply omit it.
-    If you don't care about the x or y components then you can leave them blank (though a comma is still required)
-    If you want to specify the maxmimum value of a component then you can use ~ instead of a number
-    If you want to specify the minimum value of a component then you can use -~ instead of a number
-    e.g.
-    delete object pos 20,20,20 to 40,40,40
-    delete object pos 20,20 to 40,40
-    delete object pos ,20,20 to ,40,40
-    delete object pos ,,30 to ,,~
-    delete object pos ,,-~ to ,,30";
-    
-        public const string MinRawConsoleVectorValue = "-~";
-        public const string MaxRawConsoleVectorValue = "~";
-    
-        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.
-        /// </summary>
-        /// <remarks>
-        /// Will complain to the console if parsing fails.
-        /// </remarks>
-        /// <returns></returns>
-        /// <param name='console'>If null then no complaint is printed.</param>
-        /// <param name='rawUuid'></param>
-        /// <param name='uuid'></param>
-        public static bool TryParseConsoleUuid(ICommandConsole console, string rawUuid, out UUID uuid)
-        {
-            if (!UUID.TryParse(rawUuid, out uuid))
-            {
-                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid uuid", rawUuid);
-
-                return false;
-            }
-    
-            return true;
-        }
-
-        public static bool TryParseConsoleLocalId(ICommandConsole console, string rawLocalId, out uint localId)
-        {
-            if (!uint.TryParse(rawLocalId, out localId))
-            {
-                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid local id", localId);
-
-                return false;
-            }
-
-            if (localId == 0)
-            {
-                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid local id - it must be greater than 0", localId);
-
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Tries to parse the input as either a UUID or a local ID.
-        /// </summary>
-        /// <returns>true if parsing succeeded, false otherwise.</returns>
-        /// <param name='console'></param>
-        /// <param name='rawId'></param>
-        /// <param name='uuid'></param>
-        /// <param name='localId'>
-        /// Will be set to ConsoleUtil.LocalIdNotFound if parsing result was a UUID or no parse succeeded.
-        /// </param>
-        public static bool TryParseConsoleId(ICommandConsole console, string rawId, out UUID uuid, out uint localId)
-        {
-            if (TryParseConsoleUuid(null, rawId, out uuid))
-            {
-                localId = LocalIdNotFound;
-                return true;
-            }
-
-            if (TryParseConsoleLocalId(null, rawId, out localId))
-            {
-                return true;
-            }
-
-            if (console != null)
-                console.OutputFormat("ERROR: {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
-        /// </summary>
-        /// <param name='rawConsoleVector'>/param>
-        /// <param name='vector'></param>
-        /// <returns></returns>
-        public static bool TryParseConsoleMinVector(string rawConsoleVector, out Vector3 vector)
-        {
-            return TryParseConsoleVector(rawConsoleVector, c => float.MinValue.ToString(), out vector);
-        }
-    
-        /// <summary>
-        /// Convert a maximum vector input from the console to an OpenMetaverse.Vector3
-        /// </summary>
-        /// <param name='rawConsoleVector'>/param>
-        /// <param name='vector'></param>
-        /// <returns></returns>
-        public static bool TryParseConsoleMaxVector(string rawConsoleVector, out Vector3 vector)
-        {
-            return TryParseConsoleVector(rawConsoleVector, c => float.MaxValue.ToString(), out vector);
-        }
-    
-        /// <summary>
-        /// Convert a vector input from the console to an OpenMetaverse.Vector3
-        /// </summary>
-        /// <param name='rawConsoleVector'>
-        /// A string in the form <x>,<y>,<z> where there is no space between values.
-        /// Any component can be missing (e.g. ,,40).  blankComponentFunc is invoked to replace the blank with a suitable value
-        /// Also, if the blank component is at the end, then the comma can be missed off entirely (e.g. 40,30 or 40)
-        /// The strings "~" and "-~" are valid in components.  The first substitutes float.MaxValue whilst the second is float.MinValue
-        /// Other than that, component values must be numeric.
-        /// </param>
-        /// <param name='blankComponentFunc'></param>
-        /// <param name='vector'></param>
-        /// <returns></returns>
-        public static bool TryParseConsoleVector(
-            string rawConsoleVector, Func<string, string> blankComponentFunc, out Vector3 vector)
-        {
-            List<string> components = rawConsoleVector.Split(VectorSeparatorChars).ToList();
-    
-            if (components.Count < 1 || components.Count > 3)
-            {
-                vector = Vector3.Zero;
-                return false;
-            }
-    
-            for (int i = components.Count; i < 3; i++)
-                components.Add("");
-    
-            List<string> semiDigestedComponents
-                = components.ConvertAll<string>(
-                    c =>
-                    {
-                        if (c == "")
-                            return blankComponentFunc.Invoke(c);
-                        else if (c == MaxRawConsoleVectorValue)
-                            return float.MaxValue.ToString();
-                        else if (c == MinRawConsoleVectorValue)
-                            return float.MinValue.ToString();
-                        else
-                            return c;
-                    });
-    
-            string semiDigestedConsoleVector = string.Join(VectorSeparator, semiDigestedComponents.ToArray());
-    
-    //        m_log.DebugFormat("[CONSOLE UTIL]: Parsing {0} into OpenMetaverse.Vector3", semiDigestedConsoleVector);
-    
-            return Vector3.TryParse(semiDigestedConsoleVector, out vector);
-        }
-    }
-}

OpenSim/Framework/Console/LocalConsole.cs

@@ -296,10 +296,6 @@ namespace OpenSim.Framework.Console
                             matches[0].Groups["Category"].Value);
                     System.Console.Write("]:");
                 }
-                else
-                {
-                    outText = outText.Trim();
-                }
             }
 
             if (level == "error")
@@ -319,8 +315,6 @@ namespace OpenSim.Framework.Console
 
         public override void Output(string text, string level)
         {
-            FireOnOutput(text);
-
             lock (m_commandLine)
             {
                 if (m_cursorYPosition == -1)
@@ -511,4 +505,4 @@ namespace OpenSim.Framework.Console
             }
         }
     }
-}
+}

OpenSim/Framework/Console/MockConsole.cs

@@ -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; }
     }
-}
+}

OpenSim/Framework/Console/RemoteConsole.cs

@@ -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());
         }
 

OpenSim/Framework/Constants.cs

@@ -31,7 +31,6 @@ namespace OpenSim.Framework
     public class Constants
     {
         public const uint RegionSize = 256;
-        public const uint RegionHeight = 4096;
         public const byte TerrainPatchSize = 16;
         public const string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f";
 

OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs

@@ -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;
-        }
-    }
-}

OpenSim/Framework/EstateSettings.cs

@@ -322,7 +322,7 @@ namespace OpenSim.Framework
                 l_EstateManagers.Remove(avatarID);
         }
 
-        public bool IsEstateManagerOrOwner(UUID avatarID)
+        public bool IsEstateManager(UUID avatarID)
         {
             if (IsEstateOwner(avatarID))
                 return true;
@@ -368,7 +368,7 @@ namespace OpenSim.Framework
 
         public bool HasAccess(UUID user)
         {
-            if (IsEstateManagerOrOwner(user))
+            if (IsEstateManager(user))
                 return true;
 
             return l_EstateAccess.Contains(user);

OpenSim/Framework/GridInstantMessage.cs

@@ -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])
         {
         }
     }

OpenSim/Framework/IClientAPI.cs

@@ -805,23 +805,8 @@ namespace OpenSim.Framework
         event Action<IClientAPI> OnRegionHandShakeReply;
         event GenericCall1 OnRequestWearables;
         event Action<IClientAPI, bool> OnCompleteMovementToRegion;
-
-        /// <summary>
-        /// Called when an AgentUpdate message is received and before OnAgentUpdate.
-        /// </summary>
-        /// <remarks>
-        /// Listeners must not retain a reference to AgentUpdateArgs since this object may be reused for subsequent AgentUpdates.
-        /// </remarks>
         event UpdateAgent OnPreAgentUpdate;
-
-        /// <summary>
-        /// Called when an AgentUpdate message is received and after OnPreAgentUpdate.
-        /// </summary>
-        /// <remarks>
-        /// Listeners must not retain a reference to AgentUpdateArgs since this object may be reused for subsequent AgentUpdates.
-        /// </remarks>
         event UpdateAgent OnAgentUpdate;
-
         event AgentRequestSit OnAgentRequestSit;
         event AgentSit OnAgentSit;
         event AvatarPickerRequest OnAvatarPickerRequest;
@@ -1099,20 +1084,8 @@ namespace OpenSim.Framework
         void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
         void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
 
-        /// <summary>
-        /// Send chat to the viewer.
-        /// </summary>
-        /// <param name='message'></param>
-        /// <param name='type'></param>
-        /// <param name='fromPos'></param>
-        /// <param name='fromName'></param>
-        /// <param name='fromAgentID'></param>
-        /// <param name='ownerID'></param>
-        /// <param name='source'></param>
-        /// <param name='audible'></param>
-        void SendChatMessage(
-            string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, UUID ownerID, byte source,
-            byte audible);
+        void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
+                             byte audible);
 
         void SendInstantMessage(GridInstantMessage im);
 
@@ -1263,9 +1236,10 @@ namespace OpenSim.Framework
         /// <param name="OrbitalPosition">The orbital position is given in radians, and must be "adjusted" for the linden client, see LLClientView</param>
         void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear,
                         float OrbitalPosition);
-        
+
         void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks);
         void SendViewerTime(int phase);
+        UUID GetDefaultAnimation(string name);
 
         void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout,
                                   uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID);

OpenSim/Framework/ICommandConsole.cs

@@ -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);
     }
-}
+}

OpenSim/Framework/IConsole.cs

@@ -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);

OpenSim/Framework/InventoryFolderBase.cs

@@ -73,27 +73,33 @@ namespace OpenSim.Framework
         {
         }
 
-        public InventoryFolderBase(UUID id) : this()
+        public InventoryFolderBase(UUID id)
         {
             ID = id;
         }
 
-        public InventoryFolderBase(UUID id, UUID owner) : this(id)
+        public InventoryFolderBase(UUID id, UUID owner)
         {
+            ID = id;
             Owner = owner;
         }
 
-        public InventoryFolderBase(UUID id, string name, UUID owner, UUID parent) : this(id, owner)
+        public InventoryFolderBase(UUID id, string name, UUID owner, UUID parent)
         {
+            ID = id;
             Name = name;
+            Owner = owner;
             ParentID = parent;
         }
 
-        public InventoryFolderBase(
-            UUID id, string name, UUID owner, short type, UUID parent, ushort version) : this(id, name, owner, parent)
+        public InventoryFolderBase(UUID id, string name, UUID owner, short type, UUID parent, ushort version)
         {
+            ID = id;
+            Name = name;
+            Owner = owner;
             Type = type;
+            ParentID = parent;
             Version = version;
         }
     }
-}
+}

OpenSim/Framework/InventoryItemBase.cs

@@ -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;
+
                 }
             }
         }

OpenSim/Framework/LandData.cs

@@ -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)

OpenSim/Framework/MemoryWatchdog.cs

@@ -32,7 +32,7 @@ using System.Reflection;
 using System.Threading;
 using log4net;
 
-namespace OpenSim.Framework.Monitoring
+namespace OpenSim.Framework
 {
     /// <summary>
     /// Experimental watchdog for memory usage.
@@ -60,21 +60,13 @@ namespace OpenSim.Framework.Monitoring
         private static bool m_enabled;
 
         /// <summary>
-        /// Last memory churn in bytes per millisecond.
+        /// Average memory churn in bytes per millisecond.
         /// </summary>
         public static double AverageMemoryChurn
         {
             get { if (m_samples.Count > 0) return m_samples.Average(); else return 0; }
         }
 
-        /// <summary>
-        /// Average memory churn in bytes per millisecond.
-        /// </summary>
-        public static double LastMemoryChurn
-        {
-            get { if (m_samples.Count > 0) return m_samples.Last(); else return 0; }
-        }
-
         /// <summary>
         /// Maximum number of statistical samples.
         /// </summary>
@@ -97,7 +89,7 @@ namespace OpenSim.Framework.Monitoring
         /// <summary>
         /// Memory churn rate per millisecond.
         /// </summary>
-//        private static double m_churnRatePerMillisecond;
+        private static double m_churnRatePerMillisecond;
 
         /// <summary>
         /// Historical samples for calculating moving average.

OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs

@@ -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")]

OpenSim/Framework/Monitoring/Stats/PercentageStat.cs

@@ -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();
-        }
-    }
-}