Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call.

Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology.
Add some method doc.

.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
@@ -46,8 +41,6 @@ bin/Physics*
 bin/Terrain*
 bin/Regions/*
 bin/UserAssets
-bin/assetcache
-bin/maptiles
 bin/estate_settings.xml
 bin/config-include/CenomeCache.ini
 bin/config-include/FlotsamCache.ini

.nant/local.include

@@ -135,25 +135,14 @@
   <delete dir="%temp%"/>
 </target>
 
-<target name="test-stress" depends="build, find-nunit">
+<target name="torture" depends="build, find-nunit">
   <setenv name="MONO_THREADS_PER_CPU" value="100" />
 
-  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.stress">
-    <arg value="./bin/OpenSim.Tests.Stress.dll" />
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.torture">
+    <arg value="./bin/OpenSim.Tests.Torture.dll" />
   </exec>
 
-  <fail message="Failures reported in stress tests." unless="${int::parse(testresult.opensim.tests.stress)==0}" /> 
-  <delete dir="%temp%"/>
-</target>
-
-<target name="test-perf" depends="build, find-nunit">
-  <setenv name="MONO_THREADS_PER_CPU" value="100" />
-
-  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.performance">
-    <arg value="./bin/OpenSim.Tests.Performance.dll" />
-  </exec>
-
-  <fail message="Failures reported in performance tests." unless="${int::parse(testresult.opensim.tests.performance)==0}" /> 
+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.torture)==0}" /> 
   <delete dir="%temp%"/>
 </target>
 

CONTRIBUTORS.txt

@@ -1,4 +1,4 @@
-   <<<>>>>The following people have contributed to OpenSim (Thank you 
+The following people have contributed to OpenSim (Thank you 
 for your effort!)
 
 = Current OpenSim Developers (in very rough order of appearance) =
@@ -71,7 +71,6 @@ what it is today.
 * CharlieO
 * ChrisDown
 * Chris Yeoh (IBM)
-* controlbreak
 * coyled
 * Daedius
 * Dong Jun Lan (IBM)
@@ -87,12 +86,8 @@ what it is today.
 * Grumly57
 * GuduleLapointe
 * Ewe Loon
-* Fernando Oliveira
 * Fly-Man
 * Flyte Xevious
-* Garmin Kawaguichi
-* Gryc Ueusp
-* Hiro Lecker
 * Imaze Rhiano
 * Intimidated
 * Jeremy Bongio (IBM)
@@ -111,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/)
@@ -141,15 +135,10 @@ what it is today.
 * Ruud Lathorp
 * SachaMagne
 * Salahzar Stenvaag
-* satguru p srivastava
 * sempuki
 * SignpostMarv
 * SpotOn3D
-* Stefan_Boom / stoehr
 * Strawberry Fride
-* Talun
-* TechplexEngineer (Blake Bourque)
-* TBG Renfold
 * tglion
 * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud)
 * tyre
@@ -208,4 +197,3 @@ In addition, we would like to thank:
 * The Mono Project
 * The NANT Developers
 * Microsoft (.NET, MSSQL-Adapters)
-*x

OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs

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

OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs

@@ -539,6 +539,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
         /// path has not already been registered, the method is added to the active
         /// handler table.
         /// </summary>
+
         public void AddStreamHandler(string httpMethod, string path, RestMethod method)
         {
             if (!IsEnabled)

OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs

@@ -101,8 +101,18 @@ namespace OpenSim.Capabilities.Handlers
             llsdItem.item_id = invItem.ID;
             llsdItem.name = invItem.Name;
             llsdItem.parent_id = invItem.Folder;
-            llsdItem.type = invItem.AssetType;
-            llsdItem.inv_type = invItem.InvType;
+
+            try
+            {
+                llsdItem.type = Utils.AssetTypeToString((AssetType)invItem.AssetType);
+                llsdItem.inv_type = Utils.InventoryTypeToString((InventoryType)invItem.InvType);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[WEB FETCH INV DESC HANDLER]: Problem setting asset {0} inventory {1} types while converting inventory item {2}: {3}",
+                    invItem.AssetType, invItem.InvType, invItem.Name, e.Message);
+            }
 
             llsdItem.permissions = new LLSDPermissions();
             llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid;
@@ -116,7 +126,21 @@ namespace OpenSim.Capabilities.Handlers
             llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions;
             llsdItem.sale_info = new LLSDSaleInfo();
             llsdItem.sale_info.sale_price = invItem.SalePrice;
-            llsdItem.sale_info.sale_type = invItem.SaleType;
+            switch (invItem.SaleType)
+            {
+                default:
+                    llsdItem.sale_info.sale_type = "not";
+                    break;
+                case 1:
+                    llsdItem.sale_info.sale_type = "original";
+                    break;
+                case 2:
+                    llsdItem.sale_info.sale_type = "copy";
+                    break;
+                case 3:
+                    llsdItem.sale_info.sale_type = "contents";
+                    break;
+            }
 
             return llsdItem;
         }

OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs

@@ -63,8 +63,7 @@ namespace OpenSim.Capabilities.Handlers
 
             FetchInventory2Handler fiHandler = new FetchInventory2Handler(m_InventoryService);
             IRequestHandler reqHandler
-                = new RestStreamHandler(
-                    "POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest, "FetchInventory", null);
+                = new RestStreamHandler("POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest);
             server.AddStreamHandler(reqHandler);
         }
     }

OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs

@@ -66,14 +66,13 @@ namespace OpenSim.Capabilities.Handlers
                 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
 
             GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService);
-            IRequestHandler reqHandler
-                = new RestHTTPHandler(
-                    "GET",
-                    "/CAPS/" + UUID.Random(),
-                    httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
-                    "GetMesh",
-                    null);
+            IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(),
+                                                       delegate(Hashtable m_dhttpMethod)
+                                                       {
+                                                           return gmeshHandler.ProcessGetMesh(m_dhttpMethod, UUID.Zero, null);
+                                                       });
             server.AddStreamHandler(reqHandler);
         }
+
     }
-}
+}

OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs

@@ -58,8 +58,8 @@ namespace OpenSim.Capabilities.Handlers
         // TODO: Change this to a config option
         const string REDIRECT_URL = null;
 
-        public GetTextureHandler(string path, IAssetService assService, string name, string description)
-            : base("GET", path, name, description)
+        public GetTextureHandler(string path, IAssetService assService) :
+                base("GET", path)
         {
             m_assetService = assService;
         }
@@ -77,6 +77,7 @@ namespace OpenSim.Capabilities.Handlers
             {
                 m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");
                 httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                return null;
             }
 
             UUID textureID;
@@ -114,6 +115,7 @@ namespace OpenSim.Capabilities.Handlers
 //                "[GETTEXTURE]: For texture {0} sending back response {1}, data length {2}",
 //                textureID, httpResponse.StatusCode, httpResponse.ContentLength);
 
+            httpResponse.Send();
             return null;
         }
 

OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs

@@ -62,8 +62,8 @@ namespace OpenSim.Capabilities.Handlers
             if (m_AssetService == null)
                 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
 
-            server.AddStreamHandler(
-                new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService, "GetTexture", null));
+            server.AddStreamHandler(new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService));
         }
+
     }
-}
+}

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

@@ -50,9 +50,9 @@ namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
             TestHelpers.InMethod();
 
             // Overkill - we only really need the asset service, not a whole scene.
-            Scene scene = new SceneHelpers().SetupScene();
+            Scene scene = SceneHelpers.SetupScene();
 
-            GetTextureHandler handler = new GetTextureHandler(null, scene.AssetService, "TestGetTexture", null);
+            GetTextureHandler handler = new GetTextureHandler(null, scene.AssetService);
             TestOSHttpRequest req = new TestOSHttpRequest();
             TestOSHttpResponse resp = new TestOSHttpResponse();
             req.Url = new Uri("http://localhost/?texture_id=00000000-0000-1111-9999-000000000012");

OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs

@@ -85,8 +85,8 @@ namespace OpenSim.Capabilities.Handlers
                 uploader.OnUpLoad += BakedTextureUploaded;
 
                 m_HostCapsObj.HttpListener.AddStreamHandler(
-                    new BinaryStreamHandler(
-                        "POST", capsBase + uploaderPath, uploader.uploaderCaps, "UploadBakedTexture", null));
+                        new BinaryStreamHandler("POST", capsBase + uploaderPath,
+                        uploader.uploaderCaps));
 
                 string protocol = "http://";
 

OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs

@@ -156,24 +156,21 @@ namespace OpenSim.Capabilities.Handlers
             inv.Folders = new List<InventoryFolderBase>();
             inv.Items = new List<InventoryItemBase>();
             int version = 0;
-            int descendents = 0;
 
             inv
                 = Fetch(
                     invFetch.owner_id, invFetch.folder_id, invFetch.owner_id,
-                    invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents);
+                    invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version);
 
-            if (inv != null && inv.Folders != null)
+            if (inv.Folders != null)
             {
                 foreach (InventoryFolderBase invFolder in inv.Folders)
                 {
                     contents.categories.Array.Add(ConvertInventoryFolder(invFolder));
                 }
-
-                descendents += inv.Folders.Count;
             }
 
-            if (inv != null && inv.Items != null)
+            if (inv.Items != null)
             {
                 foreach (InventoryItemBase invItem in inv.Items)
                 {
@@ -181,7 +178,7 @@ namespace OpenSim.Capabilities.Handlers
                 }
             }
 
-            contents.descendents = descendents;
+            contents.descendents = contents.items.Array.Count + contents.categories.Array.Count;
             contents.version = version;
 
 //            m_log.DebugFormat(
@@ -209,7 +206,7 @@ namespace OpenSim.Capabilities.Handlers
         /// <returns>An empty InventoryCollection if the inventory look up failed</returns>
         private InventoryCollection Fetch(
             UUID agentID, UUID folderID, UUID ownerID,
-            bool fetchFolders, bool fetchItems, int sortOrder, out int version, out int descendents)
+            bool fetchFolders, bool fetchItems, int sortOrder, out int version)
         {
 //            m_log.DebugFormat(
 //                "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
@@ -218,8 +215,6 @@ namespace OpenSim.Capabilities.Handlers
             // FIXME MAYBE: We're not handling sortOrder!
 
             version = 0;
-            descendents = 0;
-
             InventoryFolderImpl fold;
             if (m_LibraryService != null && m_LibraryService.LibraryRootFolder != null && agentID == m_LibraryService.LibraryRootFolder.Owner)
             {
@@ -228,7 +223,6 @@ namespace OpenSim.Capabilities.Handlers
                     InventoryCollection ret = new InventoryCollection();
                     ret.Folders = new List<InventoryFolderBase>();
                     ret.Items = fold.RequestListOfItems();
-                    descendents = ret.Folders.Count + ret.Items.Count;
 
                     return ret;
                 }
@@ -252,72 +246,24 @@ namespace OpenSim.Capabilities.Handlers
 
                     version = containingFolder.Version;
 
-                    if (fetchItems)
-                    {
-                        List<InventoryItemBase> itemsToReturn = contents.Items;
-                        List<InventoryItemBase> originalItems = new List<InventoryItemBase>(itemsToReturn);
-
-                        // descendents must only include the links, not the linked items we add
-                        descendents = originalItems.Count;
-
-                        // Add target items for links in this folder before the links themselves.
-                        foreach (InventoryItemBase item in originalItems)
-                        {
-                            if (item.AssetType == (int)AssetType.Link)
-                            {
-                                InventoryItemBase linkedItem = m_InventoryService.GetItem(new InventoryItemBase(item.AssetID));
-
-                                // Take care of genuinely broken links where the target doesn't exist
-                                // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
-                                // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
-                                // rather than having to keep track of every folder requested in the recursion.
-                                if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link)
-                                    itemsToReturn.Insert(0, linkedItem);
-                            }
-                        }
-
-                        // Now scan for folder links and insert the items they target and those links at the head of the return data
-                        foreach (InventoryItemBase item in originalItems)
-                        {
-                            if (item.AssetType == (int)AssetType.LinkFolder)
-                            {
-                                InventoryCollection linkedFolderContents = m_InventoryService.GetFolderContent(ownerID, item.AssetID);
-                                List<InventoryItemBase> links = linkedFolderContents.Items;
-
-                                itemsToReturn.InsertRange(0, links);
-
-                                foreach (InventoryItemBase link in linkedFolderContents.Items)
-                                {
-                                    // Take care of genuinely broken links where the target doesn't exist
-                                    // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
-                                    // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
-                                    // rather than having to keep track of every folder requested in the recursion.
-                                    if (link != null)
-                                    {
-//                                        m_log.DebugFormat(
-//                                            "[WEB FETCH INV DESC HANDLER]: Adding item {0} {1} from folder {2} linked from {3}",
-//                                            link.Name, (AssetType)link.AssetType, item.AssetID, containingFolder.Name);
-
-                                        InventoryItemBase linkedItem
-                                            = m_InventoryService.GetItem(new InventoryItemBase(link.AssetID));
-
-                                        if (linkedItem != null)
-                                            itemsToReturn.Insert(0, linkedItem);
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-//                    foreach (InventoryItemBase item in contents.Items)
+//                    if (fetchItems)
 //                    {
-//                        m_log.DebugFormat(
-//                            "[WEB FETCH INV DESC HANDLER]: Returning item {0}, type {1}, parent {2} in {3} {4}",
-//                            item.Name, (AssetType)item.AssetType, item.Folder, containingFolder.Name, containingFolder.ID);
-//                    }
-
-                    // =====
-
+//                        List<InventoryItemBase> linkedItemsToAdd = new List<InventoryItemBase>();
+//
+//                        foreach (InventoryItemBase item in contents.Items)
+//                        {
+//                            if (item.AssetType == (int)AssetType.Link)
+//                            {
+//                                InventoryItemBase linkedItem = m_InventoryService.GetItem(new InventoryItemBase(item.AssetID));
+//
+//                                // Take care of genuinely broken links where the target doesn't exist
+//                                // HACK: Also, don't follow up links that just point to other links.  In theory this is legitimate,
+//                                // but no viewer has been observed to set these up and this is the lazy way of avoiding cycles
+//                                // rather than having to keep track of every folder requested in the recursion.
+//                                if (linkedItem != null && linkedItem.AssetType != (int)AssetType.Link)
+//                                    linkedItemsToAdd.Insert(0, linkedItem);
+//                            }
+//                        }
 //
 //                        foreach (InventoryItemBase linkedItem in linkedItemsToAdd)
 //                        {
@@ -394,8 +340,12 @@ namespace OpenSim.Capabilities.Handlers
             llsdFolder.folder_id = invFolder.ID;
             llsdFolder.parent_id = invFolder.ParentID;
             llsdFolder.name = invFolder.Name;
-            llsdFolder.type = invFolder.Type;
-            llsdFolder.preferred_type = -1;
+
+            if (invFolder.Type == (short)AssetType.Unknown || !Enum.IsDefined(typeof(AssetType), (sbyte)invFolder.Type))
+                llsdFolder.type = "-1";
+            else
+                llsdFolder.type = Utils.AssetTypeToString((AssetType)invFolder.Type);
+            llsdFolder.preferred_type = "-1";
 
             return llsdFolder;
         }
@@ -415,8 +365,18 @@ namespace OpenSim.Capabilities.Handlers
             llsdItem.item_id = invItem.ID;
             llsdItem.name = invItem.Name;
             llsdItem.parent_id = invItem.Folder;
-            llsdItem.type = invItem.AssetType;
-            llsdItem.inv_type = invItem.InvType;
+
+            try
+            {
+                llsdItem.type = Utils.AssetTypeToString((AssetType)invItem.AssetType);
+                llsdItem.inv_type = Utils.InventoryTypeToString((InventoryType)invItem.InvType);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[WEB FETCH INV DESC HANDLER]: Problem setting asset {0} inventory {1} types while converting inventory item {2}: {3}",
+                    invItem.AssetType, invItem.InvType, invItem.Name, e.Message);
+            }
 
             llsdItem.permissions = new LLSDPermissions();
             llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid;
@@ -430,7 +390,21 @@ namespace OpenSim.Capabilities.Handlers
             llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions;
             llsdItem.sale_info = new LLSDSaleInfo();
             llsdItem.sale_info.sale_price = invItem.SalePrice;
-            llsdItem.sale_info.sale_type = invItem.SaleType;
+            switch (invItem.SaleType)
+            {
+                default:
+                    llsdItem.sale_info.sale_type = "not";
+                    break;
+                case 1:
+                    llsdItem.sale_info.sale_type = "original";
+                    break;
+                case 2:
+                    llsdItem.sale_info.sale_type = "copy";
+                    break;
+                case 3:
+                    llsdItem.sale_info.sale_type = "contents";
+                    break;
+            }
 
             return llsdItem;
         }

OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescServerConnector.cs

@@ -68,13 +68,7 @@ namespace OpenSim.Capabilities.Handlers
                     ServerUtils.LoadPlugin<ILibraryService>(libService, args);
 
             WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
-            IRequestHandler reqHandler
-                = new RestStreamHandler(
-                    "POST",
-                    "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
-                    webFetchHandler.FetchInventoryDescendentsRequest,
-                    "WebFetchInvDesc",
-                    null);
+            IRequestHandler reqHandler = new RestStreamHandler("POST", "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/, webFetchHandler.FetchInventoryDescendentsRequest);
             server.AddStreamHandler(reqHandler);
         }
 

OpenSim/Capabilities/LLSDInventoryFolder.cs

@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Capabilities
         public UUID folder_id;
         public UUID parent_id;
         public string name;
-        public int type;
-        public int preferred_type;
+        public string type;
+        public string preferred_type;
     }
 }

OpenSim/Capabilities/LLSDInventoryItem.cs

@@ -37,8 +37,8 @@ namespace OpenSim.Framework.Capabilities
         public UUID asset_id;
         public UUID item_id;
         public LLSDPermissions permissions;
-        public int type;
-        public int inv_type;
+        public string type;
+        public string inv_type;
         public int flags;
 
         public LLSDSaleInfo sale_info;
@@ -65,7 +65,7 @@ namespace OpenSim.Framework.Capabilities
     public class LLSDSaleInfo
     {
         public int sale_price;
-        public int sale_type;
+        public string sale_type;
     }
 
     [OSDMap]

OpenSim/Capabilities/LLSDStreamHandler.cs

@@ -39,11 +39,7 @@ namespace OpenSim.Framework.Capabilities
         private LLSDMethod<TRequest, TResponse> m_method;
 
         public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)
-            : this(httpMethod, path, method, null, null) {}
-
-        public LLSDStreamhandler(
-            string httpMethod, string path, LLSDMethod<TRequest, TResponse> method, string name, string description)
-            : base(httpMethod, path, name, description)
+            : base(httpMethod, path)
         {
             m_method = method;
         }
@@ -66,7 +62,9 @@ namespace OpenSim.Framework.Capabilities
 
             TResponse response = m_method(llsdRequest);
 
-            return Util.UTF8NoBomEncoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
+            Encoding encoding = new UTF8Encoding(false);
+
+            return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
         }
     }
 }

OpenSim/ConsoleClient/Requester.cs

@@ -50,7 +50,7 @@ namespace OpenSim.ConsoleClient
 
             request.ContentType = "application/x-www-form-urlencoded";
 
-            byte[] buffer = Encoding.ASCII.GetBytes(data);
+            byte[] buffer = new System.Text.ASCIIEncoding().GetBytes(data);
             int length = (int) buffer.Length;
             request.ContentLength = length;
 

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

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

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,18 +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();
+
+            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;
 
             return true;
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLRegionData.cs

@@ -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/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/NullFriendsData.cs

@@ -29,7 +29,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -55,8 +54,7 @@ namespace OpenSim.Data.Null
         /// </remarks>
         public static void Clear()
         {
-            lock (m_Data)
-                m_Data.Clear();
+            m_Data.Clear();
         }
 
         public FriendsData[] GetFriends(UUID principalID)
@@ -73,30 +71,27 @@ namespace OpenSim.Data.Null
         /// <returns></returns>
         public FriendsData[] GetFriends(string userID)
         {
-            lock (m_Data)
+            List<FriendsData> lst = m_Data.FindAll(fdata =>
             {
-                List<FriendsData> lst = m_Data.FindAll(fdata =>
+                return fdata.PrincipalID == userID.ToString();
+            });
+
+            if (lst != null)
+            {
+                lst.ForEach(f =>
                 {
-                    return fdata.PrincipalID == userID.ToString();
+                    FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID);
+                    if (f2 != null)
+                        f.Data["TheirFlags"] = f2.Data["Flags"];
+
+//                    m_log.DebugFormat(
+//                        "[NULL FRIENDS DATA]: Got {0} {1} {2} for {3}",
+//                        f.Friend, f.Data["Flags"], f2 != null ? f.Data["TheirFlags"] : "not found!", f.PrincipalID);
                 });
-    
-                if (lst != null)
-                {
-                    lst.ForEach(f =>
-                    {
-                        FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID);
-                        if (f2 != null)
-                            f.Data["TheirFlags"] = f2.Data["Flags"];
-    
-    //                    m_log.DebugFormat(
-    //                        "[NULL FRIENDS DATA]: Got {0} {1} {2} for {3}",
-    //                        f.Friend, f.Data["Flags"], f2 != null ? f.Data["TheirFlags"] : "not found!", f.PrincipalID);
-                    });
-    
-    //                m_log.DebugFormat("[NULL FRIENDS DATA]: Got {0} friends for {1}", lst.Count, userID);
-    
-                    return lst.ToArray();
-                }
+
+//                m_log.DebugFormat("[NULL FRIENDS DATA]: Got {0} friends for {1}", lst.Count, userID);
+
+                return lst.ToArray();
             }
 
             return new FriendsData[0];
@@ -110,8 +105,7 @@ namespace OpenSim.Data.Null
 //            m_log.DebugFormat(
 //                "[NULL FRIENDS DATA]: Storing {0} {1} {2}", data.PrincipalID, data.Friend, data.Data["Flags"]);
 
-            lock (m_Data)
-                m_Data.Add(data);
+            m_Data.Add(data);
 
             return true;
         }
@@ -123,21 +117,18 @@ namespace OpenSim.Data.Null
 
         public bool Delete(string userID, string friendID)
         {
-            lock (m_Data)
+            List<FriendsData> lst = m_Data.FindAll(delegate(FriendsData fdata) { return fdata.PrincipalID == userID.ToString(); });
+            if (lst != null)
             {
-                List<FriendsData> lst = m_Data.FindAll(delegate(FriendsData fdata) { return fdata.PrincipalID == userID.ToString(); });
-                if (lst != null)
+                FriendsData friend = lst.Find(delegate(FriendsData fdata) { return fdata.Friend == friendID; });
+                if (friendID != null)
                 {
-                    FriendsData friend = lst.Find(delegate(FriendsData fdata) { return fdata.Friend == friendID; });
-                    if (friendID != null)
-                    {
-    //                    m_log.DebugFormat(
-    //                        "[NULL FRIENDS DATA]: Deleting friend {0} {1} for {2}",
-    //                        friend.Friend, friend.Data["Flags"], friend.PrincipalID);
-    
-                        m_Data.Remove(friend);
-                        return true;
-                    }
+//                    m_log.DebugFormat(
+//                        "[NULL FRIENDS DATA]: Deleting friend {0} {1} for {2}",
+//                        friend.Friend, friend.Data["Flags"], friend.PrincipalID);
+
+                    m_Data.Remove(friend);
+                    return true;
                 }
             }
 

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/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/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)
@@ -1510,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");
@@ -2248,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;
@@ -2782,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"]);
@@ -2890,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/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));
         }
 
@@ -1069,6 +1070,8 @@ namespace OpenSim.Data.Tests
             regionInfo.RegionLocX = 0;
             regionInfo.RegionLocY = 0;
 
+            Scene scene = new Scene(regionInfo);
+
             SceneObjectPart sop = new SceneObjectPart();
             sop.Name = name;
             sop.Description = name;
@@ -1079,7 +1082,7 @@ namespace OpenSim.Data.Tests
             sop.Shape = PrimitiveBaseShape.Default;
 
             SceneObjectGroup sog = new SceneObjectGroup(sop);
-//            sog.SetScene(scene);
+            sog.SetScene(scene);
 
             return sog;
         }

OpenSim/Framework/AgentCircuitData.cs

@@ -98,11 +98,6 @@ namespace OpenSim.Framework
         /// </summary>
         public string lastname;
 
-        /// <summary>
-        /// Agent's full name.
-        /// </summary>
-        public string Name { get { return string.Format("{0} {1}", firstname, lastname); } }
-
         /// <summary>
         /// Random Unique GUID for this session.  Client gets this at login and it's
         /// only supposed to be disclosed over secure channels

OpenSim/Framework/Cache.cs

@@ -199,14 +199,7 @@ namespace OpenSim.Framework
     //
     public class Cache
     {
-        /// <summary>
-        /// Must only be accessed under lock.
-        /// </summary>
         private List<CacheItemBase> m_Index = new List<CacheItemBase>();
-
-        /// <summary>
-        /// Must only be accessed under m_Index lock.
-        /// </summary>
         private Dictionary<string, CacheItemBase> m_Lookup =
             new Dictionary<string, CacheItemBase>();
 
@@ -327,19 +320,19 @@ namespace OpenSim.Framework
             {
                 if (m_Lookup.ContainsKey(index))
                     item = m_Lookup[index];
-
-                if (item == null)
-                {
-                    Expire(true);
-                    return null;
-                }
-    
-                item.hits++;
-                item.lastUsed = DateTime.Now;
-    
-                Expire(true);
             }
 
+            if (item == null)
+            {
+                Expire(true);
+                return null;
+            }
+
+            item.hits++;
+            item.lastUsed = DateTime.Now;
+
+            Expire(true);
+
             return item;
         }
 
@@ -392,10 +385,7 @@ namespace OpenSim.Framework
         //
         public Object Find(Predicate<CacheItemBase> d)
         {
-            CacheItemBase item;
-
-            lock (m_Index)
-                item = m_Index.Find(d);
+            CacheItemBase item = m_Index.Find(d);
 
             if (item == null)
                 return null;
@@ -429,12 +419,12 @@ namespace OpenSim.Framework
         public virtual void Store(string index, Object data, Type container,
                 Object[] parameters)
         {
+            Expire(false);
+
             CacheItemBase item;
 
             lock (m_Index)
             {
-                Expire(false);
-
                 if (m_Index.Contains(new CacheItemBase(index)))
                 {
                     if ((m_Flags & CacheFlags.AllowUpdate) != 0)
@@ -460,17 +450,9 @@ namespace OpenSim.Framework
                 m_Index.Add(item);
                 m_Lookup[index] = item;
             }
-
             item.Store(data);
         }
 
-        /// <summary>
-        /// Expire items as appropriate.
-        /// </summary>
-        /// <remarks>
-        /// Callers must lock m_Index.
-        /// </remarks>
-        /// <param name='getting'></param>
         protected virtual void Expire(bool getting)
         {
             if (getting && (m_Strategy == CacheStrategy.Aggressive))
@@ -493,10 +475,12 @@ namespace OpenSim.Framework
 
             switch (m_Strategy)
             {
-                case CacheStrategy.Aggressive:
-                    if (Count < Size)
-                        return;
+            case CacheStrategy.Aggressive:
+                if (Count < Size)
+                    return;
 
+                lock (m_Index)
+                {
                     m_Index.Sort(new SortLRU());
                     m_Index.Reverse();
 
@@ -506,7 +490,7 @@ namespace OpenSim.Framework
 
                     ExpireDelegate doExpire = OnExpire;
 
-                    if (doExpire != null)
+                if (doExpire != null)
                     {
                         List<CacheItemBase> candidates =
                                 m_Index.GetRange(target, Count - target);
@@ -529,34 +513,27 @@ namespace OpenSim.Framework
                         foreach (CacheItemBase item in m_Index)
                             m_Lookup[item.uuid] = item;
                     }
-
-                    break;
-
-                    default:
-                        break;
+                }
+                break;
+            default:
+                break;
             }
         }
 
         public void Invalidate(string uuid)
         {
-            lock (m_Index)
-            {
-                if (!m_Lookup.ContainsKey(uuid))
-                    return;
+            if (!m_Lookup.ContainsKey(uuid))
+                return;
 
-                CacheItemBase item = m_Lookup[uuid];
-                m_Lookup.Remove(uuid);
-                m_Index.Remove(item);
-            }
+            CacheItemBase item = m_Lookup[uuid];
+            m_Lookup.Remove(uuid);
+            m_Index.Remove(item);
         }
 
         public void Clear()
         {
-            lock (m_Index)
-            {
-                m_Index.Clear();
-                m_Lookup.Clear();
-            }
+            m_Index.Clear();
+            m_Lookup.Clear();
         }
     }
-}
+}

OpenSim/Framework/Client/IClientInventory.cs

@@ -1,40 +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 OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Framework.Client
-{
-    public interface IClientInventory
-    {
-        void SendRemoveInventoryFolders(UUID[] folders);
-        void SendRemoveInventoryItems(UUID[] folders);
-        void SendBulkUpdateInventory(InventoryFolderBase[] folders, InventoryItemBase[] items);
-    }
-}

OpenSim/Framework/Console/CommandConsole.cs

@@ -79,11 +79,7 @@ namespace OpenSim.Framework.Console
             public List<CommandDelegate> fn;
         }
 
-        public const string GeneralHelpText
-            = "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 <item>' where <item> is one of the following:";
+        public const string GeneralHelpText = "For more information, type 'help <item>' where <item> is one of the following categories:";
 
         /// <value>
         /// Commands organized by keyword in a tree
@@ -112,9 +108,7 @@ namespace OpenSim.Framework.Console
             // General help
             if (helpParts.Count == 0)
             {
-                help.Add(""); // Will become a newline.
                 help.Add(GeneralHelpText);
-                help.Add(ItemHelpText);
                 help.AddRange(CollectModulesHelp(tree));
             }
             else
@@ -138,7 +132,7 @@ namespace OpenSim.Framework.Console
             // Check modules first to see if we just need to display a list of those commands
             if (TryCollectModuleHelp(originalHelpRequest, help))
             {
-                help.Insert(0, ItemHelpText);
+                help.Insert(0, GeneralHelpText);
                 return help;
             }
             
@@ -678,8 +672,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)
@@ -699,13 +691,6 @@ 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>

OpenSim/Framework/Console/ConsoleDisplayList.cs

@@ -1,112 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace OpenSim.Framework.Console
-{
-    /// <summary>
-    /// Used to generated a formatted table for the console.
-    /// </summary>
-    /// <remarks>
-    /// Currently subject to change.  If you use this, be prepared to change your code when this class changes.
-    /// </remarks>
-    public class ConsoleDisplayList
-    {
-        /// <summary>
-        /// The default divider between key and value for a list item.
-        /// </summary>
-        public const string DefaultKeyValueDivider = " : ";
-
-        /// <summary>
-        /// The divider used between key and value for a list item.
-        /// </summary>
-        public string KeyValueDivider { get; set; }
-
-        /// <summary>
-        /// Table rows
-        /// </summary>
-        public List<KeyValuePair<string, string>> Rows { get; private set; }
-
-        /// <summary>
-        /// Number of spaces to indent the list.
-        /// </summary>
-        public int Indent { get; set; }
-
-        public ConsoleDisplayList()
-        {
-            Rows = new List<KeyValuePair<string, string>>();
-            KeyValueDivider = DefaultKeyValueDivider;
-        }
-
-        public override string ToString()
-        {
-            StringBuilder sb = new StringBuilder();
-            AddToStringBuilder(sb);
-            return sb.ToString();
-        }
-
-        public void AddToStringBuilder(StringBuilder sb)
-        {
-            string formatString = GetFormatString();
-//            System.Console.WriteLine("FORMAT STRING [{0}]", formatString);
-
-            // rows
-            foreach (KeyValuePair<string, string> row in Rows)
-                sb.AppendFormat(formatString, row.Key, row.Value);
-        }
-
-        /// <summary>
-        /// Gets the format string for the table.
-        /// </summary>
-        private string GetFormatString()
-        {
-            StringBuilder formatSb = new StringBuilder();
-
-            int longestKey = -1;
-
-            foreach (KeyValuePair<string, string> row in Rows)
-                if (row.Key.Length > longestKey)
-                    longestKey = row.Key.Length;
-
-            formatSb.Append(' ', Indent);
-
-            // Can only do left formatting for now
-            formatSb.AppendFormat("{{0,-{0}}}{1}{{1}}\n", longestKey, KeyValueDivider);
-
-            return formatSb.ToString();
-        }
-
-        public void AddRow(object key, object value)
-        {
-            Rows.Add(new KeyValuePair<string, string>(key.ToString(), value.ToString()));
-        }
-    }
-}

OpenSim/Framework/Console/ConsoleDisplayTable.cs

@@ -1,154 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace OpenSim.Framework.Console
-{
-    /// <summary>
-    /// Used to generated a formatted table for the console.
-    /// </summary>
-    /// <remarks>
-    /// Currently subject to change.  If you use this, be prepared to change your code when this class changes.
-    /// </remarks>
-    public class ConsoleDisplayTable
-    {
-        /// <summary>
-        /// Default number of spaces between table columns.
-        /// </summary>
-        public const int DefaultTableSpacing = 2;
-
-        /// <summary>
-        /// Table columns.
-        /// </summary>
-        public List<ConsoleDisplayTableColumn> Columns { get; private set; }
-
-        /// <summary>
-        /// Table rows
-        /// </summary>
-        public List<ConsoleDisplayTableRow> Rows { get; private set; }
-
-        /// <summary>
-        /// Number of spaces to indent the table.
-        /// </summary>
-        public int Indent { get; set; }
-
-        /// <summary>
-        /// Spacing between table columns
-        /// </summary>
-        public int TableSpacing { get; set; }
-
-        public ConsoleDisplayTable()
-        {
-            TableSpacing = DefaultTableSpacing;
-            Columns = new List<ConsoleDisplayTableColumn>();
-            Rows = new List<ConsoleDisplayTableRow>();
-        }
-
-        public override string ToString()
-        {
-            StringBuilder sb = new StringBuilder();
-            AddToStringBuilder(sb);
-            return sb.ToString();
-        }
-
-        public void AddColumn(string name, int width)
-        {
-            Columns.Add(new ConsoleDisplayTableColumn(name, width));
-        }
-
-        public void AddRow(params string[] cells)
-        {
-            Rows.Add(new ConsoleDisplayTableRow(cells));
-        }
-
-        public void AddToStringBuilder(StringBuilder sb)
-        {
-            string formatString = GetFormatString();
-//            System.Console.WriteLine("FORMAT STRING [{0}]", formatString);
-
-            // columns
-            sb.AppendFormat(formatString, Columns.ConvertAll(c => c.Header).ToArray());
-
-            // rows
-            foreach (ConsoleDisplayTableRow row in Rows)
-                sb.AppendFormat(formatString, row.Cells.ToArray());
-        }
-
-        /// <summary>
-        /// Gets the format string for the table.
-        /// </summary>
-        private string GetFormatString()
-        {
-            StringBuilder formatSb = new StringBuilder();
-
-            formatSb.Append(' ', Indent);
-
-            for (int i = 0; i < Columns.Count; i++)
-            {
-                formatSb.Append(' ', TableSpacing);
-
-                // Can only do left formatting for now
-                formatSb.AppendFormat("{{{0},-{1}}}", i, Columns[i].Width);
-            }
-
-            formatSb.Append('\n');
-
-            return formatSb.ToString();
-        }
-    }
-
-    public struct ConsoleDisplayTableColumn
-    {
-        public string Header { get; set; }
-        public int Width { get; set; }
-
-        public ConsoleDisplayTableColumn(string header, int width) : this()
-        {
-            Header = header;
-            Width = width;
-        }
-    }
-
-    public struct ConsoleDisplayTableRow
-    {
-        public List<string> Cells { get; private set; }
-
-        public ConsoleDisplayTableRow(List<string> cells) : this()
-        {
-            Cells = cells;
-        }
-
-        public ConsoleDisplayTableRow(params string[] cells) : this()
-        {
-            Cells = new List<string>(cells);
-        }
-    }
-}

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

@@ -29,7 +29,6 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 using System.Text;
-using System.Xml;
 
 namespace OpenSim.Framework.Console
 {
@@ -38,44 +37,28 @@ namespace OpenSim.Framework.Console
     /// Don't use this except for Unit Testing or you're in for a world of hurt when the 
     /// sim gets to ReadLine
     /// </summary>
-    public class MockConsole : ICommandConsole
+    public class MockConsole : CommandConsole
     {
-        public event OnOutputDelegate OnOutput;
+        public MockConsole(string defaultPrompt) : base(defaultPrompt)
+        {
+        }
+        public override void Output(string text)
+        {
+        }
+        public override void Output(string text, string level)
+        {
+        }
 
-        private MockCommands m_commands = new MockCommands();
-
-        public ICommands Commands { get { return m_commands; } }
-
-        public void Prompt() {}
-
-        public void RunCommand(string cmd) {}
-
-        public string ReadLine(string p, bool isCommand, bool e) { return ""; }
-
-        public object ConsoleScene { get { return null; } }
-
-        public void Output(string text, string level) {}
-        public void Output(string text) {}
-        public void OutputFormat(string format, params object[] components) {}
-
-        public string CmdPrompt(string p) { return ""; }
-        public string CmdPrompt(string p, string def) { return ""; }
-        public string CmdPrompt(string p, List<char> excludedCharacters) { return ""; }
-        public string CmdPrompt(string p, string def, List<char> excludedCharacters) { return ""; }
-
-        public string CmdPrompt(string prompt, string defaultresponse, List<string> options) { return ""; }
-
-        public string PasswdPrompt(string p) { return ""; }
-    }
-
-    public class MockCommands : ICommands
-    {
-        public void FromXml(XmlElement root, CommandDelegate fn) {}
-        public List<string> GetHelp(string[] cmd) { return null; }
-        public void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn) {}
-        public void AddCommand(string module, bool shared, string command, string help, string longhelp, string descriptivehelp, CommandDelegate fn) {}
-        public string[] FindNextOption(string[] cmd, bool term) { return null; }
-        public string[] Resolve(string[] cmd) { return null; }
-        public XmlElement GetXml(XmlDocument doc) { return null; }
+        public override string ReadLine(string p, bool isCommand, bool e)
+        {
+            //Thread.CurrentThread.Join(1000);
+            return string.Empty;
+        }
+        public override void UnlockOutput()
+        {
+        }
+        public override void LockOutput()
+        {
+        }
     }
 }

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/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/IClientAPI.cs

@@ -740,21 +740,14 @@ namespace OpenSim.Framework
         /// </summary>
         string Name { get; }
 
-        /// <summary>
-        /// True if the client is active (sending and receiving new UDP messages).  False if the client is being closed.
-        /// </summary>
+        /// <value>
+        /// Determines whether the client thread is doing anything or not.
+        /// </value>
         bool IsActive { get; set; }
 
-        /// <summary>
-        /// Set if the client is closing due to a logout request
-        /// </summary>
-        /// <remarks>
-        /// Do not use this flag if you want to know if the client is closing, since it will not be set in other
-        /// circumstances (e.g. if a child agent is closed or the agent is kicked off the simulator).  Use IsActive
-        /// instead with a IClientAPI.SceneAgent.IsChildAgent check if necessary.
-        ///
-        /// Only set for root agents.
-        /// </remarks>
+        /// <value>
+        /// Determines whether the client is or has been removed from a given scene
+        /// </value>
         bool IsLoggingOut { get; set; }
         
         bool SendLogoutPacketWhenClosing { set; }
@@ -1033,21 +1026,7 @@ namespace OpenSim.Framework
 
         void InPacket(object NewPack);
         void ProcessInPacket(Packet NewPack);
-
-        /// <summary>
-        /// Close this client
-        /// </summary>
         void Close();
-
-        /// <summary>
-        /// Close this client
-        /// </summary>
-        /// <param name='force'>
-        /// If true, attempts the close without checking active status.  You do not want to try this except as a last
-        /// ditch attempt where Active == false but the ScenePresence still exists.
-        /// </param>
-        void Close(bool force);
-
         void Kick(string message);
         
         /// <summary>
@@ -1236,9 +1215,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);
@@ -1367,6 +1347,7 @@ namespace OpenSim.Framework
         void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message);
 
         void SendLogoutPacket();
+        EndPoint GetClientEP();
 
         // WARNING WARNING WARNING
         //
@@ -1427,6 +1408,8 @@ namespace OpenSim.Framework
 
         void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes);
 
+        void KillEndDone();
+
         bool AddGenericPacketHandler(string MethodName, GenericMessage handler);
 
         void SendRebakeAvatarTextures(UUID textureID);

OpenSim/Framework/ICommandConsole.cs

@@ -74,12 +74,8 @@ namespace OpenSim.Framework
         XmlElement GetXml(XmlDocument doc);
     }
 
-    public delegate void OnOutputDelegate(string message);
-
     public interface ICommandConsole : IConsole
     {
-        event OnOutputDelegate OnOutput;
-
         ICommands Commands { get; }
 
         /// <summary>
@@ -91,4 +87,4 @@ namespace OpenSim.Framework
 
         string ReadLine(string p, bool isCommand, bool e);
     }
-}
+}

OpenSim/Framework/IScene.cs

@@ -56,29 +56,11 @@ namespace OpenSim.Framework
 
     public interface IScene
     {
-        /// <summary>
-        /// The name of this scene.
-        /// </summary>
-        string Name { get; }
-
         RegionInfo RegionInfo { get; }
         RegionStatus RegionStatus { get; set; }
 
         IConfigSource Config { get; }
 
-        /// <summary>
-        /// Are logins enabled on this simulator?
-        /// </summary>
-        bool LoginsEnabled { get; set; }
-
-        /// <summary>
-        /// Is this region ready for use?
-        /// </summary>
-        /// <remarks>
-        /// This does not mean that logins are enabled, merely that they can be.
-        /// </remarks>
-        bool Ready { get; set; }
-
         float TimeDilation { get; }
 
         bool AllowScriptCrossings { get; }

OpenSim/Framework/ISceneAgent.cs

@@ -26,7 +26,6 @@
  */
 
 using System;
-using OpenMetaverse;
 
 namespace OpenSim.Framework
 {
@@ -72,11 +71,5 @@ namespace OpenSim.Framework
         /// This includes scene object data and the appearance data of other avatars.
         /// </remarks>
         void SendInitialDataToMe();
-
-        /// <summary>
-        /// Direction in which the scene presence is looking.
-        /// </summary>
-        /// <remarks>Will be Vector3.Zero for a child agent.</remarks>
-        Vector3 Lookat { get; }        
     }
 }

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/LocklessQueue.cs

@@ -99,13 +99,8 @@ namespace OpenSim.Framework
                     }
                     else
                     {
-                        item = oldHeadNext.Item;                       
+                        item = oldHeadNext.Item;
                         haveAdvancedHead = CAS(ref head, oldHead, oldHeadNext);
-                        if (haveAdvancedHead)
-                        {
-                            oldHeadNext.Item = default(T);
-                            oldHead.Next = null;
-                        }
                     }
                 }
             }
@@ -116,10 +111,6 @@ namespace OpenSim.Framework
 
         public void Clear()
         {
-            // ugly
-            T item;
-            while(count > 0)
-                Dequeue(out item);
             Init();
         }
 

OpenSim/Framework/MinHeap.cs

@@ -62,16 +62,13 @@ namespace OpenSim.Framework
             }
 
             internal void Clear()
-            {
-                if (this.handle != null)
-                    this.handle.Clear();
-                ClearRef();
-            }
-
-            internal void ClearRef()
             {
                 this.value = default(T);
-                this.handle = null;
+                if (this.handle != null)
+                {
+                    this.handle.Clear();
+                    this.handle = null;
+                }
             }
         }
 
@@ -288,7 +285,6 @@ namespace OpenSim.Framework
             if (--this.size > 0 && index != this.size)
             {
                 Set(this.items[this.size], index);
-                this.items[this.size].ClearRef();
                 if (!BubbleUp(index))
                     BubbleDown(index);
             }

OpenSim/Framework/Monitoring/MemoryWatchdog.cs

@@ -1,129 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using log4net;
-
-namespace OpenSim.Framework.Monitoring
-{
-    /// <summary>
-    /// Experimental watchdog for memory usage.
-    /// </summary>
-    public static class MemoryWatchdog
-    {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// Is this watchdog active?
-        /// </summary>
-        public static bool Enabled
-        {
-            get { return m_enabled; }
-            set
-            {
-//                m_log.DebugFormat("[MEMORY WATCHDOG]: Setting MemoryWatchdog.Enabled to {0}", value);
-
-                if (value && !m_enabled)
-                    UpdateLastRecord(GC.GetTotalMemory(false), Util.EnvironmentTickCount());
-
-                m_enabled = value;
-            }
-        }
-        private static bool m_enabled;
-
-        /// <summary>
-        /// 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>
-        /// Maximum number of statistical samples.
-        /// </summary>
-        /// <remarks>
-        /// At the moment this corresponds to 1 minute since the sampling rate is every 2.5 seconds as triggered from
-        /// the main Watchdog.
-        /// </remarks>
-        private static int m_maxSamples = 24;
-
-        /// <summary>
-        /// Time when the watchdog was last updated.
-        /// </summary>
-        private static int m_lastUpdateTick;
-
-        /// <summary>
-        /// Memory used at time of last watchdog update.
-        /// </summary>
-        private static long m_lastUpdateMemory;
-
-        /// <summary>
-        /// Memory churn rate per millisecond.
-        /// </summary>
-//        private static double m_churnRatePerMillisecond;
-
-        /// <summary>
-        /// Historical samples for calculating moving average.
-        /// </summary>
-        private static Queue<double> m_samples = new Queue<double>(m_maxSamples);
-
-        public static void Update()
-        {
-            int now = Util.EnvironmentTickCount();
-            long memoryNow = GC.GetTotalMemory(false);
-            long memoryDiff = memoryNow - m_lastUpdateMemory;
-
-            if (memoryDiff >= 0)
-            {
-                if (m_samples.Count >= m_maxSamples)
-                    m_samples.Dequeue();
-
-                double elapsed = Util.EnvironmentTickCountSubtract(now, m_lastUpdateTick);
-
-                // This should never happen since it's not useful for updates to occur with no time elapsed, but
-                // protect ourselves from a divide-by-zero just in case.
-                if (elapsed == 0)
-                    return;
-
-                m_samples.Enqueue(memoryDiff / (double)elapsed);
-            }
-
-            UpdateLastRecord(memoryNow, now);
-        }
-
-        private static void UpdateLastRecord(long memoryNow, int timeNow)
-        {
-            m_lastUpdateMemory = memoryNow;
-            m_lastUpdateTick = timeNow;
-        }
-    }
-}

OpenSim/Framework/MultipartForm.cs

@@ -119,7 +119,7 @@ namespace OpenSim.Framework
                 // Copy the temporary stream to the network stream
                 formDataStream.Seek(0, SeekOrigin.Begin);
                 using (Stream requestStream = request.GetRequestStream())
-                    formDataStream.CopyStream(requestStream, (int)formDataStream.Length);
+                    formDataStream.CopyTo(requestStream, (int)formDataStream.Length);
             }
 
             #endregion Stream Writing

OpenSim/Framework/OSChatMessage.cs

@@ -51,12 +51,10 @@ namespace OpenSim.Framework
         protected object m_senderObject;
         protected ChatTypeEnum m_type;
         protected UUID m_fromID;
-        protected UUID m_toID;
 
         public OSChatMessage()
         {
             m_position = new Vector3();
-            m_toID = UUID.Zero;
         }
 
         /// <summary>
@@ -104,15 +102,6 @@ namespace OpenSim.Framework
             set { m_from = value; }
         }
 
-        /// <summary>
-        /// The name of the sender (needed for scripts)
-        /// </summary>
-        public string To
-        {
-            get { return m_from; }
-            set { m_from = value; }
-        }
-
         #region IEventArgs Members
 
         /// TODO: Sender and SenderObject should just be Sender and of
@@ -142,15 +131,6 @@ namespace OpenSim.Framework
             set { m_fromID = value; }
         }
 
-        /// <summary>
-        /// The single recipient or all if not set.
-        /// </summary>
-        public UUID TargetUUID
-        {
-            get { return m_toID; }
-            set { m_toID = value; }
-        }
-
         /// <summary>
         ///
         /// </summary>

OpenSim/Framework/PrimitiveBaseShape.cs

@@ -241,14 +241,10 @@ namespace OpenSim.Framework
 
             m_textureEntry = prim.Textures.GetBytes();
 
-            if (prim.Sculpt != null)
-            {
-                SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
-                SculptData = prim.Sculpt.GetBytes();
-                SculptTexture = prim.Sculpt.SculptTexture;
-                SculptType = (byte)prim.Sculpt.Type;
-            }
-            else SculptType = (byte)OpenMetaverse.SculptType.None;
+            SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
+            SculptData = prim.Sculpt.GetBytes();
+            SculptTexture = prim.Sculpt.SculptTexture;
+            SculptType = (byte)prim.Sculpt.Type;
         }
 
         [XmlIgnore]

OpenSim/Framework/RegionInfo.cs

@@ -120,9 +120,7 @@ namespace OpenSim.Framework
         public UUID lastMapUUID = UUID.Zero;
         public string lastMapRefresh = "0";
 
-        private float m_nonphysPrimMin = 0;
         private int m_nonphysPrimMax = 0;
-        private float m_physPrimMin = 0;
         private int m_physPrimMax = 0;
         private bool m_clampPrimSize = false;
         private int m_objectCapacity = 0;
@@ -287,21 +285,11 @@ namespace OpenSim.Framework
             set { m_windlight = value; }
         }
 
-        public float NonphysPrimMin
-        {
-            get { return m_nonphysPrimMin; }
-        }
-
         public int NonphysPrimMax
         {
             get { return m_nonphysPrimMax; }
         }
 
-        public float PhysPrimMin
-        {
-            get { return m_physPrimMin; }
-        }
-
         public int PhysPrimMax
         {
             get { return m_physPrimMax; }
@@ -433,18 +421,12 @@ namespace OpenSim.Framework
             set { m_internalEndPoint = value; }
         }
 
-        /// <summary>
-        /// The x co-ordinate of this region in map tiles (e.g. 1000).
-        /// </summary>
         public uint RegionLocX
         {
             get { return m_regionLocX.Value; }
             set { m_regionLocX = value; }
         }
 
-        /// <summary>
-        /// The y co-ordinate of this region in map tiles (e.g. 1000).
-        /// </summary>
         public uint RegionLocY
         {
             get { return m_regionLocY.Value; }
@@ -492,16 +474,9 @@ namespace OpenSim.Framework
                 MainConsole.Instance.Output("=====================================\n");
 
                 if (name == String.Empty)
-                {
-                    while (name.Trim() == string.Empty)
-                    {
-                        name = MainConsole.Instance.CmdPrompt("New region name", name);
-                        if (name.Trim() == string.Empty)
-                        {
-                            MainConsole.Instance.Output("Cannot interactively create region with no name");
-                        }
-                    }
-                }
+                    name = MainConsole.Instance.CmdPrompt("New region name", name);
+                if (name == String.Empty)
+                    throw new Exception("Cannot interactively create region with no name");
 
                 source.AddConfig(name);
 
@@ -532,20 +507,15 @@ namespace OpenSim.Framework
             //
             allKeys.Remove("RegionUUID");
             string regionUUID = config.GetString("RegionUUID", string.Empty);
-            if (!UUID.TryParse(regionUUID.Trim(), out RegionID))
+            if (regionUUID == String.Empty)
             {
                 UUID newID = UUID.Random();
-                while (RegionID == UUID.Zero)
-                {
-                    regionUUID = MainConsole.Instance.CmdPrompt("RegionUUID", newID.ToString());
-                    if (!UUID.TryParse(regionUUID.Trim(), out RegionID))
-                    {
-                        MainConsole.Instance.Output("RegionUUID must be a valid UUID");
-                    }
-                }
+
+                regionUUID = MainConsole.Instance.CmdPrompt("RegionUUID", newID.ToString());
                 config.Set("RegionUUID", regionUUID);
             }
 
+            RegionID = new UUID(regionUUID);
             originRegionID = RegionID; // What IS this?! (Needed for RegionCombinerModule?)
 
             // Location
@@ -635,28 +605,16 @@ namespace OpenSim.Framework
             m_regionType = config.GetString("RegionType", String.Empty);
             allKeys.Remove("RegionType");
 
-            #region Prim stuff
-
-            m_nonphysPrimMin = config.GetFloat("NonphysicalPrimMin", 0);
-            allKeys.Remove("NonphysicalPrimMin");
-
+            // Prim stuff
+            //
             m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0);
             allKeys.Remove("NonphysicalPrimMax");
-
-            m_physPrimMin = config.GetFloat("PhysicalPrimMin", 0);
-            allKeys.Remove("PhysicalPrimMin");
-
             m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
             allKeys.Remove("PhysicalPrimMax");
-            
             m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
             allKeys.Remove("ClampPrimSize");
-            
             m_objectCapacity = config.GetInt("MaxPrims", 15000);
             allKeys.Remove("MaxPrims");
-            
-            #endregion
-
             m_agentCapacity = config.GetInt("MaxAgents", 100);
             allKeys.Remove("MaxAgents");
 
@@ -692,18 +650,10 @@ namespace OpenSim.Framework
 
             config.Set("ExternalHostName", m_externalHostName);
 
-            if (m_nonphysPrimMin != 0)
-                config.Set("NonphysicalPrimMax", m_nonphysPrimMin);
-
             if (m_nonphysPrimMax != 0)
                 config.Set("NonphysicalPrimMax", m_nonphysPrimMax);
-
-            if (m_physPrimMin != 0)
-                config.Set("PhysicalPrimMax", m_physPrimMin);
-            
             if (m_physPrimMax != 0)
                 config.Set("PhysicalPrimMax", m_physPrimMax);
-                        
             config.Set("ClampPrimSize", m_clampPrimSize.ToString());
 
             if (m_objectCapacity != 0)
@@ -786,15 +736,9 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
 
-            configMember.addConfigurationOption("nonphysical_prim_min", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
-                                                "Minimum size for nonphysical prims", m_nonphysPrimMin.ToString(), true);
-
             configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                 "Maximum size for nonphysical prims", m_nonphysPrimMax.ToString(), true);
 
-            configMember.addConfigurationOption("physical_prim_min", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
-                                                "Minimum size for nonphysical prims", m_physPrimMin.ToString(), true);
-
             configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                 "Maximum size for physical prims", m_physPrimMax.ToString(), true);
 

OpenSim/Framework/RegionSettings.cs

@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using OpenMetaverse;
-using System.Runtime.Serialization;
 
 namespace OpenSim.Framework
 {
@@ -72,32 +71,6 @@ namespace OpenSim.Framework
 
             return pos + offset;
         }
-
-        /// <summary>
-        /// Returns a string representation of this SpawnPoint.
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return string.Format("{0},{1},{2}", Yaw, Pitch, Distance);
-        }
-
-        /// <summary>
-        /// Generate a SpawnPoint from a string
-        /// </summary>
-        /// <param name="str"></param>
-        public static SpawnPoint Parse(string str)
-        {
-            string[] parts = str.Split(',');
-            if (parts.Length != 3)
-                throw new ArgumentException("Invalid string: " + str);
-            
-            SpawnPoint sp = new SpawnPoint();
-            sp.Yaw = float.Parse(parts[0]);
-            sp.Pitch = float.Parse(parts[1]);
-            sp.Distance = float.Parse(parts[2]);
-            return sp;
-        }
     }
 
     public class RegionSettings
@@ -483,7 +456,7 @@ namespace OpenSim.Framework
         }
 
         // Connected Telehub object
-        private UUID m_TelehubObject = UUID.Zero;
+        private UUID m_TelehubObject;
         public UUID TelehubObject
         {
             get

OpenSim/Framework/SLUtil.cs

@@ -27,9 +27,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
-using System.Xml;
 using log4net;
 using OpenMetaverse;
 
@@ -38,189 +36,239 @@ namespace OpenSim.Framework
     public static class SLUtil
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+        
         #region SL / file extension / content-type conversions
 
-        private class TypeMapping
-        {
-            private sbyte assetType;
-            private InventoryType inventoryType;
-            private string contentType;
-            private string contentType2;
-            private string extension;
-
-            public sbyte AssetTypeCode
-            {
-                get { return assetType; }
-            }
-
-            public object AssetType
-            {
-                get {
-                    if (Enum.IsDefined(typeof(OpenMetaverse.AssetType), assetType))
-                        return (OpenMetaverse.AssetType)assetType;
-                    else
-                        return OpenMetaverse.AssetType.Unknown;
-                }
-            }
-
-            public InventoryType InventoryType
-            {
-                get { return inventoryType; }
-            }
-
-            public string ContentType
-            {
-                get { return contentType; }
-            }
-
-            public string ContentType2
-            {
-                get { return contentType2; }
-            }
-
-            public string Extension
-            {
-                get { return extension; }
-            }
-
-            private TypeMapping(sbyte assetType, InventoryType inventoryType, string contentType, string contentType2, string extension)
-            {
-                this.assetType = assetType;
-                this.inventoryType = inventoryType;
-                this.contentType = contentType;
-                this.contentType2 = contentType2;
-                this.extension = extension;
-            }
-
-            public TypeMapping(AssetType assetType, InventoryType inventoryType, string contentType, string contentType2, string extension)
-                : this((sbyte)assetType, inventoryType, contentType, contentType2, extension)
-            {
-            }
-
-            public TypeMapping(AssetType assetType, InventoryType inventoryType, string contentType, string extension)
-                : this((sbyte)assetType, inventoryType, contentType, null, extension)
-            {
-            }
-        }
-
-        /// <summary>
-        /// Maps between AssetType, InventoryType and Content-Type.
-        /// Where more than one possibility exists, the first one takes precedence. E.g.:
-        ///   AssetType "AssetType.Texture" -> Content-Type "image-xj2c"
-        ///   Content-Type "image/x-j2c" -> InventoryType "InventoryType.Texture"
-        /// </summary>
-        private static TypeMapping[] MAPPINGS = new TypeMapping[] {
-            new TypeMapping(AssetType.Unknown, InventoryType.Unknown, "application/octet-stream", "bin"),
-            new TypeMapping(AssetType.Texture, InventoryType.Texture, "image/x-j2c", "image/jp2", "j2c"),
-            new TypeMapping(AssetType.Texture, InventoryType.Snapshot, "image/x-j2c", "image/jp2", "j2c"),
-            new TypeMapping(AssetType.TextureTGA, InventoryType.Texture, "image/tga", "tga"),
-            new TypeMapping(AssetType.ImageTGA, InventoryType.Texture, "image/tga", "tga"),
-            new TypeMapping(AssetType.ImageJPEG, InventoryType.Texture, "image/jpeg", "jpg"),
-            new TypeMapping(AssetType.Sound, InventoryType.Sound, "audio/ogg", "application/ogg", "ogg"),
-            new TypeMapping(AssetType.SoundWAV, InventoryType.Sound, "audio/x-wav", "wav"),
-            new TypeMapping(AssetType.CallingCard, InventoryType.CallingCard, "application/vnd.ll.callingcard", "application/x-metaverse-callingcard", "callingcard"),
-            new TypeMapping(AssetType.Landmark, InventoryType.Landmark, "application/vnd.ll.landmark", "application/x-metaverse-landmark", "landmark"),
-            new TypeMapping(AssetType.Clothing, InventoryType.Wearable, "application/vnd.ll.clothing", "application/x-metaverse-clothing", "clothing"),
-            new TypeMapping(AssetType.Object, InventoryType.Object, "application/vnd.ll.primitive", "application/x-metaverse-primitive", "primitive"),
-            new TypeMapping(AssetType.Object, InventoryType.Attachment, "application/vnd.ll.primitive", "application/x-metaverse-primitive", "primitive"),
-            new TypeMapping(AssetType.Notecard, InventoryType.Notecard, "application/vnd.ll.notecard", "application/x-metaverse-notecard", "notecard"),
-            new TypeMapping(AssetType.Folder, InventoryType.Folder, "application/vnd.ll.folder", "folder"),
-            new TypeMapping(AssetType.RootFolder, InventoryType.RootCategory, "application/vnd.ll.rootfolder", "rootfolder"),
-            new TypeMapping(AssetType.LSLText, InventoryType.LSL, "application/vnd.ll.lsltext", "application/x-metaverse-lsl", "lsl"),
-            new TypeMapping(AssetType.LSLBytecode, InventoryType.LSL, "application/vnd.ll.lslbyte", "application/x-metaverse-lso", "lso"),
-            new TypeMapping(AssetType.Bodypart, InventoryType.Wearable, "application/vnd.ll.bodypart", "application/x-metaverse-bodypart", "bodypart"),
-            new TypeMapping(AssetType.TrashFolder, InventoryType.Folder, "application/vnd.ll.trashfolder", "trashfolder"),
-            new TypeMapping(AssetType.SnapshotFolder, InventoryType.Folder, "application/vnd.ll.snapshotfolder", "snapshotfolder"),
-            new TypeMapping(AssetType.LostAndFoundFolder, InventoryType.Folder, "application/vnd.ll.lostandfoundfolder", "lostandfoundfolder"),
-            new TypeMapping(AssetType.Animation, InventoryType.Animation, "application/vnd.ll.animation", "application/x-metaverse-animation", "animation"),
-            new TypeMapping(AssetType.Gesture, InventoryType.Gesture, "application/vnd.ll.gesture", "application/x-metaverse-gesture", "gesture"),
-            new TypeMapping(AssetType.Simstate, InventoryType.Snapshot, "application/x-metaverse-simstate", "simstate"),
-            new TypeMapping(AssetType.FavoriteFolder, InventoryType.Unknown, "application/vnd.ll.favoritefolder", "favoritefolder"),
-            new TypeMapping(AssetType.Link, InventoryType.Unknown, "application/vnd.ll.link", "link"),
-            new TypeMapping(AssetType.LinkFolder, InventoryType.Unknown, "application/vnd.ll.linkfolder", "linkfolder"),
-            new TypeMapping(AssetType.CurrentOutfitFolder, InventoryType.Unknown, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"),
-            new TypeMapping(AssetType.OutfitFolder, InventoryType.Unknown, "application/vnd.ll.outfitfolder", "outfitfolder"),
-            new TypeMapping(AssetType.MyOutfitsFolder, InventoryType.Unknown, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"),
-            new TypeMapping(AssetType.Mesh, InventoryType.Mesh, "application/vnd.ll.mesh", "llm")
-        };
-
-        private static Dictionary<sbyte, string> asset2Content;
-        private static Dictionary<sbyte, string> asset2Extension;
-        private static Dictionary<InventoryType, string> inventory2Content;
-        private static Dictionary<string, sbyte> content2Asset;
-        private static Dictionary<string, InventoryType> content2Inventory;
-
-        static SLUtil()
-        {
-            asset2Content = new Dictionary<sbyte, string>();
-            asset2Extension = new Dictionary<sbyte, string>();
-            inventory2Content = new Dictionary<InventoryType, string>();
-            content2Asset = new Dictionary<string, sbyte>();
-            content2Inventory = new Dictionary<string, InventoryType>();
-            
-            foreach (TypeMapping mapping in MAPPINGS)
-            {
-                sbyte assetType = mapping.AssetTypeCode;
-                if (!asset2Content.ContainsKey(assetType))
-                    asset2Content.Add(assetType, mapping.ContentType);
-                if (!asset2Extension.ContainsKey(assetType))
-                    asset2Extension.Add(assetType, mapping.Extension);
-                if (!inventory2Content.ContainsKey(mapping.InventoryType))
-                    inventory2Content.Add(mapping.InventoryType, mapping.ContentType);
-                if (!content2Asset.ContainsKey(mapping.ContentType))
-                    content2Asset.Add(mapping.ContentType, assetType);
-                if (!content2Inventory.ContainsKey(mapping.ContentType))
-                    content2Inventory.Add(mapping.ContentType, mapping.InventoryType);
-
-                if (mapping.ContentType2 != null)
-                {
-                    if (!content2Asset.ContainsKey(mapping.ContentType2))
-                        content2Asset.Add(mapping.ContentType2, assetType);
-                    if (!content2Inventory.ContainsKey(mapping.ContentType2))
-                        content2Inventory.Add(mapping.ContentType2, mapping.InventoryType);
-                }
-            }
-        }
-        
         public static string SLAssetTypeToContentType(int assetType)
         {
-            string contentType;
-            if (!asset2Content.TryGetValue((sbyte)assetType, out contentType))
-                contentType = asset2Content[(sbyte)AssetType.Unknown];
-            return contentType;
+            switch ((AssetType)assetType)
+            {
+                case AssetType.Texture:
+                    return "image/x-j2c";
+                case AssetType.Sound:
+                    return "audio/ogg";
+                case AssetType.CallingCard:
+                    return "application/vnd.ll.callingcard";
+                case AssetType.Landmark:
+                    return "application/vnd.ll.landmark";
+                case AssetType.Clothing:
+                    return "application/vnd.ll.clothing";
+                case AssetType.Object:
+                    return "application/vnd.ll.primitive";
+                case AssetType.Notecard:
+                    return "application/vnd.ll.notecard";
+                case AssetType.Folder:
+                    return "application/vnd.ll.folder";
+                case AssetType.RootFolder:
+                    return "application/vnd.ll.rootfolder";
+                case AssetType.LSLText:
+                    return "application/vnd.ll.lsltext";
+                case AssetType.LSLBytecode:
+                    return "application/vnd.ll.lslbyte";
+                case AssetType.TextureTGA:
+                case AssetType.ImageTGA:
+                    return "image/tga";
+                case AssetType.Bodypart:
+                    return "application/vnd.ll.bodypart";
+                case AssetType.TrashFolder:
+                    return "application/vnd.ll.trashfolder";
+                case AssetType.SnapshotFolder:
+                    return "application/vnd.ll.snapshotfolder";
+                case AssetType.LostAndFoundFolder:
+                    return "application/vnd.ll.lostandfoundfolder";
+                case AssetType.SoundWAV:
+                    return "audio/x-wav";
+                case AssetType.ImageJPEG:
+                    return "image/jpeg";
+                case AssetType.Animation:
+                    return "application/vnd.ll.animation";
+                case AssetType.Gesture:
+                    return "application/vnd.ll.gesture";
+                case AssetType.Simstate:
+                    return "application/x-metaverse-simstate";
+                case AssetType.FavoriteFolder:
+                    return "application/vnd.ll.favoritefolder";
+                case AssetType.Link:
+                    return "application/vnd.ll.link";
+                case AssetType.LinkFolder:
+                    return "application/vnd.ll.linkfolder";
+                case AssetType.CurrentOutfitFolder:
+                    return "application/vnd.ll.currentoutfitfolder";
+                case AssetType.OutfitFolder:
+                    return "application/vnd.ll.outfitfolder";
+                case AssetType.MyOutfitsFolder:
+                    return "application/vnd.ll.myoutfitsfolder";
+                case AssetType.Unknown:
+                default:
+                    return "application/octet-stream";
+            }
         }
 
         public static string SLInvTypeToContentType(int invType)
         {
-            string contentType;
-            if (!inventory2Content.TryGetValue((InventoryType)invType, out contentType))
-                contentType = inventory2Content[InventoryType.Unknown];
-            return contentType;
+            switch ((InventoryType)invType)
+            {
+                case InventoryType.Animation:
+                    return "application/vnd.ll.animation";
+                case InventoryType.CallingCard:
+                    return "application/vnd.ll.callingcard";
+                case InventoryType.Folder:
+                    return "application/vnd.ll.folder";
+                case InventoryType.Gesture:
+                    return "application/vnd.ll.gesture";
+                case InventoryType.Landmark:
+                    return "application/vnd.ll.landmark";
+                case InventoryType.LSL:
+                    return "application/vnd.ll.lsltext";
+                case InventoryType.Notecard:
+                    return "application/vnd.ll.notecard";
+                case InventoryType.Attachment:
+                case InventoryType.Object:
+                    return "application/vnd.ll.primitive";
+                case InventoryType.Sound:
+                    return "audio/ogg";
+                case InventoryType.Snapshot:
+                case InventoryType.Texture:
+                    return "image/x-j2c";
+                case InventoryType.Wearable:
+                    return "application/vnd.ll.clothing";
+                default:
+                    return "application/octet-stream";
+            }
         }
 
         public static sbyte ContentTypeToSLAssetType(string contentType)
         {
-            sbyte assetType;
-            if (!content2Asset.TryGetValue(contentType, out assetType))
-                assetType = (sbyte)AssetType.Unknown;
-            return (sbyte)assetType;
+            switch (contentType)
+            {
+                case "image/x-j2c":
+                case "image/jp2":
+                    return (sbyte)AssetType.Texture;
+                case "application/ogg":
+                case "audio/ogg":
+                    return (sbyte)AssetType.Sound;
+                case "application/vnd.ll.callingcard":
+                case "application/x-metaverse-callingcard":
+                    return (sbyte)AssetType.CallingCard;
+                case "application/vnd.ll.landmark":
+                case "application/x-metaverse-landmark":
+                    return (sbyte)AssetType.Landmark;
+                case "application/vnd.ll.clothing":
+                case "application/x-metaverse-clothing":
+                    return (sbyte)AssetType.Clothing;
+                case "application/vnd.ll.primitive":
+                case "application/x-metaverse-primitive":
+                    return (sbyte)AssetType.Object;
+                case "application/vnd.ll.notecard":
+                case "application/x-metaverse-notecard":
+                    return (sbyte)AssetType.Notecard;
+                case "application/vnd.ll.folder":
+                    return (sbyte)AssetType.Folder;
+                case "application/vnd.ll.rootfolder":
+                    return (sbyte)AssetType.RootFolder;
+                case "application/vnd.ll.lsltext":
+                case "application/x-metaverse-lsl":
+                    return (sbyte)AssetType.LSLText;
+                case "application/vnd.ll.lslbyte":
+                case "application/x-metaverse-lso":
+                    return (sbyte)AssetType.LSLBytecode;
+                case "image/tga":
+                    // Note that AssetType.TextureTGA will be converted to AssetType.ImageTGA
+                    return (sbyte)AssetType.ImageTGA;
+                case "application/vnd.ll.bodypart":
+                case "application/x-metaverse-bodypart":
+                    return (sbyte)AssetType.Bodypart;
+                case "application/vnd.ll.trashfolder":
+                    return (sbyte)AssetType.TrashFolder;
+                case "application/vnd.ll.snapshotfolder":
+                    return (sbyte)AssetType.SnapshotFolder;
+                case "application/vnd.ll.lostandfoundfolder":
+                    return (sbyte)AssetType.LostAndFoundFolder;
+                case "audio/x-wav":
+                    return (sbyte)AssetType.SoundWAV;
+                case "image/jpeg":
+                    return (sbyte)AssetType.ImageJPEG;
+                case "application/vnd.ll.animation":
+                case "application/x-metaverse-animation":
+                    return (sbyte)AssetType.Animation;
+                case "application/vnd.ll.gesture":
+                case "application/x-metaverse-gesture":
+                    return (sbyte)AssetType.Gesture;
+                case "application/x-metaverse-simstate":
+                    return (sbyte)AssetType.Simstate;
+                case "application/vnd.ll.favoritefolder":
+                    return (sbyte)AssetType.FavoriteFolder;
+                case "application/vnd.ll.link":
+                    return (sbyte)AssetType.Link;
+                case "application/vnd.ll.linkfolder":
+                    return (sbyte)AssetType.LinkFolder;
+                case "application/vnd.ll.currentoutfitfolder":
+                    return (sbyte)AssetType.CurrentOutfitFolder;
+                case "application/vnd.ll.outfitfolder":
+                    return (sbyte)AssetType.OutfitFolder;
+                case "application/vnd.ll.myoutfitsfolder":
+                    return (sbyte)AssetType.MyOutfitsFolder;
+                case "application/octet-stream":
+                default:
+                    return (sbyte)AssetType.Unknown;
+            }
         }
 
         public static sbyte ContentTypeToSLInvType(string contentType)
         {
-            InventoryType invType;
-            if (!content2Inventory.TryGetValue(contentType, out invType))
-                invType = InventoryType.Unknown;
-            return (sbyte)invType;
-        }
-
-        public static string SLAssetTypeToExtension(int assetType)
-        {
-            string extension;
-            if (!asset2Extension.TryGetValue((sbyte)assetType, out extension))
-                extension = asset2Extension[(sbyte)AssetType.Unknown];
-            return extension;
+            switch (contentType)
+            {
+                case "image/x-j2c":
+                case "image/jp2":
+                case "image/tga":
+                case "image/jpeg":
+                    return (sbyte)InventoryType.Texture;
+                case "application/ogg":
+                case "audio/ogg":
+                case "audio/x-wav":
+                    return (sbyte)InventoryType.Sound;
+                case "application/vnd.ll.callingcard":
+                case "application/x-metaverse-callingcard":
+                    return (sbyte)InventoryType.CallingCard;
+                case "application/vnd.ll.landmark":
+                case "application/x-metaverse-landmark":
+                    return (sbyte)InventoryType.Landmark;
+                case "application/vnd.ll.clothing":
+                case "application/x-metaverse-clothing":
+                case "application/vnd.ll.bodypart":
+                case "application/x-metaverse-bodypart":
+                    return (sbyte)InventoryType.Wearable;
+                case "application/vnd.ll.primitive":
+                case "application/x-metaverse-primitive":
+                    return (sbyte)InventoryType.Object;
+                case "application/vnd.ll.notecard":
+                case "application/x-metaverse-notecard":
+                    return (sbyte)InventoryType.Notecard;
+                case "application/vnd.ll.folder":
+                    return (sbyte)InventoryType.Folder;
+                case "application/vnd.ll.rootfolder":
+                    return (sbyte)InventoryType.RootCategory;
+                case "application/vnd.ll.lsltext":
+                case "application/x-metaverse-lsl":
+                case "application/vnd.ll.lslbyte":
+                case "application/x-metaverse-lso":
+                    return (sbyte)InventoryType.LSL;
+                case "application/vnd.ll.trashfolder":
+                case "application/vnd.ll.snapshotfolder":
+                case "application/vnd.ll.lostandfoundfolder":
+                    return (sbyte)InventoryType.Folder;
+                case "application/vnd.ll.animation":
+                case "application/x-metaverse-animation":
+                    return (sbyte)InventoryType.Animation;
+                case "application/vnd.ll.gesture":
+                case "application/x-metaverse-gesture":
+                    return (sbyte)InventoryType.Gesture;
+                case "application/x-metaverse-simstate":
+                    return (sbyte)InventoryType.Snapshot;
+                case "application/octet-stream":
+                default:
+                    return (sbyte)InventoryType.Unknown;
+            }
         }
 
         #endregion SL / file extension / content-type conversions

OpenSim/Framework/Serialization/External/LandDataSerializer.cs

@@ -42,7 +42,9 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class LandDataSerializer
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
 
         private static Dictionary<string, Action<LandData, XmlTextReader>> m_ldProcessors
             = new Dictionary<string, Action<LandData, XmlTextReader>>();
@@ -93,8 +95,6 @@ namespace OpenSim.Framework.Serialization.External
                 "MediaURL",         (ld, xtr) => ld.MediaURL = xtr.ReadElementString("MediaURL"));
             m_ldProcessors.Add(
                 "MusicURL",         (ld, xtr) => ld.MusicURL = xtr.ReadElementString("MusicURL"));
-            m_ldProcessors.Add(
-                "OwnerID",          (ld, xtr) => ld.OwnerID  = UUID.Parse(xtr.ReadElementString("OwnerID")));
 
             m_ldProcessors.Add(
                 "ParcelAccessList", ProcessParcelAccessList);
@@ -163,7 +163,7 @@ namespace OpenSim.Framework.Serialization.External
         /// <exception cref="System.Xml.XmlException"></exception>
         public static LandData Deserialize(byte[] serializedLandData)
         {
-            return Deserialize(Encoding.UTF8.GetString(serializedLandData, 0, serializedLandData.Length));
+            return Deserialize(m_utf8Encoding.GetString(serializedLandData, 0, serializedLandData.Length));
         }
 
         /// <summary>
@@ -188,16 +188,7 @@ namespace OpenSim.Framework.Serialization.External
             return landData;
         }
 
-        /// <summary>
-        /// Serialize land data
-        /// </summary>
-        /// <param name='landData'></param>
-        /// <param name='options'>
-        /// Serialization options.
-        /// Can be null if there are no options.
-        /// "wipe-owners" will write UUID.Zero rather than the ownerID so that a later reload loads all parcels with the estate owner as the owner
-        /// </param>
-        public static string Serialize(LandData landData, Dictionary<string, object> options)
+        public static string Serialize(LandData landData)
         {
             StringWriter sw = new StringWriter();
             XmlTextWriter xtw = new XmlTextWriter(sw);
@@ -226,14 +217,7 @@ namespace OpenSim.Framework.Serialization.External
             xtw.WriteElementString("MediaID",        landData.MediaID.ToString());
             xtw.WriteElementString("MediaURL",       landData.MediaURL);
             xtw.WriteElementString("MusicURL",       landData.MusicURL);
-
-            UUID ownerIdToWrite;
-            if (options != null && options.ContainsKey("wipe-owners"))
-                ownerIdToWrite = UUID.Zero;                
-            else
-                ownerIdToWrite = landData.OwnerID;
-
-            xtw.WriteElementString("OwnerID",        ownerIdToWrite.ToString());
+            xtw.WriteElementString("OwnerID",        landData.OwnerID.ToString());
 
             xtw.WriteStartElement("ParcelAccessList");
             foreach (LandAccessEntry pal in landData.ParcelAccessList)

OpenSim/Framework/Serialization/External/OspResolver.cs

@@ -65,14 +65,9 @@ namespace OpenSim.Framework.Serialization
 
             UserAccount account = userService.GetUserAccount(UUID.Zero, userId);
             if (account != null)
-            {
                 return MakeOspa(account.FirstName, account.LastName);
-            }
 //            else
-//            {
 //                m_log.WarnFormat("[OSP RESOLVER]: No user account for {0}", userId);
-//                System.Console.WriteLine("[OSP RESOLVER]: No user account for {0}", userId);
-//            }
 
             return null;
         }
@@ -84,13 +79,10 @@ namespace OpenSim.Framework.Serialization
         /// <returns></returns>
         public static string MakeOspa(string firstName, string lastName)
         {
-            string ospa
-                = OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName;
-
-//            m_log.DebugFormat("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName);
-//            System.Console.WriteLine("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName);
+//            m_log.DebugFormat("[OSP RESOLVER]: Making OSPA for {0} {1}", firstName, lastName);
             
-            return ospa;
+            return 
+                OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName;
         }
         
         /// <summary>

OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs

@@ -30,8 +30,6 @@ using System.Text;
 using System.Xml;
 using OpenMetaverse;
 using OpenSim.Framework;
-using log4net;
-using System.Reflection;
 
 namespace OpenSim.Framework.Serialization.External
 {
@@ -40,6 +38,8 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class RegionSettingsSerializer
     {
+        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
+        
         /// <summary>
         /// Deserialize settings
         /// </summary>
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Serialization.External
         /// <exception cref="System.Xml.XmlException"></exception>
         public static RegionSettings Deserialize(byte[] serializedSettings)
         {
-            return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length));
+            return Deserialize(m_asciiEncoding.GetString(serializedSettings, 0, serializedSettings.Length));
         }
         
         /// <summary>
@@ -187,29 +187,7 @@ namespace OpenSim.Framework.Serialization.External
                         break;
                 }
             }
-
-            xtr.ReadEndElement();
-
-            if (xtr.IsStartElement("Telehub"))
-            {
-                xtr.ReadStartElement("Telehub");
-
-                while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
-                {
-                    switch (xtr.Name)
-                    {
-                        case "TelehubObject":
-                            settings.TelehubObject = UUID.Parse(xtr.ReadElementContentAsString());
-                            break;
-                        case "SpawnPoint":
-                            string str = xtr.ReadElementContentAsString();
-                            SpawnPoint sp = SpawnPoint.Parse(str);
-                            settings.AddSpawnPoint(sp);
-                            break;
-                    }
-                }
-            }
-
+            
             xtr.Close();
             sr.Close();
             
@@ -265,16 +243,7 @@ namespace OpenSim.Framework.Serialization.External
             xtw.WriteElementString("SunPosition", settings.SunPosition.ToString());
             // Note: 'SunVector' isn't saved because this value is owned by the Sun Module, which
             // calculates it automatically according to the date and other factors.
-            xtw.WriteEndElement();
-
-            xtw.WriteStartElement("Telehub");
-            if (settings.TelehubObject != UUID.Zero)
-            {
-                xtw.WriteElementString("TelehubObject", settings.TelehubObject.ToString());
-                foreach (SpawnPoint sp in settings.SpawnPoints())
-                    xtw.WriteElementString("SpawnPoint", sp.ToString());
-            }
-            xtw.WriteEndElement();
+            xtw.WriteEndElement(); 
             
             xtw.WriteEndElement();
             

OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs

@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class UserInventoryItemSerializer
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors
             = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>();

OpenSim/Framework/Serialization/TarArchiveReader.cs

@@ -53,6 +53,8 @@ namespace OpenSim.Framework.Serialization
             TYPE_CONTIGUOUS_FILE = 8,
         }
 
+        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
+
         /// <summary>
         /// Binary reader for the underlying stream
         /// </summary>
@@ -118,13 +120,13 @@ namespace OpenSim.Framework.Serialization
             if (header[156] == (byte)'L')
             {
                 int longNameLength = ConvertOctalBytesToDecimal(header, 124, 11);
-                tarHeader.FilePath = Encoding.ASCII.GetString(ReadData(longNameLength));
+                tarHeader.FilePath = m_asciiEncoding.GetString(ReadData(longNameLength));
                 //m_log.DebugFormat("[TAR ARCHIVE READER]: Got long file name {0}", tarHeader.FilePath);
                 header = m_br.ReadBytes(512);
             }
             else
             {
-                tarHeader.FilePath = Encoding.ASCII.GetString(header, 0, 100);
+                tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100);
                 tarHeader.FilePath = tarHeader.FilePath.Trim(m_nullCharArray);
                 //m_log.DebugFormat("[TAR ARCHIVE READER]: Got short file name {0}", tarHeader.FilePath);
             }
@@ -203,7 +205,7 @@ namespace OpenSim.Framework.Serialization
         {
             // Trim leading white space: ancient tars do that instead
             // of leading 0s :-( don't ask. really.
-            string oString = Encoding.ASCII.GetString(bytes, startIndex, count).TrimStart(m_spaceCharArray);
+            string oString = m_asciiEncoding.GetString(bytes, startIndex, count).TrimStart(m_spaceCharArray);
 
             int d = 0;
 

OpenSim/Framework/Serialization/TarArchiveWriter.cs

@@ -41,6 +41,9 @@ namespace OpenSim.Framework.Serialization
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
+        protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
+
         /// <summary>
         /// Binary writer for the underlying stream
         /// </summary>
@@ -71,7 +74,7 @@ namespace OpenSim.Framework.Serialization
         /// <param name="data"></param>
         public void WriteFile(string filePath, string data)
         {
-            WriteFile(filePath, Util.UTF8NoBomEncoding.GetBytes(data));
+            WriteFile(filePath, m_utf8Encoding.GetBytes(data));
         }
 
         /// <summary>
@@ -82,7 +85,7 @@ namespace OpenSim.Framework.Serialization
         public void WriteFile(string filePath, byte[] data)
         {
             if (filePath.Length > 100)
-                WriteEntry("././@LongLink", Encoding.ASCII.GetBytes(filePath), 'L');
+                WriteEntry("././@LongLink", m_asciiEncoding.GetBytes(filePath), 'L');
 
             char fileType;
 
@@ -134,7 +137,7 @@ namespace OpenSim.Framework.Serialization
                 oString = "0" + oString;
             }
 
-            byte[] oBytes = Encoding.ASCII.GetBytes(oString);
+            byte[] oBytes = m_asciiEncoding.GetBytes(oString);
 
             return oBytes;
         }
@@ -153,20 +156,20 @@ namespace OpenSim.Framework.Serialization
             byte[] header = new byte[512];
 
             // file path field (100)
-            byte[] nameBytes = Encoding.ASCII.GetBytes(filePath);
+            byte[] nameBytes = m_asciiEncoding.GetBytes(filePath);
             int nameSize = (nameBytes.Length >= 100) ? 100 : nameBytes.Length;
             Array.Copy(nameBytes, header, nameSize);
 
             // file mode (8)
-            byte[] modeBytes = Encoding.ASCII.GetBytes("0000777");
+            byte[] modeBytes = m_asciiEncoding.GetBytes("0000777");
             Array.Copy(modeBytes, 0, header, 100, 7);
 
             // owner user id (8)
-            byte[] ownerIdBytes = Encoding.ASCII.GetBytes("0000764");
+            byte[] ownerIdBytes = m_asciiEncoding.GetBytes("0000764");
             Array.Copy(ownerIdBytes, 0, header, 108, 7);
 
             // group user id (8)
-            byte[] groupIdBytes = Encoding.ASCII.GetBytes("0000764");
+            byte[] groupIdBytes = m_asciiEncoding.GetBytes("0000764");
             Array.Copy(groupIdBytes, 0, header, 116, 7);
 
             // file size in bytes (12)
@@ -178,17 +181,17 @@ namespace OpenSim.Framework.Serialization
             Array.Copy(fileSizeBytes, 0, header, 124, 11);
 
             // last modification time (12)
-            byte[] lastModTimeBytes = Encoding.ASCII.GetBytes("11017037332");
+            byte[] lastModTimeBytes = m_asciiEncoding.GetBytes("11017037332");
             Array.Copy(lastModTimeBytes, 0, header, 136, 11);
 
             // entry type indicator (1)
-            header[156] = Encoding.ASCII.GetBytes(new char[] { fileType })[0];
+            header[156] = m_asciiEncoding.GetBytes(new char[] { fileType })[0];
 
-            Array.Copy(Encoding.ASCII.GetBytes("0000000"), 0, header, 329, 7);
-            Array.Copy(Encoding.ASCII.GetBytes("0000000"), 0, header, 337, 7);
+            Array.Copy(m_asciiEncoding.GetBytes("0000000"), 0, header, 329, 7);
+            Array.Copy(m_asciiEncoding.GetBytes("0000000"), 0, header, 337, 7);
 
             // check sum for header block (8) [calculated last]
-            Array.Copy(Encoding.ASCII.GetBytes("        "), 0, header, 148, 8);
+            Array.Copy(m_asciiEncoding.GetBytes("        "), 0, header, 148, 8);
 
             int checksum = 0;
             foreach (byte b in header)

OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs

@@ -42,23 +42,22 @@ namespace OpenSim.Framework.Serialization.Tests
         private LandData land;
         private LandData landWithParcelAccessList;
 
-//        private static string preSerialized = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n  <Area>128</Area>\n  <AuctionID>0</AuctionID>\n  <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n  <Category>10</Category>\n  <ClaimDate>0</ClaimDate>\n  <ClaimPrice>0</ClaimPrice>\n  <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n  <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n  <IsGroupOwned>False</IsGroupOwned>\n  <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n  <Description>land data to test LandDataSerializer</Description>\n  <Flags>536870944</Flags>\n  <LandingType>2</LandingType>\n  <Name>LandDataSerializerTest Land</Name>\n  <Status>0</Status>\n  <LocalID>0</LocalID>\n  <MediaAutoScale>1</MediaAutoScale>\n  <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n  <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n  <MusicURL />\n  <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n  <ParcelAccessList />\n  <PassHours>0</PassHours>\n  <PassPrice>0</PassPrice>\n  <SalePrice>0</SalePrice>\n  <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n  <UserLocation>&lt;0, 0, 0&gt;</UserLocation>\n  <UserLookAt>&lt;0, 0, 0&gt;</UserLookAt>\n  <Dwell>0</Dwell>\n  <OtherCleanTime>0</OtherCleanTime>\n</LandData>";
-        private static string preSerializedWithParcelAccessList
-            = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n  <Area>128</Area>\n  <AuctionID>0</AuctionID>\n  <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n  <Category>10</Category>\n  <ClaimDate>0</ClaimDate>\n  <ClaimPrice>0</ClaimPrice>\n  <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n  <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n  <IsGroupOwned>False</IsGroupOwned>\n  <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n  <Description>land data to test LandDataSerializer</Description>\n  <Flags>536870944</Flags>\n  <LandingType>2</LandingType>\n  <Name>LandDataSerializerTest Land</Name>\n  <Status>0</Status>\n  <LocalID>0</LocalID>\n  <MediaAutoScale>1</MediaAutoScale>\n  <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n  <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n  <MusicURL />\n  <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n  <ParcelAccessList>\n    <ParcelAccessEntry>\n      <AgentID>62d65d45-c91a-4f77-862c-46557d978b6c</AgentID>\n      <Time>0</Time>\n      <AccessList>2</AccessList>\n    </ParcelAccessEntry>\n    <ParcelAccessEntry>\n      <AgentID>ec2a8d18-2378-4fe0-8b68-2a31b57c481e</AgentID>\n      <Time>0</Time>\n      <AccessList>1</AccessList>\n    </ParcelAccessEntry>\n  </ParcelAccessList>\n  <PassHours>0</PassHours>\n  <PassPrice>0</PassPrice>\n  <SalePrice>0</SalePrice>\n  <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n  <UserLocation>&lt;0, 0, 0&gt;</UserLocation>\n  <UserLookAt>&lt;0, 0, 0&gt;</UserLookAt>\n  <Dwell>0</Dwell>\n  <OtherCleanTime>0</OtherCleanTime>\n</LandData>";
+        private static string preSerialized = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n  <Area>128</Area>\n  <AuctionID>0</AuctionID>\n  <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n  <Category>10</Category>\n  <ClaimDate>0</ClaimDate>\n  <ClaimPrice>0</ClaimPrice>\n  <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n  <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n  <IsGroupOwned>False</IsGroupOwned>\n  <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n  <Description>land data to test LandDataSerializer</Description>\n  <Flags>536870944</Flags>\n  <LandingType>2</LandingType>\n  <Name>LandDataSerializerTest Land</Name>\n  <Status>0</Status>\n  <LocalID>0</LocalID>\n  <MediaAutoScale>1</MediaAutoScale>\n  <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n  <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n  <MusicURL />\n  <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n  <ParcelAccessList />\n  <PassHours>0</PassHours>\n  <PassPrice>0</PassPrice>\n  <SalePrice>0</SalePrice>\n  <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n  <UserLocation>&lt;0, 0, 0&gt;</UserLocation>\n  <UserLookAt>&lt;0, 0, 0&gt;</UserLookAt>\n  <Dwell>0</Dwell>\n  <OtherCleanTime>0</OtherCleanTime>\n</LandData>";
+        private static string preSerializedWithParcelAccessList = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n<LandData>\n  <Area>128</Area>\n  <AuctionID>0</AuctionID>\n  <AuthBuyerID>00000000-0000-0000-0000-000000000000</AuthBuyerID>\n  <Category>10</Category>\n  <ClaimDate>0</ClaimDate>\n  <ClaimPrice>0</ClaimPrice>\n  <GlobalID>54ff9641-dd40-4a2c-b1f1-47dd3af24e50</GlobalID>\n  <GroupID>d740204e-bbbf-44aa-949d-02c7d739f6a5</GroupID>\n  <IsGroupOwned>False</IsGroupOwned>\n  <Bitmap>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</Bitmap>\n  <Description>land data to test LandDataSerializer</Description>\n  <Flags>536870944</Flags>\n  <LandingType>2</LandingType>\n  <Name>LandDataSerializerTest Land</Name>\n  <Status>0</Status>\n  <LocalID>0</LocalID>\n  <MediaAutoScale>1</MediaAutoScale>\n  <MediaID>d4452578-2f25-4b97-a81b-819af559cfd7</MediaID>\n  <MediaURL>http://videos.opensimulator.org/bumblebee.mp4</MediaURL>\n  <MusicURL />\n  <OwnerID>1b8eedf9-6d15-448b-8015-24286f1756bf</OwnerID>\n  <ParcelAccessList>\n    <ParcelAccessEntry>\n      <AgentID>62d65d45-c91a-4f77-862c-46557d978b6c</AgentID>\n      <Time>0</Time>\n      <AccessList>2</AccessList>\n    </ParcelAccessEntry>\n    <ParcelAccessEntry>\n      <AgentID>ec2a8d18-2378-4fe0-8b68-2a31b57c481e</AgentID>\n      <Time>0</Time>\n      <AccessList>1</AccessList>\n    </ParcelAccessEntry>\n  </ParcelAccessList>\n  <PassHours>0</PassHours>\n  <PassPrice>0</PassPrice>\n  <SalePrice>0</SalePrice>\n  <SnapshotID>00000000-0000-0000-0000-000000000000</SnapshotID>\n  <UserLocation>&lt;0, 0, 0&gt;</UserLocation>\n  <UserLookAt>&lt;0, 0, 0&gt;</UserLookAt>\n  <Dwell>0</Dwell>\n  <OtherCleanTime>0</OtherCleanTime>\n</LandData>";  
 
         [SetUp]
         public void setup()
         {
             // setup LandData object
             this.land = new LandData();
-            this.land.AABBMax = new Vector3(1, 2, 3);
-            this.land.AABBMin = new Vector3(129, 130, 131);
+            this.land.AABBMax = new Vector3(0, 0, 0);
+            this.land.AABBMin = new Vector3(128, 128, 128);
             this.land.Area = 128;
-            this.land.AuctionID = 4;
-            this.land.AuthBuyerID = new UUID("7176df0c-6c50-45db-8a37-5e78be56a0cd");
+            this.land.AuctionID = 0;
+            this.land.AuthBuyerID = new UUID();
             this.land.Category = ParcelCategory.Residential;
-            this.land.ClaimDate = 1;
-            this.land.ClaimPrice = 2;
+            this.land.ClaimDate = 0;
+            this.land.ClaimPrice = 0;
             this.land.GlobalID = new UUID("54ff9641-dd40-4a2c-b1f1-47dd3af24e50");
             this.land.GroupID = new UUID("d740204e-bbbf-44aa-949d-02c7d739f6a5");
             this.land.Description = "land data to test LandDataSerializer";
@@ -66,7 +65,7 @@ namespace OpenSim.Framework.Serialization.Tests
             this.land.LandingType = (byte)LandingType.Direct;
             this.land.Name = "LandDataSerializerTest Land";
             this.land.Status = ParcelStatus.Leased;
-            this.land.LocalID = 1;
+            this.land.LocalID = 0;
             this.land.MediaAutoScale = (byte)0x01;
             this.land.MediaID = new UUID("d4452578-2f25-4b97-a81b-819af559cfd7");
             this.land.MediaURL = "http://videos.opensimulator.org/bumblebee.mp4";
@@ -91,26 +90,26 @@ namespace OpenSim.Framework.Serialization.Tests
         /// <summary>
         /// Test the LandDataSerializer.Serialize() method
         /// </summary>
-//        [Test]
-//        public void LandDataSerializerSerializeTest()
-//        {
-//            TestHelpers.InMethod();
-//
-//            string serialized = LandDataSerializer.Serialize(this.land).Replace("\r\n", "\n");
-//            Assert.That(serialized.Length > 0, "Serialize(LandData) returned empty string");
-//
-//            // adding a simple boolean variable because resharper nUnit integration doesn't like this
-//            // XML data in the Assert.That statement.   Not sure why.
-//            bool result = (serialized == preSerialized);
-//            Assert.That(result, "result of Serialize LandData  does not match expected result");
-//
-//            string serializedWithParcelAccessList = LandDataSerializer.Serialize(this.landWithParcelAccessList).Replace("\r\n", "\n");
-//            Assert.That(serializedWithParcelAccessList.Length > 0,
-//                        "Serialize(LandData) returned empty string for LandData object with ParcelAccessList");
-//            result = (serializedWithParcelAccessList == preSerializedWithParcelAccessList);
-//            Assert.That(result,
-//                        "result of Serialize(LandData) does not match expected result (pre-serialized with parcel access list");
-//        }
+        [Test]
+        public void LandDataSerializerSerializeTest()
+        {
+            TestHelpers.InMethod();
+
+            string serialized = LandDataSerializer.Serialize(this.land).Replace("\r\n", "\n");
+            Assert.That(serialized.Length > 0, "Serialize(LandData) returned empty string");
+
+            // adding a simple boolean variable because resharper nUnit integration doesn't like this
+            // XML data in the Assert.That statement.   Not sure why.
+            bool result = (serialized == preSerialized);
+            Assert.That(result, "result of Serialize LandData  does not match expected result");
+
+            string serializedWithParcelAccessList = LandDataSerializer.Serialize(this.landWithParcelAccessList).Replace("\r\n", "\n");
+            Assert.That(serializedWithParcelAccessList.Length > 0,
+                        "Serialize(LandData) returned empty string for LandData object with ParcelAccessList");
+            result = (serializedWithParcelAccessList == preSerializedWithParcelAccessList);
+            Assert.That(result,
+                        "result of Serialize(LandData) does not match expected result (pre-serialized with parcel access list");
+        }
 
         /// <summary>
         /// Test the LandDataSerializer.Deserialize() method
@@ -121,28 +120,10 @@ namespace OpenSim.Framework.Serialization.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            LandData ld = LandDataSerializer.Deserialize(LandDataSerializer.Serialize(this.land, null));
-            Assert.That(ld, Is.Not.Null, "Deserialize(string) returned null");
-//            Assert.That(ld.AABBMax, Is.EqualTo(land.AABBMax));
-//            Assert.That(ld.AABBMin, Is.EqualTo(land.AABBMin));
-            Assert.That(ld.Area, Is.EqualTo(land.Area));
-            Assert.That(ld.AuctionID, Is.EqualTo(land.AuctionID));
-            Assert.That(ld.AuthBuyerID, Is.EqualTo(land.AuthBuyerID));
-            Assert.That(ld.Category, Is.EqualTo(land.Category));
-            Assert.That(ld.ClaimDate, Is.EqualTo(land.ClaimDate));
-            Assert.That(ld.ClaimPrice, Is.EqualTo(land.ClaimPrice));
-            Assert.That(ld.GlobalID, Is.EqualTo(land.GlobalID), "Reified LandData.GlobalID != original LandData.GlobalID");
-            Assert.That(ld.GroupID, Is.EqualTo(land.GroupID));
-            Assert.That(ld.Description, Is.EqualTo(land.Description));
-            Assert.That(ld.Flags, Is.EqualTo(land.Flags));
-            Assert.That(ld.LandingType, Is.EqualTo(land.LandingType));
-            Assert.That(ld.Name, Is.EqualTo(land.Name), "Reified LandData.Name != original LandData.Name");
-            Assert.That(ld.Status, Is.EqualTo(land.Status));
-            Assert.That(ld.LocalID, Is.EqualTo(land.LocalID));
-            Assert.That(ld.MediaAutoScale, Is.EqualTo(land.MediaAutoScale));
-            Assert.That(ld.MediaID, Is.EqualTo(land.MediaID));
-            Assert.That(ld.MediaURL, Is.EqualTo(land.MediaURL));
-            Assert.That(ld.OwnerID, Is.EqualTo(land.OwnerID));
+            LandData ld = LandDataSerializer.Deserialize(LandDataSerializerTest.preSerialized);
+            Assert.That(ld != null, "Deserialize(string) returned null");
+            Assert.That(ld.GlobalID == this.land.GlobalID, "Reified LandData.GlobalID != original LandData.GlobalID");
+            Assert.That(ld.Name == this.land.Name, "Reified LandData.Name != original LandData.Name");
         }
 
         [Test]

OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs

@@ -78,10 +78,6 @@ namespace OpenSim.Framework.Serialization.Tests
     <FixedSun>true</FixedSun>
     <SunPosition>12</SunPosition>
   </Terrain>
-  <Telehub>
-    <TelehubObject>00000000-0000-0000-0000-111111111111</TelehubObject>
-    <SpawnPoint>1,-2,0.33</SpawnPoint>
-  </Telehub>
 </RegionSettings>";
 
         private RegionSettings m_rs;
@@ -120,8 +116,6 @@ namespace OpenSim.Framework.Serialization.Tests
             m_rs.TerrainTexture4 = UUID.Parse("00000000-0000-0000-0000-000000000080");
             m_rs.UseEstateSun = true;
             m_rs.WaterHeight = 23;
-            m_rs.TelehubObject = UUID.Parse("00000000-0000-0000-0000-111111111111");
-            m_rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33"));
         }
 
         [Test]
@@ -135,8 +129,6 @@ namespace OpenSim.Framework.Serialization.Tests
             Assert.That(deserRs.TerrainTexture2, Is.EqualTo(m_rs.TerrainTexture2));
             Assert.That(deserRs.DisablePhysics, Is.EqualTo(m_rs.DisablePhysics));
             Assert.That(deserRs.TerrainLowerLimit, Is.EqualTo(m_rs.TerrainLowerLimit));
-            Assert.That(deserRs.TelehubObject, Is.EqualTo(m_rs.TelehubObject));
-            Assert.That(deserRs.SpawnPoints()[0].ToString(), Is.EqualTo(m_rs.SpawnPoints()[0].ToString()));
         }
     }
 }

OpenSim/Framework/Servers/BaseOpenSimServer.cs

@@ -40,9 +40,9 @@ using log4net.Core;
 using log4net.Repository;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework.Statistics;
 using Timer=System.Timers.Timer;
 
 using OpenMetaverse;
@@ -320,9 +320,7 @@ namespace OpenSim.Framework.Servers
             
             TimeSpan timeTaken = DateTime.Now - m_startuptime;
             
-            m_log.InfoFormat(
-                "[STARTUP]: Non-script portion of startup took {0}m {1}s.  PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.",
-                timeTaken.Minutes, timeTaken.Seconds);
+            m_log.InfoFormat("[STARTUP]: Startup took {0}m {1}s", timeTaken.Minutes, timeTaken.Seconds);
         }
 
         /// <summary>
@@ -591,8 +589,8 @@ namespace OpenSim.Framework.Servers
             {
                 string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
                 FileStream fs = File.Create(path);
-
-                Byte[] buf = Encoding.ASCII.GetBytes(pidstring);
+                System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
+                Byte[] buf = enc.GetBytes(pidstring);
                 fs.Write(buf, 0, buf.Length);
                 fs.Close();
                 m_pidFile = path;

OpenSim/Framework/Servers/HttpServer/BaseHTTPHandler.cs

@@ -33,9 +33,9 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         public abstract Hashtable Handle(string path, Hashtable Request);
 
-        protected BaseHTTPHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
-
-        protected BaseHTTPHandler(string httpMethod, string path, string name, string description)
-            : base(httpMethod, path, name, description) {}
+        protected BaseHTTPHandler(string httpMethod, string path)
+            : base(httpMethod, path)
+        {
+        }
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs

@@ -45,7 +45,6 @@ using OpenMetaverse.StructuredData;
 using CoolHTTPListener = HttpServer.HttpListener;
 using HttpListener=System.Net.HttpListener;
 using LogPrio=HttpServer.LogPrio;
-using OpenSim.Framework.Monitoring;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -54,8 +53,6 @@ namespace OpenSim.Framework.Servers.HttpServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private HttpServerLogWriter httpserverlog = new HttpServerLogWriter();
 
-        public int DebugLevel { get; set; }
-
         private volatile int NotSocketErrors = 0;
         public volatile bool HTTPDRunning = false;
 
@@ -82,6 +79,11 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private PollServiceRequestManager m_PollServiceManager;
 
+        /// <summary>
+        /// Control the printing of certain debug messages.
+        /// </summary>
+        public int DebugLevel { get; set; }
+
         public uint SSLPort
         {
             get { return m_sslport; }
@@ -154,7 +156,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
-        public List<string> GetStreamHandlerKeys()
+        public List<string>  GetStreamHandlerKeys()
         {
             lock (m_streamHandlers)
                 return new List<string>(m_streamHandlers.Keys);
@@ -354,7 +356,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             catch (Exception e)
             {
-                m_log.Error(String.Format("[BASE HTTP SERVER]: OnRequest() failed: {0} ", e.Message), e);
+                m_log.ErrorFormat("[BASE HTTP SERVER]: OnRequest() failed with {0}{1}", e.Message, e.StackTrace);
             }
         }
 
@@ -406,12 +408,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             string uriString = request.RawUrl;
 
 //            string reqnum = "unknown";
-            int requestStartTick = Environment.TickCount;
-
-            // Will be adjusted later on.
-            int requestEndTick = requestStartTick;
-
-            IRequestHandler requestHandler = null;
+            int tickstart = Environment.TickCount;
 
             try
             {
@@ -434,7 +431,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     if (HandleAgentRequest(agentHandler, request, response))
                     {
-                        requestEndTick = Environment.TickCount;
                         return;
                     }
                 }
@@ -442,16 +438,20 @@ namespace OpenSim.Framework.Servers.HttpServer
                 //response.KeepAlive = true;
                 response.SendChunked = false;
 
+                IRequestHandler requestHandler;
+
                 string path = request.RawUrl;
                 string handlerKey = GetHandlerKey(request.HttpMethod, path);
-                byte[] buffer = null;
 
                 if (TryGetStreamHandler(handlerKey, out requestHandler))
                 {
-                    if (DebugLevel >= 3)
+                    if (DebugLevel >= 1)
                         m_log.DebugFormat(
-                            "[BASE HTTP SERVER]: Found stream handler for {0} {1} {2} {3}",
-                            request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description);
+                            "[BASE HTTP SERVER]: Found stream handler for {0} {1}",
+                            request.HttpMethod, request.Url.PathAndQuery);
+
+                    // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
+                    byte[] buffer = null;
 
                     response.ContentType = requestHandler.ContentType; // Lets do this defaulting before in case handler has varying content type.
 
@@ -507,8 +507,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                             //m_log.Warn("[HTTP]: " + requestBody);
 
                         }
-
-                        buffer = DoHTTPGruntWork(HTTPRequestHandler.Handle(path, keysvals), response);
+                        DoHTTPGruntWork(HTTPRequestHandler.Handle(path, keysvals), response);
+                        return;
                     }
                     else
                     {
@@ -521,99 +521,133 @@ namespace OpenSim.Framework.Servers.HttpServer
                             buffer = memoryStream.ToArray();
                         }
                     }
-                }
-                else
-                {
-                    switch (request.ContentType)
-                    {
-                        case null:
-                        case "text/html":
-    
-                            if (DebugLevel >= 3)
-                                m_log.DebugFormat(
-                                    "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
-                                    request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
-    
-                            buffer = HandleHTTPRequest(request, response);
-                            break;
-    
-                        case "application/llsd+xml":
-                        case "application/xml+llsd":
-                        case "application/llsd+json":
-    
-                            if (DebugLevel >= 3)
-                                m_log.DebugFormat(
-                                    "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
-                                    request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
-    
-                            buffer = HandleLLSDRequests(request, response);
-                            break;
-    
-                        case "text/xml":
-                        case "application/xml":
-                        case "application/json":
-                        default:
-                            //m_log.Info("[Debug BASE HTTP SERVER]: in default handler");
-                            // Point of note..  the DoWeHaveA methods check for an EXACT path
-                            //                        if (request.RawUrl.Contains("/CAPS/EQG"))
-                            //                        {
-                            //                            int i = 1;
-                            //                        }
-                            //m_log.Info("[Debug BASE HTTP SERVER]: Checking for LLSD Handler");
-                            if (DoWeHaveALLSDHandler(request.RawUrl))
-                            {
-                                if (DebugLevel >= 3)
-                                    m_log.DebugFormat(
-                                        "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
-                                        request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
-    
-                                buffer = HandleLLSDRequests(request, response);
-                            }
-    //                        m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
-                            else if (DoWeHaveAHTTPHandler(request.RawUrl))
-                            {
-                                if (DebugLevel >= 3)
-                                    m_log.DebugFormat(
-                                        "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
-                                        request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
-    
-                                buffer = HandleHTTPRequest(request, response);
-                            }
-                            else
-                            {
-                                if (DebugLevel >= 3)
-                                    m_log.DebugFormat(
-                                        "[BASE HTTP SERVER]: Assuming a generic XMLRPC request for {0} {1}",
-                                        request.HttpMethod, request.Url.PathAndQuery);
-    
-                                // generic login request.
-                                buffer = HandleXmlRpcRequests(request, response);
-                            }
-    
-                            break;
-                    }
-                }
 
-                request.InputStream.Close();
+                    request.InputStream.Close();
+
+                    // HTTP IN support. The script engine takes it from here
+                    // Nothing to worry about for us.
+                    //
+                    if (buffer == null)
+                        return;
 
-                if (buffer != null)
-                {
                     if (!response.SendChunked)
                         response.ContentLength64 = buffer.LongLength;
 
-                    response.OutputStream.Write(buffer, 0, buffer.Length);
+                    try
+                    {
+                        response.OutputStream.Write(buffer, 0, buffer.Length);
+                        //response.OutputStream.Close();
+                    }
+                    catch (HttpListenerException)
+                    {
+                        m_log.WarnFormat("[BASE HTTP SERVER]: HTTP request abnormally terminated.");
+                    }
+                    //response.OutputStream.Close();
+                    try
+                    {
+                        response.Send();
+                        //response.FreeContext();
+                    }
+                    catch (SocketException e)
+                    {
+                        // This has to be here to prevent a Linux/Mono crash
+                        m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                    }
+                    catch (IOException e)
+                    {
+                        m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                    }
+
+                    return;
                 }
 
-                // Do not include the time taken to actually send the response to the caller in the measurement
-                // time.  This is to avoid logging when it's the client that is slow to process rather than the
-                // server
-                requestEndTick = Environment.TickCount;
+                if (request.AcceptTypes != null && request.AcceptTypes.Length > 0)
+                {
+                    foreach (string strAccept in request.AcceptTypes)
+                    {
+                        if (strAccept.Contains("application/llsd+xml") ||
+                            strAccept.Contains("application/llsd+json"))
+                        {
+                            if (DebugLevel >= 1)
+                                m_log.DebugFormat(
+                                    "[BASE HTTP SERVER]: Found application/llsd+xml accept header handler for {0} {1}",
+                                    request.HttpMethod, request.Url.PathAndQuery);
 
-                response.Send();
+                            HandleLLSDRequests(request, response);
+                            return;
+                        }
+                    }
+                }
 
-                //response.OutputStream.Close();
+                switch (request.ContentType)
+                {
+                    case null:
+                    case "text/html":
 
-                //response.FreeContext();
+                        if (DebugLevel >= 1)
+                            m_log.DebugFormat(
+                                "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+                                request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+
+                        HandleHTTPRequest(request, response);
+                        return;
+
+                    case "application/llsd+xml":
+                    case "application/xml+llsd":
+                    case "application/llsd+json":
+
+                        if (DebugLevel >= 1)
+                            m_log.DebugFormat(
+                                "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+                                request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+
+                        HandleLLSDRequests(request, response);
+                        return;
+
+                    case "text/xml":
+                    case "application/xml":
+                    case "application/json":
+                    default:
+                        //m_log.Info("[Debug BASE HTTP SERVER]: in default handler");
+                        // Point of note..  the DoWeHaveA methods check for an EXACT path
+                        //                        if (request.RawUrl.Contains("/CAPS/EQG"))
+                        //                        {
+                        //                            int i = 1;
+                        //                        }
+                        //m_log.Info("[Debug BASE HTTP SERVER]: Checking for LLSD Handler");
+                        if (DoWeHaveALLSDHandler(request.RawUrl))
+                        {
+                            if (DebugLevel >= 1)
+                                m_log.DebugFormat(
+                                    "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+                                    request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+
+                            HandleLLSDRequests(request, response);
+                            return;
+                        }
+
+//                        m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
+                        if (DoWeHaveAHTTPHandler(request.RawUrl))
+                        {
+                            if (DebugLevel >= 1)
+                                m_log.DebugFormat(
+                                    "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+                                    request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+
+                            HandleHTTPRequest(request, response);
+                            return;
+                        }
+
+                        if (DebugLevel >= 1)
+                            m_log.DebugFormat(
+                                "[BASE HTTP SERVER]: Assuming a generic XMLRPC request for {0} {1}",
+                                request.HttpMethod, request.Url.PathAndQuery);
+
+                        // generic login request.
+                        HandleXmlRpcRequests(request, response);
+
+                        return;
+                }
             }
             catch (SocketException e)
             {
@@ -624,33 +658,25 @@ namespace OpenSim.Framework.Servers.HttpServer
                 //
                 // An alternative may be to turn off all response write exceptions on the HttpListener, but let's go
                 // with the minimum first
-                m_log.Warn(String.Format("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux ", e.Message), e);
+                m_log.WarnFormat("[BASE HTTP SERVER]: HandleRequest threw {0}.\nNOTE: this may be spurious on Linux", e);
             }
             catch (IOException e)
             {
-                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
+                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw ", e);
             }
             catch (Exception e)
             {
-                m_log.Error(String.Format("[BASE HTTP SERVER]: HandleRequest() threw {0} ", e.Message), e);
+                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw " + e.ToString());
                 SendHTML500(response);
             }
             finally
             {
                 // Every month or so this will wrap and give bad numbers, not really a problem
-                // since its just for reporting
-                int tickdiff = requestEndTick - requestStartTick;
+                // since its just for reporting, tickdiff limit can be adjusted
+                int tickdiff = Environment.TickCount - tickstart;
                 if (tickdiff > 3000)
-                {
                     m_log.InfoFormat(
-                        "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} from {4} took {5}ms",
-                        requestMethod,
-                        uriString,
-                        requestHandler != null ? requestHandler.Name : "",
-                        requestHandler != null ? requestHandler.Description : "",
-                        request.RemoteIPEndPoint.ToString(),
-                        tickdiff);
-                }
+                        "[BASE HTTP SERVER]: slow {0} request for {1} from {2} took {3} ms", requestMethod, uriString, request.RemoteIPEndPoint.ToString(), tickdiff);
             }
         }
 
@@ -771,7 +797,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// </summary>
         /// <param name="request"></param>
         /// <param name="response"></param>
-        private byte[] HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response)
+        private void HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response)
         {
             Stream requestStream = request.InputStream;
 
@@ -790,23 +816,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody);
             }
-            catch (XmlException e)
+            catch (XmlException)
             {
-                if (DebugLevel >= 1)
-                {
-                    if (DebugLevel >= 2)
-                        m_log.Warn(
-                            string.Format(
-                                "[BASE HTTP SERVER]: Got XMLRPC request with invalid XML from {0}.  XML was '{1}'.  Sending blank response.  Exception ",
-                                request.RemoteIPEndPoint, requestBody),
-                            e);
-                    else
-                    {
-                        m_log.WarnFormat(
-                            "[BASE HTTP SERVER]: Got XMLRPC request with invalid XML from {0}, length {1}.  Sending blank response.",
-                            request.RemoteIPEndPoint, requestBody.Length);
-                    }
-                }
             }
 
             if (xmlRprcRequest != null)
@@ -876,7 +887,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                             String.Format("Requested method [{0}] not found", methodName));
                     }
 
-                    response.ContentType = "text/xml";
                     responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);
                 }
                 else
@@ -886,25 +896,82 @@ namespace OpenSim.Framework.Servers.HttpServer
                     response.StatusCode = 404;
                     response.StatusDescription = "Not Found";
                     response.ProtocolVersion = "HTTP/1.0";
-                    responseString = "Not found";
+                    byte[] buf = Encoding.UTF8.GetBytes("Not found");
                     response.KeepAlive = false;
 
                     m_log.ErrorFormat(
                         "[BASE HTTP SERVER]: Handler not found for http request {0} {1}",
                         request.HttpMethod, request.Url.PathAndQuery);
+
+                    response.SendChunked = false;
+                    response.ContentLength64 = buf.Length;
+                    response.ContentEncoding = Encoding.UTF8;
+
+                    try
+                    {
+                        response.OutputStream.Write(buf, 0, buf.Length);
+                    }
+                    catch (Exception ex)
+                    {
+                        m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message);
+                    }
+                    finally
+                    {
+                        try
+                        {
+                            response.Send();
+                            //response.FreeContext();
+                        }
+                        catch (SocketException e)
+                        {
+                            // This has to be here to prevent a Linux/Mono crash
+                            m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                        }
+                        catch (IOException e)
+                        {
+                            m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                        }
+                    }
+                    return;
+                    //responseString = "Error";
                 }
             }
 
+            response.ContentType = "text/xml";
+
             byte[] buffer = Encoding.UTF8.GetBytes(responseString);
 
             response.SendChunked = false;
             response.ContentLength64 = buffer.Length;
             response.ContentEncoding = Encoding.UTF8;
-
-            return buffer;
+            try
+            {
+                response.OutputStream.Write(buffer, 0, buffer.Length);
+            }
+            catch (Exception ex)
+            {
+                m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message);
+            }
+            finally
+            {
+                try
+                {
+                    response.Send();
+                    //response.FreeContext();
+                }
+                catch (SocketException e)
+                {
+                    // This has to be here to prevent a Linux/Mono crash
+                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                }
+                catch (IOException e)
+                {
+                    m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                }
+            }
         }
 
-        private byte[] HandleLLSDRequests(OSHttpRequest request, OSHttpResponse response)
+        private void HandleLLSDRequests(OSHttpRequest request, OSHttpResponse response)
         {
             //m_log.Warn("[BASE HTTP SERVER]: We've figured out it's a LLSD Request");
             Stream requestStream = request.InputStream;
@@ -990,7 +1057,34 @@ namespace OpenSim.Framework.Servers.HttpServer
             response.ContentEncoding = Encoding.UTF8;
             response.KeepAlive = true;
 
-            return buffer;
+            try
+            {
+                response.OutputStream.Write(buffer, 0, buffer.Length);
+            }
+            catch (Exception ex)
+            {
+                m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message);
+            }
+            finally
+            {
+                //response.OutputStream.Close();
+                try
+                {
+                    response.Send();
+                    response.OutputStream.Flush();
+                    //response.FreeContext();
+                    //response.OutputStream.Close();
+                }
+                catch (IOException e)
+                {
+                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD IOException {0}.", e);
+                }
+                catch (SocketException e)
+                {
+                    // This has to be here to prevent a Linux/Mono crash
+                    m_log.WarnFormat("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                }
+            }
         }
 
         private byte[] BuildLLSDResponse(OSHttpRequest request, OSHttpResponse response, OSD llsdResponse)
@@ -1240,8 +1334,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                     catch (SocketException f)
                     {
                         // This has to be here to prevent a Linux/Mono crash
-                        m_log.Warn(
-                            String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", f.Message), f);
+                        m_log.WarnFormat(
+                            "[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", f);
                     }
                 }
                 catch(Exception)
@@ -1255,7 +1349,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         }
 
-        public byte[] HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
+        public void HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
         {
 //            m_log.DebugFormat(
 //                "[BASE HTTP SERVER]: HandleHTTPRequest for request to {0}, method {1}",
@@ -1265,14 +1359,15 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 case "OPTIONS":
                     response.StatusCode = (int)OSHttpStatusCode.SuccessOk;
-                    return null;
+                    return;
 
                 default:
-                    return HandleContentVerbs(request, response);
+                    HandleContentVerbs(request, response);
+                    return;
             }
         }
 
-        private byte[] HandleContentVerbs(OSHttpRequest request, OSHttpResponse response)
+        private void HandleContentVerbs(OSHttpRequest request, OSHttpResponse response)
         {
 //            m_log.DebugFormat("[BASE HTTP SERVER]: HandleContentVerbs for request to {0}", request.RawUrl);
 
@@ -1288,8 +1383,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             // to display the form, or process it.
             // a better way would be nifty.
 
-            byte[] buffer;
-
             Stream requestStream = request.InputStream;
 
             Encoding encoding = Encoding.UTF8;
@@ -1350,14 +1443,14 @@ namespace OpenSim.Framework.Servers.HttpServer
                 if (foundHandler)
                 {
                     Hashtable responsedata1 = requestprocessor(keysvals);
-                    buffer = DoHTTPGruntWork(responsedata1,response);
+                    DoHTTPGruntWork(responsedata1,response);
 
                     //SendHTML500(response);
                 }
                 else
                 {
 //                    m_log.Warn("[BASE HTTP SERVER]: Handler Not Found");
-                    buffer = SendHTML404(response, host);
+                    SendHTML404(response, host);
                 }
             }
             else
@@ -1367,18 +1460,16 @@ namespace OpenSim.Framework.Servers.HttpServer
                 if (foundHandler)
                 {
                     Hashtable responsedata2 = requestprocessor(keysvals);
-                    buffer = DoHTTPGruntWork(responsedata2, response);
+                    DoHTTPGruntWork(responsedata2, response);
 
                     //SendHTML500(response);
                 }
                 else
                 {
 //                    m_log.Warn("[BASE HTTP SERVER]: Handler Not Found2");
-                    buffer = SendHTML404(response, host);
+                    SendHTML404(response, host);
                 }
             }
-
-            return buffer;
         }
 
         private bool TryGetHTTPHandlerPathBased(string path, out GenericHTTPMethod httpHandler)
@@ -1446,13 +1537,14 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
-        internal byte[] DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response)
+        internal void DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response)
         {
             //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
             int responsecode = (int)responsedata["int_response_code"];
             string responseString = (string)responsedata["str_response_string"];
             string contentType = (string)responsedata["content_type"];
 
+
             if (responsedata.ContainsKey("error_status_text"))
             {
                 response.StatusDescription = (string)responsedata["error_status_text"];
@@ -1516,10 +1608,38 @@ namespace OpenSim.Framework.Servers.HttpServer
             response.ContentLength64 = buffer.Length;
             response.ContentEncoding = Encoding.UTF8;
 
-            return buffer;
+            try
+            {
+                response.OutputStream.Write(buffer, 0, buffer.Length);
+            }
+            catch (Exception ex)
+            {
+                m_log.Warn("[HTTPD]: Error - " + ex.Message);
+            }
+            finally
+            {
+                //response.OutputStream.Close();
+                try
+                {
+                    response.OutputStream.Flush();
+                    response.Send();
+
+                    //if (!response.KeepAlive && response.ReuseContext)
+                    //    response.FreeContext();
+                }
+                catch (SocketException e)
+                {
+                    // This has to be here to prevent a Linux/Mono crash
+                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                }
+                catch (IOException e)
+                {
+                    m_log.Warn("[BASE HTTP SERVER]: XmlRpcRequest issue: " + e.Message);
+                }
+            }
         }
 
-        public byte[] SendHTML404(OSHttpResponse response, string host)
+        public void SendHTML404(OSHttpResponse response, string host)
         {
             // I know this statuscode is dumb, but the client doesn't respond to 404s and 500s
             response.StatusCode = 404;
@@ -1532,10 +1652,31 @@ namespace OpenSim.Framework.Servers.HttpServer
             response.ContentLength64 = buffer.Length;
             response.ContentEncoding = Encoding.UTF8;
 
-            return buffer;
+            try
+            {
+                response.OutputStream.Write(buffer, 0, buffer.Length);
+            }
+            catch (Exception ex)
+            {
+                m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message);
+            }
+            finally
+            {
+                //response.OutputStream.Close();
+                try
+                {
+                    response.Send();
+                    //response.FreeContext();
+                }
+                catch (SocketException e)
+                {
+                    // This has to be here to prevent a Linux/Mono crash
+                    m_log.WarnFormat("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                }
+            }
         }
 
-        public byte[] SendHTML500(OSHttpResponse response)
+        public void SendHTML500(OSHttpResponse response)
         {
             // I know this statuscode is dumb, but the client doesn't respond to 404s and 500s
             response.StatusCode = (int)OSHttpStatusCode.SuccessOk;
@@ -1547,8 +1688,28 @@ namespace OpenSim.Framework.Servers.HttpServer
             response.SendChunked = false;
             response.ContentLength64 = buffer.Length;
             response.ContentEncoding = Encoding.UTF8;
-
-            return buffer;
+            try
+            {
+                response.OutputStream.Write(buffer, 0, buffer.Length);
+            }
+            catch (Exception ex)
+            {
+                m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message);
+            }
+            finally
+            {
+                //response.OutputStream.Close();
+                try
+                {
+                    response.Send();
+                    //response.FreeContext();
+                }
+                catch (SocketException e)
+                {
+                    // This has to be here to prevent a Linux/Mono crash
+                    m_log.WarnFormat("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux.", e);
+                }
+            }
         }
 
         public void Start()
@@ -1558,9 +1719,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private void StartHTTP()
         {
-            m_log.InfoFormat(
-                "[BASE HTTP SERVER]: Starting {0} server on port {1}", UseSSL ? "HTTPS" : "HTTP", Port);
-
             try
             {
                 //m_httpListener = new HttpListener();
@@ -1628,7 +1786,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public void httpServerException(object source, Exception exception)
         {
-            m_log.Error(String.Format("[BASE HTTP SERVER]: {0} had an exception: {1} ", source.ToString(), exception.Message), exception);
+            m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
            /*
             if (HTTPDRunning)// && NotSocketErrors > 5)
             {

OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs

@@ -45,16 +45,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private readonly string m_path;
 
-        public string Name { get; private set; }
-
-        public string Description { get; private set; }
-
-        protected BaseRequestHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
-
-        protected BaseRequestHandler(string httpMethod, string path, string name, string description)
+        protected BaseRequestHandler(string httpMethod, string path)
         {
-            Name = name;
-            Description = description;
             m_httpMethod = httpMethod;
             m_path = path;
         }

OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs

@@ -34,9 +34,8 @@ namespace OpenSim.Framework.Servers.HttpServer
         public abstract byte[] Handle(string path, Stream request,
                                       IOSHttpRequest httpRequest, IOSHttpResponse httpResponse);
 
-        protected BaseStreamHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
-
-        protected BaseStreamHandler(string httpMethod, string path, string name, string description)
-            : base(httpMethod, path, name, description) {}
+        protected BaseStreamHandler(string httpMethod, string path) : base(httpMethod, path)
+        {
+        }
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs

@@ -36,15 +36,6 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         private BinaryMethod m_method;
 
-        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod)
-            : this(httpMethod, path, binaryMethod, null, null) {}
-
-        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod, string name, string description)
-            : base(httpMethod, path, name, description)
-        {
-            m_method = binaryMethod;
-        }
-
         public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             byte[] data = ReadFully(request);
@@ -54,6 +45,12 @@ namespace OpenSim.Framework.Servers.HttpServer
             return Encoding.UTF8.GetBytes(responseString);
         }
 
+        public BinaryStreamHandler(string httpMethod, string path, BinaryMethod binaryMethod)
+            : base(httpMethod, path)
+        {
+            m_method = binaryMethod;
+        }
+
         private static byte[] ReadFully(Stream stream)
         {
             byte[] buffer = new byte[1024];
@@ -73,4 +70,4 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs

@@ -128,5 +128,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// <param name="value">string containing the header field
         /// value</param>
         void AddHeader(string key, string value);
+
+        /// <summary>
+        /// Send the response back to the remote client
+        /// </summary>
+        void Send();
     }
-}
+}
+

OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs

@@ -32,25 +32,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 {
     public interface IRequestHandler
     {
-
-        /// <summary>
-        /// Name for this handler.
-        /// </summary>
-        /// <remarks>
-        /// Used for diagnostics.  The path doesn't always describe what the handler does.  Can be null if none
-        /// specified.
-        /// </remarks>
-        string Name { get; }
-
-        /// <summary>
-        /// Description for this handler.
-        /// </summary>
-        /// <remarks>
-        /// Used for diagnostics.  The path doesn't always describe what the handler does.  Can be null if none
-        /// specified.
-        /// </remarks>
-        string Description { get; }
-
         // Return response content type
         string ContentType { get; }
 
@@ -77,4 +58,4 @@ namespace OpenSim.Framework.Servers.HttpServer
     {
         Hashtable Handle(string path, Hashtable request);
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs

@@ -107,7 +107,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public bool IsSecured
         {
-            get { return _context.IsSecured; }
+            get { return _context.Secured; }
         }
 
         public bool KeepAlive

OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs

@@ -321,12 +321,13 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             _httpResponse.Body.Flush();
             _httpResponse.Send();
+            
         }
-
         public void FreeContext()
         {
             if (_httpClientContext != null)
                 _httpClientContext.Close();
         }
+        
     }
 }

OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs

@@ -28,252 +28,143 @@
 namespace OpenSim.Framework.Servers.HttpServer
 {
     /// <summary>
-    /// HTTP status codes (almost) as defined by W3C in http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html and IETF in http://tools.ietf.org/html/rfc6585
+    /// HTTP status codes (almost) as defined by W3C in
+    /// http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
     /// </summary>
-    public enum OSHttpStatusCode : int
+    public enum OSHttpStatusCode: int
     {
-        #region 1xx Informational status codes providing a provisional response.
+        // 1xx Informational status codes providing a provisional
+        // response.
+        // 100 Tells client that to keep on going sending its request
+        InfoContinue                          = 100,
+        // 101 Server understands request, proposes to switch to different
+        // application level protocol
+        InfoSwitchingProtocols                = 101,
 
-        /// <summary>
-        /// 100 Tells client that to keep on going sending its request
-        /// </summary>
-        InfoContinue = 100,
 
-        /// <summary>
-        /// 101 Server understands request, proposes to switch to different application level protocol
-        /// </summary>
-        InfoSwitchingProtocols = 101,
+        // 2xx Success codes
+        // 200 Request successful
+        SuccessOk                             = 200,
+        // 201 Request successful, new resource created
+        SuccessOkCreated                      = 201,
+        // 202 Request accepted, processing still on-going
+        SuccessOkAccepted                     = 202,
+        // 203 Request successful, meta information not authoritative
+        SuccessOkNonAuthoritativeInformation  = 203,
+        // 204 Request successful, nothing to return in the body
+        SuccessOkNoContent                    = 204,
+        // 205 Request successful, reset displayed content
+        SuccessOkResetContent                 = 205,
+        // 206 Request successful, partial content returned
+        SuccessOkPartialContent               = 206,
 
-        #endregion
+        // 3xx Redirect code: user agent needs to go somewhere else
+        // 300 Redirect: different presentation forms available, take
+        // a pick
+        RedirectMultipleChoices               = 300,
+        // 301 Redirect: requested resource has moved and now lives
+        // somewhere else
+        RedirectMovedPermanently              = 301,
+        // 302 Redirect: Resource temporarily somewhere else, location
+        // might change
+        RedirectFound                         = 302,
+        // 303 Redirect: See other as result of a POST
+        RedirectSeeOther                      = 303,
+        // 304 Redirect: Resource still the same as before
+        RedirectNotModified                   = 304,
+        // 305 Redirect: Resource must be accessed via proxy provided
+        // in location field
+        RedirectUseProxy                      = 305,
+        // 307 Redirect: Resource temporarily somewhere else, location
+        // might change
+        RedirectMovedTemporarily              = 307,
 
-        #region 2xx Success codes
-
-        /// <summary>
-        /// 200 Request successful
-        /// </summary>
-        SuccessOk = 200,
-
-        /// <summary>
-        /// 201 Request successful, new resource created
-        /// </summary>
-        SuccessOkCreated = 201,
-
-        /// <summary>
-        /// 202 Request accepted, processing still on-going
-        /// </summary>
-        SuccessOkAccepted = 202,
-
-        /// <summary>
-        /// 203 Request successful, meta information not authoritative
-        /// </summary>
-        SuccessOkNonAuthoritativeInformation = 203,
-
-        /// <summary>
-        /// 204 Request successful, nothing to return in the body
-        /// </summary>
-        SuccessOkNoContent = 204,
-
-        /// <summary>
-        /// 205 Request successful, reset displayed content
-        /// </summary>
-        SuccessOkResetContent = 205,
-
-        /// <summary>
-        /// 206 Request successful, partial content returned
-        /// </summary>
-        SuccessOkPartialContent = 206,
-
-        #endregion
-
-        #region 3xx Redirect code: user agent needs to go somewhere else
-
-        /// <summary>
-        /// 300 Redirect: different presentation forms available, take a pick
-        /// </summary>
-        RedirectMultipleChoices = 300,
-        
-        /// <summary>
-        /// 301 Redirect: requested resource has moved and now lives somewhere else
-        /// </summary>
-        RedirectMovedPermanently = 301,
-
-        /// <summary>
-        /// 302 Redirect: Resource temporarily somewhere else, location might change
-        /// </summary>
-        RedirectFound = 302,
-
-        /// <summary>
-        /// 303 Redirect: See other as result of a POST
-        /// </summary>
-        RedirectSeeOther = 303,
-
-        /// <summary>
-        /// 304 Redirect: Resource still the same as before
-        /// </summary>
-        RedirectNotModified = 304,
-
-        /// <summary>
-        /// 305 Redirect: Resource must be accessed via proxy provided in location field
-        /// </summary>
-        RedirectUseProxy = 305,
-
-        /// <summary>
-        /// 307 Redirect: Resource temporarily somewhere else, location might change
-        /// </summary>
-        RedirectMovedTemporarily = 307,
-
-        #endregion
-
-        #region 4xx Client error: the client borked the request
-
-        /// <summary>
-        /// 400 Client error: bad request, server does not grok what the client wants
-        /// </summary>
-        ClientErrorBadRequest = 400,
-
-        /// <summary>
-        /// 401 Client error: the client is not authorized, response provides WWW-Authenticate header field with a challenge
-        /// </summary>
-        ClientErrorUnauthorized = 401,
-
-        /// <summary>
-        /// 402 Client error: Payment required (reserved for future use)
-        /// </summary>
-        ClientErrorPaymentRequired = 402,
-
-        /// <summary>
-        /// 403 Client error: Server understood request, will not deliver, do not try again.
-        ClientErrorForbidden = 403,
-
-        /// <summary>
-        /// 404 Client error: Server cannot find anything matching the client request.
-        /// </summary>
-        ClientErrorNotFound = 404,
-
-        /// <summary>
-        /// 405 Client error: The method specified by the client in the request is not allowed for the resource requested
-        /// </summary>
-        ClientErrorMethodNotAllowed = 405,
-
-        /// <summary>
-        /// 406 Client error: Server cannot generate suitable response for the resource and content characteristics requested by the client
-        /// </summary>
-        ClientErrorNotAcceptable = 406,
-
-        /// <summary>
-        /// 407 Client error: Similar to 401, Server requests that client authenticate itself with the proxy first
-        /// </summary>
-        ClientErrorProxyAuthRequired = 407,
-
-        /// <summary>
-        /// 408 Client error: Server got impatient with client and decided to give up waiting for the client's request to arrive
-        /// </summary>
-        ClientErrorRequestTimeout = 408,
-
-        /// <summary>
-        /// 409 Client error: Server could not fulfill the request for a resource as there is a conflict with the current state of the resource but thinks client can do something about this
-        /// </summary>
-        ClientErrorConflict = 409,
-
-        /// <summary>
-        /// 410 Client error: The resource has moved somewhere else, but server has no clue where.
-        /// </summary>
-        ClientErrorGone = 410,
-
-        /// <summary>
-        /// 411 Client error: The server is picky again and insists on having a content-length header field in the request
-        /// </summary>
-        ClientErrorLengthRequired = 411,
-
-        /// <summary>
-        /// 412 Client error: one or more preconditions supplied in the client's request is false
-        /// </summary>
-        ClientErrorPreconditionFailed = 412,
-
-        /// <summary>
-        /// 413 Client error: For fear of reflux, the server refuses to swallow that much data.
-        /// </summary>
-        ClientErrorRequestEntityToLarge = 413,
-
-        /// <summary>
-        /// 414 Client error: The server considers the Request-URI to be indecently long and refuses to even look at it.
-        /// </summary>
-        ClientErrorRequestURITooLong = 414,
-
-        /// <summary>
-        /// 415 Client error: The server has no clue about the media type requested by the client (contrary to popular belief it is not a warez server)
-        /// </summary>
-        ClientErrorUnsupportedMediaType = 415,
-
-        /// <summary>
-        /// 416 Client error: The requested range cannot be delivered by the server.
-        /// </summary>
+        // 4xx Client error: the client borked the request
+        // 400 Client error: bad request, server does not grok what
+        // the client wants
+        ClientErrorBadRequest                 = 400,
+        // 401 Client error: the client is not authorized, response
+        // provides WWW-Authenticate header field with a challenge
+        ClientErrorUnauthorized               = 401,
+        // 402 Client error: Payment required (reserved for future use)
+        ClientErrorPaymentRequired            = 402,
+        // 403 Client error: Server understood request, will not
+        // deliver, do not try again.
+        ClientErrorForbidden                  = 403,
+        // 404 Client error: Server cannot find anything matching the
+        // client request.
+        ClientErrorNotFound                   = 404,
+        // 405 Client error: The method specified by the client in the
+        // request is not allowed for the resource requested
+        ClientErrorMethodNotAllowed           = 405,
+        // 406 Client error: Server cannot generate suitable response
+        // for the resource and content characteristics requested by
+        // the client
+        ClientErrorNotAcceptable              = 406,
+        // 407 Client error: Similar to 401, Server requests that
+        // client authenticate itself with the proxy first
+        ClientErrorProxyAuthRequired          = 407,
+        // 408 Client error: Server got impatient with client and
+        // decided to give up waiting for the client's request to
+        // arrive
+        ClientErrorRequestTimeout             = 408,
+        // 409 Client error: Server could not fulfill the request for
+        // a resource as there is a conflict with the current state of
+        // the resource but thinks client can do something about this
+        ClientErrorConflict                   = 409,
+        // 410 Client error: The resource has moved somewhere else,
+        // but server has no clue where.
+        ClientErrorGone                       = 410,
+        // 411 Client error: The server is picky again and insists on
+        // having a content-length header field in the request
+        ClientErrorLengthRequired             = 411,
+        // 412 Client error: one or more preconditions supplied in the
+        // client's request is false
+        ClientErrorPreconditionFailed         = 412,
+        // 413 Client error: For fear of reflux, the server refuses to
+        // swallow that much data.
+        ClientErrorRequestEntityToLarge       = 413,
+        // 414 Client error: The server considers the Request-URI to
+        // be indecently long and refuses to even look at it.
+        ClientErrorRequestURITooLong          = 414,
+        // 415 Client error: The server has no clue about the media
+        // type requested by the client (contrary to popular belief it
+        // is not a warez server)
+        ClientErrorUnsupportedMediaType       = 415,
+        // 416 Client error: The requested range cannot be delivered
+        // by the server.
         ClientErrorRequestRangeNotSatisfiable = 416,
+        // 417 Client error: The expectations of the client as
+        // expressed in one or more Expect header fields cannot be met
+        // by the server, the server is awfully sorry about this.
+        ClientErrorExpectationFailed          = 417,
+        // 499 Client error: Wildcard error.
+        ClientErrorJoker                      = 499,
 
-        /// <summary>
-        /// 417 Client error: The expectations of the client as expressed in one or more Expect header fields cannot be met by the server, the server is awfully sorry about this.
-        /// </summary>
-        ClientErrorExpectationFailed = 417,
-
-        /// <summary>
-        /// 428 Client error :The 428 status code indicates that the origin server requires the request to be conditional.
-        /// </summary>
-        ClientErrorPreconditionRequired = 428,
-
-        /// <summary>
-        /// 429 Client error: The 429 status code indicates that the user has sent too many requests in a given amount of time ("rate limiting").
-        /// </summary>
-        ClientErrorTooManyRequests = 429,
-
-        /// <summary>
-        /// 431 Client error: The 431 status code indicates that the server is unwilling to process the request because its header fields are too large.  The request MAY be resubmitted after reducing the size of the request header fields.
-        /// </summary>
-        ClientErrorRequestHeaderFieldsTooLarge = 431,
-
-        /// <summary>
-        /// 499 Client error: Wildcard error.
-        /// </summary>
-        ClientErrorJoker = 499,
-
-        #endregion
-
-        #region 5xx Server errors (rare)
-
-        /// <summary>
-        /// 500 Server error: something really strange and unexpected happened
-        /// </summary>
-        ServerErrorInternalError = 500,
-
-        /// <summary>
-        /// 501 Server error: The server does not do the functionality required to carry out the client request. not at all. certainly not before breakfast. but also not after breakfast.
-        /// </summary>
-        ServerErrorNotImplemented = 501,
-
-        /// <summary>
-        /// 502 Server error: While acting as a proxy or a gateway, the server got ditched by the upstream server and as a consequence regretfully cannot fulfill the client's request
-        /// </summary>
-        ServerErrorBadGateway = 502,
-
-        /// <summary>
-        /// 503 Server error: Due to unforseen circumstances the server cannot currently deliver the service requested. Retry-After header might indicate when to try again.
-        /// </summary>
-        ServerErrorServiceUnavailable = 503,
-
-        /// <summary>
-        /// 504 Server error: The server blames the upstream server for not being able to deliver the service requested and claims that the upstream server is too slow delivering the goods.
-        /// </summary>
-        ServerErrorGatewayTimeout = 504,
-
-        /// <summary>
-        /// 505 Server error: The server does not support the HTTP version conveyed in the client's request.
-        /// </summary>
-        ServerErrorHttpVersionNotSupported = 505,
-
-        /// <summary>
-        /// 511 Server error: The 511 status code indicates that the client needs to authenticate to gain network access.
-        /// </summary>
-        ServerErrorNetworkAuthenticationRequired = 511,
-
-        #endregion
+        // 5xx Server errors (rare)
+        // 500 Server error: something really strange and unexpected
+        // happened
+        ServerErrorInternalError              = 500,
+        // 501 Server error: The server does not do the functionality
+        // required to carry out the client request. not at
+        // all. certainly not before breakfast. but also not after
+        // breakfast.
+        ServerErrorNotImplemented             = 501,
+        // 502 Server error: While acting as a proxy or a gateway, the
+        // server got ditched by the upstream server and as a
+        // consequence regretfully cannot fulfill the client's request
+        ServerErrorBadGateway                 = 502,
+        // 503 Server error: Due to unforseen circumstances the server
+        // cannot currently deliver the service requested. Retry-After
+        // header might indicate when to try again.
+        ServerErrorServiceUnavailable         = 503,
+        // 504 Server error: The server blames the upstream server
+        // for not being able to deliver the service requested and
+        // claims that the upstream server is too slow delivering the
+        // goods.
+        ServerErrorGatewayTimeout             = 504,
+        // 505 Server error: The server does not support the HTTP
+        // version conveyed in the client's request.
+        ServerErrorHttpVersionNotSupported    = 505,
     }
 }

OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs

@@ -28,7 +28,6 @@
 using System;
 using System.Collections;
 using OpenMetaverse;
-
 namespace OpenSim.Framework.Servers.HttpServer
 {
     public delegate void RequestMethod(UUID requestID, Hashtable request);
@@ -45,11 +44,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         public NoEventsMethod NoEvents;
         public RequestMethod Request;
         public UUID Id;
-
-        public PollServiceEventArgs(
-            RequestMethod pRequest,
-            HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,
-            UUID pId)
+        public PollServiceEventArgs(RequestMethod pRequest, HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,UUID pId)
         {
             Request = pRequest;
             HasEvents = pHasEvents;
@@ -58,4 +53,4 @@ namespace OpenSim.Framework.Servers.HttpServer
             Id = pId;
         }
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs

@@ -31,6 +31,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
+
     public class PollServiceHttpRequest
     {
         public readonly PollServiceEventArgs PollServiceArgs;
@@ -38,9 +39,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         public readonly IHttpRequest Request;
         public readonly int RequestTime;
         public readonly UUID RequestID;
-
-        public PollServiceHttpRequest(
-            PollServiceEventArgs pPollServiceArgs, IHttpClientContext pHttpContext, IHttpRequest pRequest)
+        public PollServiceHttpRequest(PollServiceEventArgs pPollServiceArgs, IHttpClientContext pHttpContext, IHttpRequest pRequest)
         {
             PollServiceArgs = pPollServiceArgs;
             HttpContext = pHttpContext;
@@ -49,4 +48,4 @@ namespace OpenSim.Framework.Servers.HttpServer
             RequestID = UUID.Random();
         }
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs

@@ -32,7 +32,6 @@ using System.Reflection;
 using log4net;
 using HttpServer;
 using OpenSim.Framework;
-using OpenSim.Framework.Monitoring;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -67,7 +66,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                         ThreadPriority.Normal,
                         false,
                         true,
-                        null,
                         int.MaxValue);
             }
 
@@ -77,7 +75,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                 ThreadPriority.Normal,
                 false,
                 true,
-                null,
                 1000 * 60 * 10);
         }
 
@@ -141,8 +138,9 @@ namespace OpenSim.Framework.Servers.HttpServer
             foreach (object o in m_requests)
             {
                 PollServiceHttpRequest req = (PollServiceHttpRequest) o;
-                PollServiceWorkerThread.DoHTTPGruntWork(
-                    m_server, req, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                m_server.DoHTTPGruntWork(
+                    req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),
+                    new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
             }
 
             m_requests.Clear();
@@ -151,7 +149,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             {
                 t.Abort();
             }
-            
             m_running = false;
         }
     }

OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs

@@ -34,7 +34,6 @@ using HttpServer;
 using OpenMetaverse;
 using System.Reflection;
 using log4net;
-using OpenSim.Framework.Monitoring;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -91,16 +90,15 @@ namespace OpenSim.Framework.Servers.HttpServer
                         }
 
                         Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
-                        DoHTTPGruntWork(m_server, req, responsedata);
+                        m_server.DoHTTPGruntWork(responsedata,
+                                                 new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
                     }
                     else
                     {
                         if ((Environment.TickCount - req.RequestTime) > m_timeout)
                         {
-                            DoHTTPGruntWork(
-                                m_server,
-                                req,
-                                req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                            m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),
+                                                     new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
                         }
                         else
                         {
@@ -121,45 +119,5 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             m_request.Enqueue(pPollServiceHttpRequest);
         }
-
-        /// <summary>
-        /// FIXME: This should be part of BaseHttpServer
-        /// </summary>
-        internal static void DoHTTPGruntWork(BaseHttpServer server, PollServiceHttpRequest req, Hashtable responsedata)
-        {
-            OSHttpResponse response
-                = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
-
-            byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
-
-            response.SendChunked = false;
-            response.ContentLength64 = buffer.Length;
-            response.ContentEncoding = Encoding.UTF8;
-
-            try
-            {
-                response.OutputStream.Write(buffer, 0, buffer.Length);
-            }
-            catch (Exception ex)
-            {
-                m_log.Warn(string.Format("[POLL SERVICE WORKER THREAD]: Error ", ex));
-            }
-            finally
-            {
-                //response.OutputStream.Close();
-                try
-                {
-                    response.OutputStream.Flush();
-                    response.Send();
-
-                    //if (!response.KeepAlive && response.ReuseContext)
-                    //    response.FreeContext();
-                }
-                catch (Exception e)
-                {
-                    m_log.Warn(String.Format("[POLL SERVICE WORKER THREAD]: Error ", e));
-                }
-            }
-        }
     }
-}
+}

OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs

@@ -39,11 +39,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         private RestDeserialiseMethod<TRequest, TResponse> m_method;
 
         public RestDeserialiseHandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method)
-            : this(httpMethod, path, method, null, null) {}
-
-        public RestDeserialiseHandler(
-            string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method, string name, string description)
-            : base(httpMethod, path, name, description)
+            : base(httpMethod, path)
         {
             m_method = method;
         }

OpenSim/Framework/Servers/HttpServer/RestHTTPHandler.cs

@@ -38,25 +38,19 @@ namespace OpenSim.Framework.Servers.HttpServer
             get { return m_dhttpMethod; }
         }
 
-        public RestHTTPHandler(string httpMethod, string path, GenericHTTPMethod dhttpMethod)
-            : base(httpMethod, path)
-        {
-            m_dhttpMethod = dhttpMethod;
-        }
-
-        public RestHTTPHandler(
-            string httpMethod, string path, GenericHTTPMethod dhttpMethod, string name, string description)
-            : base(httpMethod, path, name, description)
-        {
-            m_dhttpMethod = dhttpMethod;
-        }
-
         public override Hashtable Handle(string path, Hashtable request)
         {
+
             string param = GetParam(path);
             request.Add("param", param);
             request.Add("path", path);
             return m_dhttpMethod(request);
         }
+
+        public RestHTTPHandler(string httpMethod, string path, GenericHTTPMethod dhttpMethod)
+            : base(httpMethod, path)
+        {
+            m_dhttpMethod = dhttpMethod;
+        }
     }
 }

OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs

@@ -39,15 +39,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             get { return m_restMethod; }
         }
 
-        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod)
-            : this(httpMethod, path, restMethod, null, null) {}
-
-        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod, string name, string description)
-            : base(httpMethod, path, name, description)
-        {
-            m_restMethod = restMethod;
-        }
-
         public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             Encoding encoding = Encoding.UTF8;
@@ -61,5 +52,10 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             return Encoding.UTF8.GetBytes(responseString);
         }
+
+        public RestStreamHandler(string httpMethod, string path, RestMethod restMethod) : base(httpMethod, path)
+        {
+            m_restMethod = restMethod;
+        }
     }
 }

OpenSim/Framework/Servers/MainServer.cs

@@ -25,209 +25,57 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Net;
 using log4net;
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Framework.Servers
 {
     public class MainServer
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static BaseHttpServer instance = null;
-        private static Dictionary<uint, BaseHttpServer> m_Servers = new Dictionary<uint, BaseHttpServer>();
+        private static Dictionary<uint, BaseHttpServer> m_Servers =
+                new Dictionary<uint, BaseHttpServer>();
 
-        /// <summary>
-        /// Control the printing of certain debug messages.
-        /// </summary>
-        /// <remarks>
-        /// If DebugLevel >= 1, then short warnings are logged when receiving bad input data.
-        /// If DebugLevel >= 2, then long warnings are logged when receiving bad input data.
-        /// If DebugLevel >= 3, then short notices about all incoming non-poll HTTP requests are logged.
-        /// </remarks>
-        public static int DebugLevel
-        {
-            get { return s_debugLevel; }
-            set
-            {
-                s_debugLevel = value;
-
-                lock (m_Servers)
-                    foreach (BaseHttpServer server in m_Servers.Values)
-                        server.DebugLevel = s_debugLevel;
-            }
-        }
-
-        private static int s_debugLevel;
-
-        /// <summary>
-        /// Set the main HTTP server instance.
-        /// </summary>
-        /// <remarks>
-        /// This will be used to register all handlers that listen to the default port.
-        /// </remarks>
-        /// <exception cref='Exception'>
-        /// Thrown if the HTTP server has not already been registered via AddHttpServer()
-        /// </exception>
         public static BaseHttpServer Instance
         {
             get { return instance; }
-
-            set
-            {
-                lock (m_Servers)
-                    if (!m_Servers.ContainsValue(value))
-                        throw new Exception("HTTP server must already have been registered to be set as the main instance");
-
-                instance = value;
-            }
+            set { instance = value; }
         }
 
-        /// <summary>
-        /// Get all the registered servers.
-        /// </summary>
-        /// <remarks>
-        /// Returns a copy of the dictionary so this can be iterated through without locking.
-        /// </remarks>
-        /// <value></value>
-        public static Dictionary<uint, BaseHttpServer> Servers
-        {
-            get { return new Dictionary<uint, BaseHttpServer>(m_Servers); }
-        }
-
-
-        public static void RegisterHttpConsoleCommands(ICommandConsole console)
-        {
-            console.Commands.AddCommand(
-                "Debug", false, "debug http", "debug http [<level>]",
-                "Turn on inbound non-poll http request debugging.",
-                  "If level <= 0, then no extra logging is done.\n"
-                + "If level >= 1, then short warnings are logged when receiving bad input data.\n"
-                + "If level >= 2, then long warnings are logged when receiving bad input data.\n"
-                + "If level >= 3, then short notices about all incoming non-poll HTTP requests are logged.\n"
-                + "If no level is specified then the current level is returned.",
-                HandleDebugHttpCommand);
-        }
-
-        /// <summary>
-        /// Turn on some debugging values for OpenSim.
-        /// </summary>
-        /// <param name="args"></param>
-        private static void HandleDebugHttpCommand(string module, string[] args)
-        {
-            if (args.Length == 3)
-            {
-                int newDebug;
-                if (int.TryParse(args[2], out newDebug))
-                {
-                    MainServer.DebugLevel = newDebug;
-                    MainConsole.Instance.OutputFormat("Debug http level set to {0}", newDebug);
-                }
-            }
-            else if (args.Length == 2)
-            {
-                MainConsole.Instance.OutputFormat("Current debug http level is {0}", MainServer.DebugLevel);
-            }
-            else
-            {
-                MainConsole.Instance.Output("Usage: debug http 0..3");
-            }
-        }
-
-        /// <summary>
-        /// Register an already started HTTP server to the collection of known servers.
-        /// </summary>
-        /// <param name='server'></param>
-        public static void AddHttpServer(BaseHttpServer server)
-        {
-            lock (m_Servers)
-            {
-                if (m_Servers.ContainsKey(server.Port))
-                    throw new Exception(string.Format("HTTP server for port {0} already exists.", server.Port));
-
-                m_Servers.Add(server.Port, server);
-            }
-        }
-
-        /// <summary>
-        /// Removes the http server listening on the given port.
-        /// </summary>
-        /// <remarks>
-        /// It is the responsibility of the caller to do clean up.
-        /// </remarks>
-        /// <param name='port'></param>
-        /// <returns></returns>
-        public static bool RemoveHttpServer(uint port)
-        {
-            lock (m_Servers)
-                return m_Servers.Remove(port);
-        }
-
-        /// <summary>
-        /// Does this collection of servers contain one with the given port?
-        /// </summary>
-        /// <remarks>
-        /// Unlike GetHttpServer, this will not instantiate a server if one does not exist on that port.
-        /// </remarks>
-        /// <param name='port'></param>
-        /// <returns>true if a server with the given port is registered, false otherwise.</returns>
-        public static bool ContainsHttpServer(uint port)
-        {
-            lock (m_Servers)
-                return m_Servers.ContainsKey(port);
-        }
-
-        /// <summary>
-        /// Get the default http server or an http server for a specific port.
-        /// </summary>
-        /// <remarks>
-        /// If the requested HTTP server doesn't already exist then a new one is instantiated and started.
-        /// </remarks>
-        /// <returns></returns>
-        /// <param name='port'>If 0 then the default HTTP server is returned.</param>
         public static IHttpServer GetHttpServer(uint port)
         {
-            return GetHttpServer(port, null);
+            return GetHttpServer(port,null);
+        }
+
+        public static void AddHttpServer(BaseHttpServer server)
+        {
+            m_Servers.Add(server.Port, server);
         }
 
-        /// <summary>
-        /// Get the default http server, an http server for a specific port
-        /// and/or an http server bound to a specific address
-        /// </summary>
-        /// <remarks>
-        /// If the requested HTTP server doesn't already exist then a new one is instantiated and started.
-        /// </remarks>
-        /// <returns></returns>
-        /// <param name='port'>If 0 then the default HTTP server is returned.</param>
-        /// <param name='ipaddr'>A specific IP address to bind to.  If null then the default IP address is used.</param>
         public static IHttpServer GetHttpServer(uint port, IPAddress ipaddr)
         {
             if (port == 0)
                 return Instance;
-            
             if (instance != null && port == Instance.Port)
                 return Instance;
 
-            lock (m_Servers)
-            {
-                if (m_Servers.ContainsKey(port))
-                    return m_Servers[port];
-
-                m_Servers[port] = new BaseHttpServer(port);
-
-                if (ipaddr != null)
-                    m_Servers[port].ListenIPAddress = ipaddr;
-
-                m_Servers[port].Start();
-
+            if (m_Servers.ContainsKey(port))
                 return m_Servers[port];
-            }
+
+            m_Servers[port] = new BaseHttpServer(port);
+
+            if (ipaddr != null)
+                m_Servers[port].ListenIPAddress = ipaddr;
+
+            m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port);
+            m_Servers[port].Start();
+
+            return m_Servers[port];
         }
     }
-}
+}

OpenSim/Framework/Servers/VersionInfo.cs

@@ -29,8 +29,8 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.7.5";
-        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
+        private const string VERSION_NUMBER = "0.7.3";
+        private const Flavour VERSION_FLAVOUR = Flavour.Extended;
 
         public enum Flavour
         {

OpenSim/Framework/Statistics/AssetStatsCollector.cs

@@ -28,7 +28,7 @@
 using System;
 using System.Timers;
 
-namespace OpenSim.Framework.Monitoring
+namespace OpenSim.Framework.Statistics
 {
     /// <summary>
     /// Asset service statistics collection

OpenSim/Framework/Statistics/BaseStatsCollector.cs

@@ -31,7 +31,8 @@ using System.Text;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
-namespace OpenSim.Framework.Monitoring
+
+namespace OpenSim.Framework.Statistics
 {
     /// <summary>
     /// Statistics which all collectors are interested in reporting
@@ -43,18 +44,14 @@ namespace OpenSim.Framework.Monitoring
             StringBuilder sb = new StringBuilder(Environment.NewLine);
             sb.Append("MEMORY STATISTICS");
             sb.Append(Environment.NewLine);
-
-            sb.AppendFormat(
-                "Allocated to OpenSim objects: {0} MB\n",
-                Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
-
-            sb.AppendFormat(
-                "OpenSim object memory churn : {0} MB/s\n",
-                Math.Round((MemoryWatchdog.AverageMemoryChurn * 1000) / 1024.0 / 1024, 3));
-
-            sb.AppendFormat(
-                "Process memory              : {0} MB\n",
-                Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0));
+            sb.Append(
+                string.Format(
+                    "Allocated to OpenSim objects: {0} MB\n",
+                    Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0)));
+            sb.Append(
+                string.Format(
+                    "Process memory              : {0} MB\n",
+                    Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0)));
 
             return sb.ToString();
         }

OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Framework.Monitoring.Interfaces
+namespace OpenSim.Framework.Statistics.Interfaces
 {
     /// <summary>
     /// Implemented by objects which allow statistical information to be pulled from them.

OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Framework.Monitoring
+namespace OpenSim.Framework.Statistics
 {
     /// <summary>
     /// Implemented by classes which collect up non-viewer statistical information

OpenSim/Framework/Statistics/SimExtraStatsCollector.cs

@@ -28,11 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenSim.Framework.Monitoring.Interfaces;
 
-namespace OpenSim.Framework.Monitoring
+using OpenMetaverse;
+using OpenSim.Framework.Statistics.Interfaces;
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Framework.Statistics
 {
     /// <summary>
     /// Collects sim statistics which aren't already being collected for the linden viewer's statistics pane

OpenSim/Framework/Statistics/StatsManager.cs

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Framework.Monitoring
+namespace OpenSim.Framework.Statistics
 {
     /// <summary>
     /// Singleton used to provide access to statistics reporters
@@ -34,12 +34,14 @@ namespace OpenSim.Framework.Monitoring
     {
         private static AssetStatsCollector assetStats;
         private static UserStatsCollector userStats;
-        private static SimExtraStatsCollector simExtraStats = new SimExtraStatsCollector();
+        private static SimExtraStatsCollector simExtraStats;
 
         public static AssetStatsCollector AssetStats { get { return assetStats; } }
         public static UserStatsCollector UserStats { get { return userStats; } }
         public static SimExtraStatsCollector SimExtraStats { get { return simExtraStats; } }
 
+        private StatsManager() {}
+
         /// <summary>
         /// Start collecting statistics related to assets.
         /// Should only be called once.
@@ -61,5 +63,16 @@ namespace OpenSim.Framework.Monitoring
 
             return userStats;
         }
+
+        /// <summary>
+        /// Start collecting extra sim statistics apart from those collected for the client.
+        /// Should only be called once.
+        /// </summary>
+        public static SimExtraStatsCollector StartCollectingSimExtraStats()
+        {
+            simExtraStats = new SimExtraStatsCollector();
+
+            return simExtraStats;
+        }
     }
-}
+}

OpenSim/Framework/Statistics/UserStatsCollector.cs

@@ -27,7 +27,7 @@
 
 using System.Timers;
 
-namespace OpenSim.Framework.Monitoring
+namespace OpenSim.Framework.Statistics
 {
     /// <summary>
     /// Collects user service statistics