Parameterize sleeps in LSL functions.

This had been disabled by 30b7863 (Fri Feb 27 2015).
Relates to http://opensimulator.org/mantis/view.php?id=6835

.gitignore

@@ -54,6 +54,7 @@ bin/Regions/*
 bin/UserAssets
 bin/assetcache
 bin/maptiles
+bin/bakes
 bin/estate_settings.xml
 bin/config-include/CenomeCache.ini
 bin/config-include/FlotsamCache.ini

CONTRIBUTORS.txt

@@ -72,10 +72,12 @@ what it is today.
 * Allen Kerensky
 * BigFootAg
 * BlueWall Slade
+* bobshaffer2
 * brianw/Sir_Ahzz
 * CharlieO
 * ChrisDown
 * Chris Yeoh (IBM)
+* cinderblocks
 * controlbreak
 * coyled
 * ctrlaltdavid (David Rowe)
@@ -88,7 +90,9 @@ what it is today.
 * DoranZemlja
 * dr0b3rts
 * dslake
+* eeyore
 * FredoChaplin
+* FreakyTech
 * Garmin Kawaguichi
 * Gerhard
 * Godfrey
@@ -125,6 +129,7 @@ what it is today.
 * LuciusSirnah
 * lulurun 
 * M.Igarashi
+* Magnuz Binder
 * maimedleech
 * Mana Janus
 * MarcelEdward
@@ -161,6 +166,7 @@ what it is today.
 * Salahzar Stenvaag
 * satguru p srivastava
 * sempuki
+* Shy Robbiani
 * SignpostMarv
 * SpotOn3D
 * Stefan_Boom / stoehr

OpenSim/Addons/Groups/ForeignImporter.cs

@@ -30,6 +30,7 @@ using System.Collections.Generic;
 
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Groups
 {

OpenSim/Addons/Groups/GroupsExtendedData.cs

@@ -174,7 +174,7 @@ namespace OpenSim.Groups
             if (dict.ContainsKey("ServiceLocation") && dict["ServiceLocation"] != null)
                 grec.ServiceLocation = dict["ServiceLocation"].ToString();
             else
-                grec.GroupName = string.Empty;
+                grec.ServiceLocation = string.Empty;
 
             if (dict.ContainsKey("ShownInList") && dict["ShownInList"] != null)
                 grec.ShowInList = bool.Parse(dict["ShownInList"].ToString());

OpenSim/Addons/Groups/GroupsMessagingModule.cs

@@ -325,6 +325,13 @@ namespace OpenSim.Groups
                 im.RegionID = thisClient.Scene.RegionInfo.RegionID.Guid;
             }
 
+            if ((im.binaryBucket == null) || (im.binaryBucket.Length == 0) || ((im.binaryBucket.Length == 1 && im.binaryBucket[0] == 0)))
+            {
+                ExtendedGroupRecord groupInfo = m_groupData.GetGroupRecord(UUID.Zero.ToString(), groupID, null);
+                if (groupInfo != null)
+                    im.binaryBucket = Util.StringToBytes256(groupInfo.GroupName);
+            }
+
             // Send to self first of all
             im.toAgentID = im.fromAgentID;
             im.fromGroup = true;

OpenSim/Addons/Groups/GroupsModule.cs

@@ -1296,7 +1296,7 @@ namespace OpenSim.Groups
                         presence.Grouptitle = Title;
 
                         if (! presence.IsChildAgent)
-                            presence.SendAvatarDataToAllAgents();
+                            presence.SendAvatarDataToAllClients();
                     }
                 }
             }

OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs

@@ -32,6 +32,7 @@ using System.Reflection;
 using System.Text;
 
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
@@ -560,7 +561,7 @@ namespace OpenSim.Groups
 
                     // so we have the list of urls to send the notice to
                     // this may take a long time...
-                    Util.RunThreadNoTimeout(delegate
+                    WorkManager.RunInThread(delegate
                     {
                         foreach (string u in urls)
                         {
@@ -571,7 +572,7 @@ namespace OpenSim.Groups
                                     hasAttachment, attType, attName, attItemID, AgentUUIForOutside(attOwnerID));
                             }
                         }
-                    }, "AddGroupNotice", null);
+                    }, null, string.Format("AddGroupNotice (agent {0}, group {1})", RequestingAgentID, groupID));
 
                     return true;
                 }

OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs

@@ -209,11 +209,13 @@ namespace OpenSim.Groups
                 string agentID = request["AgentID"].ToString();
                 string token = request["AccessToken"].ToString();
 
-                m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token);
+                if (!m_GroupsService.RemoveAgentFromGroup(agentID, agentID, groupID, token))
+                    NullResult(result, "Internal error");
+                else
+                    result["RESULT"] = "true";
             }
 
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            result["RESULT"] = "true";
             return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result));
         }
 

OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs

@@ -34,6 +34,7 @@ using System.Text;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
 
 using OpenMetaverse;
 using Mono.Addins;

OpenSim/Addons/Groups/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using Mono.Addins;
 //
 [assembly: AssemblyVersion("0.8.1.*")]
 
-[assembly: Addin("OpenSim.Groups", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.5")]
+[assembly: Addin("OpenSim.Groups", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]

OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs

@@ -36,6 +36,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
 
 using OpenMetaverse;
 using Mono.Addins;

OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs

@@ -285,11 +285,13 @@ namespace OpenSim.Groups
                 string agentID = request["AgentID"].ToString();
                 string requestingAgentID = request["RequestingAgentID"].ToString();
 
-                m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID);
+                if (!m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID))
+                    NullResult(result, string.Format("Insufficient permissions.", agentID));
+                else
+                    result["RESULT"] = "true";
             }
 
             //m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
-            result["RESULT"] = "true";
             return Util.UTF8NoBomEncoding.GetBytes(ServerUtils.BuildXmlResponse(result));
         }
 

OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs

@@ -31,7 +31,8 @@ using System.Reflection;
 using System.Threading;
 
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+//using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
 
 using OpenMetaverse;
 
@@ -144,14 +145,20 @@ namespace OpenSim.Groups
 
                 if (firstCall)
                 {
-                    //group = m_GroupsService.GetGroupRecord(RequestingAgentID, GroupID, GroupName);
-                    group = d();
-
-                    lock (m_Cache)
+                    try
+                    {
+                        //group = m_GroupsService.GetGroupRecord(RequestingAgentID, GroupID, GroupName);
+                        group = d();
+
+                        lock (m_Cache)
+                        {
+                            m_Cache.AddOrUpdate(cacheKey, group, GROUPS_CACHE_TIMEOUT);
+                            return (ExtendedGroupRecord)group;
+                        }
+                    }
+                    finally
                     {
-                        m_Cache.AddOrUpdate(cacheKey, group, GROUPS_CACHE_TIMEOUT);
                         m_ActiveRequests.Remove(cacheKey);
-                        return (ExtendedGroupRecord)group;
                     }
                 }
                 else
@@ -243,13 +250,19 @@ namespace OpenSim.Groups
 
                 if (firstCall)
                 {
-                    membership = d();
-
-                    lock (m_Cache)
+                    try
+                    {
+                        membership = d();
+
+                        lock (m_Cache)
+                        {
+                            m_Cache.AddOrUpdate(cacheKey, membership, GROUPS_CACHE_TIMEOUT);
+                            return (ExtendedGroupMembershipData)membership;
+                        }
+                    }
+                    finally
                     {
-                        m_Cache.AddOrUpdate(cacheKey, membership, GROUPS_CACHE_TIMEOUT);
                         m_ActiveRequests.Remove(cacheKey);
-                        return (ExtendedGroupMembershipData)membership;
                     }
                 }
                 else
@@ -286,12 +299,18 @@ namespace OpenSim.Groups
 
                 if (firstCall)
                 {
-                    membership = d();
-                    lock (m_Cache)
+                    try
+                    {
+                        membership = d();
+                        lock (m_Cache)
+                        {
+                            m_Cache.AddOrUpdate(cacheKey, membership, GROUPS_CACHE_TIMEOUT);
+                            return (ExtendedGroupMembershipData)membership;
+                        }
+                    }
+                    finally
                     {
-                        m_Cache.AddOrUpdate(cacheKey, membership, GROUPS_CACHE_TIMEOUT);
                         m_ActiveRequests.Remove(cacheKey);
-                        return (ExtendedGroupMembershipData)membership;
                     }
                 }
                 else
@@ -327,12 +346,18 @@ namespace OpenSim.Groups
 
                 if (firstCall)
                 {
-                    memberships = d();
-                    lock (m_Cache)
+                    try
+                    {
+                        memberships = d();
+                        lock (m_Cache)
+                        {
+                            m_Cache.AddOrUpdate(cacheKey, memberships, GROUPS_CACHE_TIMEOUT);
+                            return (List<GroupMembershipData>)memberships;
+                        }
+                    }
+                    finally
                     {
-                        m_Cache.AddOrUpdate(cacheKey, memberships, GROUPS_CACHE_TIMEOUT);
                         m_ActiveRequests.Remove(cacheKey);
-                        return (List<GroupMembershipData>)memberships;
                     }
                 }
                 else
@@ -369,20 +394,26 @@ namespace OpenSim.Groups
 
                 if (firstCall)
                 {
-                    List<ExtendedGroupMembersData> _members = d();
-
-                    if (_members != null && _members.Count > 0)
-                        members = _members.ConvertAll<GroupMembersData>(new Converter<ExtendedGroupMembersData, GroupMembersData>(m_ForeignImporter.ConvertGroupMembersData));
-                    else
-                        members = new List<GroupMembersData>();
-
-                    lock (m_Cache)
+                    try
                     {
-                        //m_Cache.AddOrUpdate(cacheKey, members, GROUPS_CACHE_TIMEOUT);
-                        m_Cache.AddOrUpdate(cacheKey, _members, GROUPS_CACHE_TIMEOUT);
-                        m_ActiveRequests.Remove(cacheKey);
+                        List<ExtendedGroupMembersData> _members = d();
 
-                        return (List<GroupMembersData>)members;
+                        if (_members != null && _members.Count > 0)
+                            members = _members.ConvertAll<GroupMembersData>(new Converter<ExtendedGroupMembersData, GroupMembersData>(m_ForeignImporter.ConvertGroupMembersData));
+                        else
+                            members = new List<GroupMembersData>();
+
+                        lock (m_Cache)
+                        {
+                            //m_Cache.AddOrUpdate(cacheKey, members, GROUPS_CACHE_TIMEOUT);
+                            m_Cache.AddOrUpdate(cacheKey, _members, GROUPS_CACHE_TIMEOUT);
+
+                            return (List<GroupMembersData>)members;
+                        }
+                    }
+                    finally
+                    {
+                        m_ActiveRequests.Remove(cacheKey);
                     }
                 }
                 else
@@ -497,16 +528,22 @@ namespace OpenSim.Groups
 
                 if (firstCall)
                 {
-                    roles = d();
-                    if (roles != null)
+                    try
                     {
-                        lock (m_Cache)
+                        roles = d();
+                        if (roles != null)
                         {
-                            m_Cache.AddOrUpdate(cacheKey, roles, GROUPS_CACHE_TIMEOUT);
-                            m_ActiveRequests.Remove(cacheKey);
-                            return (List<GroupRolesData>)roles;
+                            lock (m_Cache)
+                            {
+                                m_Cache.AddOrUpdate(cacheKey, roles, GROUPS_CACHE_TIMEOUT);
+                                return (List<GroupRolesData>)roles;
+                            }
                         }
                     }
+                    finally
+                    {
+                        m_ActiveRequests.Remove(cacheKey);
+                    }
                 }
                 else
                     Thread.Sleep(50);
@@ -541,23 +578,29 @@ namespace OpenSim.Groups
 
                 if (firstCall)
                 {
-                    List<ExtendedGroupRoleMembersData> _rmembers = d();
-
-                    if (_rmembers != null && _rmembers.Count > 0)
-                        rmembers = _rmembers.ConvertAll<GroupRoleMembersData>(new Converter<ExtendedGroupRoleMembersData, GroupRoleMembersData>(m_ForeignImporter.ConvertGroupRoleMembersData));
-                    else
-                        rmembers = new List<GroupRoleMembersData>();
-
-                    lock (m_Cache)
+                    try
+                    {
+                        List<ExtendedGroupRoleMembersData> _rmembers = d();
+
+                        if (_rmembers != null && _rmembers.Count > 0)
+                            rmembers = _rmembers.ConvertAll<GroupRoleMembersData>(new Converter<ExtendedGroupRoleMembersData, GroupRoleMembersData>(m_ForeignImporter.ConvertGroupRoleMembersData));
+                        else
+                            rmembers = new List<GroupRoleMembersData>();
+
+                        lock (m_Cache)
+                        {
+                            // For some strange reason, when I cache the list of GroupRoleMembersData,
+                            // it gets emptied out. The TryGet gets an empty list...
+                            //m_Cache.AddOrUpdate(cacheKey, rmembers, GROUPS_CACHE_TIMEOUT);
+                            // Caching the list of ExtendedGroupRoleMembersData doesn't show that issue
+                            // I don't get it.
+                            m_Cache.AddOrUpdate(cacheKey, _rmembers, GROUPS_CACHE_TIMEOUT);
+                            return (List<GroupRoleMembersData>)rmembers;
+                        }
+                    }
+                    finally
                     {
-                        // For some strange reason, when I cache the list of GroupRoleMembersData,
-                        // it gets emptied out. The TryGet gets an empty list...
-                        //m_Cache.AddOrUpdate(cacheKey, rmembers, GROUPS_CACHE_TIMEOUT);
-                        // Caching the list of ExtendedGroupRoleMembersData doesn't show that issue
-                        // I don't get it.
-                        m_Cache.AddOrUpdate(cacheKey, _rmembers, GROUPS_CACHE_TIMEOUT);
                         m_ActiveRequests.Remove(cacheKey);
-                        return (List<GroupRoleMembersData>)rmembers;
                     }
                 }
                 else
@@ -666,12 +709,19 @@ namespace OpenSim.Groups
 
                 if (firstCall)
                 {
-                    roles = d();
-                    lock (m_Cache)
+                    try
+                    {
+                        roles = d();
+                        lock (m_Cache)
+                        {
+                            m_Cache.AddOrUpdate(cacheKey, roles, GROUPS_CACHE_TIMEOUT);
+                            m_ActiveRequests.Remove(cacheKey);
+                            return (List<GroupRolesData>)roles;
+                        }
+                    }
+                    finally
                     {
-                        m_Cache.AddOrUpdate(cacheKey, roles, GROUPS_CACHE_TIMEOUT);
                         m_ActiveRequests.Remove(cacheKey);
-                        return (List<GroupRolesData>)roles;
                     }
                 }
                 else
@@ -767,13 +817,19 @@ namespace OpenSim.Groups
 
                 if (firstCall)
                 {
-                    GroupNoticeInfo _notice = d();
-
-                    lock (m_Cache)
+                    try
+                    {
+                        GroupNoticeInfo _notice = d();
+
+                        lock (m_Cache)
+                        {
+                            m_Cache.AddOrUpdate(cacheKey, _notice, GROUPS_CACHE_TIMEOUT);
+                            return _notice;
+                        }
+                    }
+                    finally
                     {
-                        m_Cache.AddOrUpdate(cacheKey, _notice, GROUPS_CACHE_TIMEOUT);
                         m_ActiveRequests.Remove(cacheKey);
-                        return _notice;
                     }
                 }
                 else
@@ -809,20 +865,24 @@ namespace OpenSim.Groups
 
                 if (firstCall)
                 {
-                    notices = d();
-
-                    lock (m_Cache)
+                    try
+                    {
+                        notices = d();
+
+                        lock (m_Cache)
+                        {
+                            m_Cache.AddOrUpdate(cacheKey, notices, GROUPS_CACHE_TIMEOUT);
+                            return (List<ExtendedGroupNoticeData>)notices;
+                        }
+                    }
+                    finally
                     {
-                        m_Cache.AddOrUpdate(cacheKey, notices, GROUPS_CACHE_TIMEOUT);
                         m_ActiveRequests.Remove(cacheKey);
-                        return (List<ExtendedGroupNoticeData>)notices;
                     }
                 }
                 else
                     Thread.Sleep(50);
             }
         }
-
-
     }
-}
+}

OpenSim/Addons/Groups/Service/GroupsService.cs

@@ -69,6 +69,7 @@ namespace OpenSim.Groups
                                                 GroupPowers.DeleteRole |
                                                 GroupPowers.Eject |
                                                 GroupPowers.FindPlaces |
+                                                GroupPowers.HostEvent |
                                                 GroupPowers.Invite |
                                                 GroupPowers.JoinChat |
                                                 GroupPowers.LandChangeIdentity |
@@ -150,7 +151,8 @@ namespace OpenSim.Groups
             data.Data["ShowInList"] = showInList ? "1" : "0";
             data.Data["AllowPublish"] = allowPublish ? "1" : "0";
             data.Data["MaturePublish"] = maturePublish ? "1" : "0";
-            data.Data["OwnerRoleID"] = UUID.Random().ToString();
+            UUID roleID = UUID.Random();
+            data.Data["OwnerRoleID"] = roleID.ToString();
 
             if (!m_Database.StoreGroup(data))
                 return UUID.Zero;
@@ -159,7 +161,6 @@ namespace OpenSim.Groups
             _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, UUID.Zero, "Everyone", "Everyone in the group", "Member of " + name, (ulong)DefaultEveryonePowers, true);
 
             // Create Owner role
-            UUID roleID = UUID.Random();
             _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, roleID, "Owners", "Owners of the group", "Owner of " + name, (ulong)OwnerPowers, true);
 
             // Add founder to group
@@ -247,6 +248,9 @@ namespace OpenSim.Groups
             if (group == null)
                 return members;
 
+            // Unfortunately this doesn't quite work on legacy group data because of a bug
+            // that's also being fixed here on CreateGroup. The OwnerRoleID sent to the DB was wrong.
+            // See how to find the ownerRoleID a few lines below.
             UUID ownerRoleID = new UUID(group.Data["OwnerRoleID"]);
 
             RoleData[] roles = m_Database.RetrieveRoles(GroupID);
@@ -255,6 +259,11 @@ namespace OpenSim.Groups
                 return members;
             List<RoleData> rolesList = new List<RoleData>(roles);
 
+            // Let's find the "real" ownerRoleID
+            RoleData ownerRole = rolesList.Find(r => r.Data["Powers"] == ((long)OwnerPowers).ToString());
+            if (ownerRole != null)
+                ownerRoleID = ownerRole.RoleID;
+
             // Check visibility? 
             // When we don't want to check visibility, we pass it "all" as the requestingAgentID
             bool checkVisibility = !RequestingAgentID.Equals(UUID.Zero.ToString());
@@ -291,17 +300,17 @@ namespace OpenSim.Groups
                 {
                     m.Title = selected.Data["Title"];
                     m.AgentPowers = UInt64.Parse(selected.Data["Powers"]);
-
-                    m.AgentID = d.PrincipalID;
-                    m.AcceptNotices = d.Data["AcceptNotices"] == "1" ? true : false;
-                    m.Contribution = Int32.Parse(d.Data["Contribution"]);
-                    m.ListInProfile = d.Data["ListInProfile"] == "1" ? true : false;
-
-                    // Is this person an owner of the group?
-                    m.IsOwner = (rolemembershipsList.Find(r => r.RoleID == ownerRoleID) != null) ? true : false;
-
-                    members.Add(m);
                 }
+
+                m.AgentID = d.PrincipalID;
+                m.AcceptNotices = d.Data["AcceptNotices"] == "1" ? true : false;
+                m.Contribution = Int32.Parse(d.Data["Contribution"]);
+                m.ListInProfile = d.Data["ListInProfile"] == "1" ? true : false;
+
+                // Is this person an owner of the group?
+                m.IsOwner = (rolemembershipsList.Find(r => r.RoleID == ownerRoleID) != null) ? true : false;
+
+                members.Add(m);
             }
 
             return members;
@@ -393,13 +402,15 @@ namespace OpenSim.Groups
             return true;
         }
 
-        public void RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID)
+        public bool RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID)
         {
             // check perms
             if (RequestingAgentID != AgentID && !HasPower(RequestingAgentID, GroupID, GroupPowers.Eject))
-                    return;
+                return false;
 
             _RemoveAgentFromGroup(RequestingAgentID, AgentID, GroupID);
+
+            return true;
         }
 
         public bool AddAgentToGroupInvite(string RequestingAgentID, UUID inviteID, UUID groupID, UUID roleID, string agentID)

OpenSim/Addons/Groups/Service/HGGroupsService.cs

@@ -131,19 +131,27 @@ namespace OpenSim.Groups
             return true;
         }
 
-        public void RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID, string token)
+        public bool RemoveAgentFromGroup(string RequestingAgentID, string AgentID, UUID GroupID, string token)
         {
             // check the token
             MembershipData membership = m_Database.RetrieveMember(GroupID, AgentID);
             if (membership != null)
             {
                 if (token != string.Empty && token.Equals(membership.Data["AccessToken"]))
-                    RemoveAgentFromGroup(RequestingAgentID, AgentID, GroupID);
+                {
+                    return RemoveAgentFromGroup(RequestingAgentID, AgentID, GroupID);
+                }
                 else
+                {
                     m_log.DebugFormat("[Groups.HGGroupsService]: access token {0} did not match stored one {1}", token, membership.Data["AccessToken"]);
+                    return false;
+                }
             }
             else
+            {
                 m_log.DebugFormat("[Groups.HGGroupsService]: membership not found for {0}", AgentID);
+                return false;
+            }
         }
 
         public ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string groupName, string token)

OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using Mono.Addins;
 //
 [assembly: AssemblyVersion("0.8.1.*")]
 
-[assembly: Addin("OpenSim.OfflineIM", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.5")]
+[assembly: Addin("OpenSim.OfflineIM", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]

OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs

@@ -215,18 +215,7 @@ namespace OpenSim.OfflineIM
 
             rootElement.AppendChild(result);
 
-            return DocToBytes(doc);
-        }
-
-        private byte[] DocToBytes(XmlDocument doc)
-        {
-            MemoryStream ms = new MemoryStream();
-            XmlTextWriter xw = new XmlTextWriter(ms, null);
-            xw.Formatting = Formatting.Indented;
-            doc.WriteTo(xw);
-            xw.Flush();
-
-            return ms.ToArray();
+            return Util.DocToBytes(doc);
         }
 
         #endregion

OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs

@@ -40,9 +40,11 @@ using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
 using OpenSim.Region.CoreModules.Scripting.LoadImageURL;
 using OpenSim.Region.CoreModules.Scripting.XMLRPC;
 using OpenSim.Services.Interfaces;
+using Mono.Addins;
 
 namespace OpenSim.ApplicationPlugins.LoadRegions
 {
+    [Extension(Path="/OpenSim/Startup", Id="LoadRegions", NodeName="Plugin")]
     public class LoadRegionsPlugin : IApplicationPlugin, IRegionCreator
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs

@@ -27,16 +27,17 @@
 
 using System.Reflection;
 using System.Runtime.InteropServices;
+using Mono.Addins;
 
 // General information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly : AssemblyTitle("OpenSim.Addin")]
+[assembly : AssemblyTitle("OpenSim.ApplicationPlugins.LoadRegions")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("http://opensimulator.org")]
-[assembly : AssemblyProduct("OpenSim.Addin")]
+[assembly : AssemblyProduct("OpenSim")]
 [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2009")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
@@ -63,3 +64,6 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("0.7.6.*")]
 
 [assembly : AssemblyVersion("0.8.1.*")]
+
+[assembly: Addin("OpenSim.ApplicationPlugins.LoadRegions", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]

OpenSim/ApplicationPlugins/LoadRegions/Resources/LoadRegionsPlugin.addin.xml

@@ -1,11 +0,0 @@
-<Addin id="OpenSim.ApplicationPlugins.LoadRegions" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.LoadRegions.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <Plugin id="LoadRegions" type="OpenSim.ApplicationPlugins.LoadRegions.LoadRegionsPlugin" />
-    </Extension>
-</Addin>

OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs

@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Mono.Addins;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,5 @@ using System.Runtime.InteropServices;
 //
 [assembly: AssemblyVersion("0.8.1.*")]
 
+[assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]

OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs

@@ -38,6 +38,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.ApplicationPlugins.RegionModulesController
 {
+    [Extension(Path = "/OpenSim/Startup", Id = "LoadRegions", NodeName = "Plugin")]
     public class RegionModulesControllerPlugin : IRegionModulesController,
             IApplicationPlugin
     {

OpenSim/ApplicationPlugins/RegionModulesController/Resources/RegionModulesControllerPlugin.addin.xml

@@ -1,13 +0,0 @@
-<Addin id="OpenSim.ApplicationPlugins.RegionModulesController" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.RegionModulesController.dll"/>
-    </Runtime>
-
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-
-    <Extension path = "/OpenSim/Startup">
-        <Plugin id="RegionModulesController" type="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin" />
-    </Extension>
-</Addin>

OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs

@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Mono.Addins;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,5 @@ using System.Runtime.InteropServices;
 //
 [assembly: AssemblyVersion("0.8.1.*")]
 
+[assembly: Addin("OpenSim.ApplicationPlugins.RemoteController", OpenSim.VersionInfo.VersionNumber)]
+[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -39,6 +39,7 @@ using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
+using Mono.Addins;
 using OpenSim;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
@@ -56,6 +57,7 @@ using RegionInfo = OpenSim.Framework.RegionInfo;
 
 namespace OpenSim.ApplicationPlugins.RemoteController
 {
+    [Extension(Path = "/OpenSim/Startup", Id = "LoadRegions", NodeName = "Plugin")]
     public class RemoteAdminPlugin : IApplicationPlugin
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

OpenSim/ApplicationPlugins/RemoteController/Resources/RemoteAdminPlugin.addin.xml

@@ -1,11 +0,0 @@
-<Addin id="OpenSim.ApplicationPlugins.RemoteController" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.RemoteController.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <Plugin id="RemoteController" type="OpenSim.ApplicationPlugins.RemoteController.RemoteAdminPlugin" />
-    </Extension>
-</Addin>

OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs

@@ -25,20 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Capabilities;
-using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Services.Interfaces;
-using Caps = OpenSim.Framework.Capabilities.Caps;
 using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
@@ -49,10 +41,12 @@ namespace OpenSim.Capabilities.Handlers
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IInventoryService m_inventoryService;
+        private UUID m_agentID;
 
-        public FetchInventory2Handler(IInventoryService invService)
+        public FetchInventory2Handler(IInventoryService invService, UUID agentId)
         {
             m_inventoryService = invService;
+            m_agentID = agentId;
         }
 
         public string FetchInventoryRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
@@ -69,7 +63,7 @@ namespace OpenSim.Capabilities.Handlers
             {
                 UUID itemId = osdItemId["item_id"].AsUUID();
 
-                InventoryItemBase item = m_inventoryService.GetItem(new InventoryItemBase(itemId));
+                InventoryItemBase item = m_inventoryService.GetItem(new InventoryItemBase(itemId, m_agentID));
 
                 if (item != null)
                 {

OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs

@@ -42,7 +42,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class WebFetchInvDescHandler 
+    public class FetchInvDescHandler 
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -51,7 +51,7 @@ namespace OpenSim.Capabilities.Handlers
         private ILibraryService m_LibraryService;
 //        private object m_fetchLock = new Object();
 
-        public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService) 
+        public FetchInvDescHandler(IInventoryService invService, ILibraryService libService) 
         {
             m_InventoryService = invService;
             m_LibraryService = libService;
@@ -92,6 +92,7 @@ namespace OpenSim.Capabilities.Handlers
                 ArrayList foldersrequested = (ArrayList)hash["folders"];
     
                 string response = "";
+                string bad_folders_response = "";
 
                 for (int i = 0; i < foldersrequested.Count; i++)
                 {
@@ -110,24 +111,42 @@ namespace OpenSim.Capabilities.Handlers
                     }
                     LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest);
 
-                    inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply);
-                    inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", "");
-                    inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", "");
+                    if (null == reply)
+                    {
+                        bad_folders_response += "<uuid>" + llsdRequest.folder_id.ToString() + "</uuid>";
+                    }
+                    else
+                    {
+                        inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply);
+                        inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", "");
+                        inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", "");
+                    }
 
                     response += inventoryitemstr;
                 }
 
                 if (response.Length == 0)
                 {
-                    // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants.
-                    // Therefore, I'm concluding that the client only has so many threads available to do requests
-                    // and when a thread stalls..   is stays stalled.
-                    // Therefore we need to return something valid
-                    response = "<llsd><map><key>folders</key><array /></map></llsd>";
+                    /* Viewers expect a bad_folders array when not available */
+                    if (bad_folders_response.Length != 0)
+                    {
+                        response = "<llsd><map><key>bad_folders</key><array>" + bad_folders_response + "</array></map></llsd>";
+                    }
+                    else
+                    {
+                        response = "<llsd><map><key>folders</key><array /></map></llsd>";
+                    }
                 }
                 else
                 {
-                    response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>";
+                    if (bad_folders_response.Length != 0)
+                    {
+                        response = "<llsd><map><key>folders</key><array>" + response + "</array><key>bad_folders</key><array>" + bad_folders_response + "</array></map></llsd>";
+                    }
+                    else
+                    {
+                        response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>";
+                    }
                 }
 
 //                m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Replying to CAPS fetch inventory request");
@@ -211,9 +230,9 @@ namespace OpenSim.Capabilities.Handlers
             UUID agentID, UUID folderID, UUID ownerID,
             bool fetchFolders, bool fetchItems, int sortOrder, out int version, out int descendents)
         {
-//            m_log.DebugFormat(
-//                "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
-//                fetchFolders, fetchItems, folderID, agentID);
+            //m_log.DebugFormat(
+            //    "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
+            //    fetchFolders, fetchItems, folderID, agentID);
 
             // FIXME MAYBE: We're not handling sortOrder!
 

OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescServerConnector.cs

@@ -35,13 +35,13 @@ using OpenMetaverse;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class WebFetchInvDescServerConnector : ServiceConnector
+    public class FetchInvDescServerConnector : ServiceConnector
     {
         private IInventoryService m_InventoryService;
         private ILibraryService m_LibraryService;
         private string m_ConfigName = "CapsService";
 
-        public WebFetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) :
+        public FetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) :
                 base(config, server, configName)
         {
             if (configName != String.Empty)
@@ -67,13 +67,13 @@ namespace OpenSim.Capabilities.Handlers
             m_LibraryService =
                     ServerUtils.LoadPlugin<ILibraryService>(libService, args);
 
-            WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
+            FetchInvDescHandler webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService);
             IRequestHandler reqHandler
                 = new RestStreamHandler(
                     "POST",
                     "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
                     webFetchHandler.FetchInventoryDescendentsRequest,
-                    "WebFetchInvDesc",
+                    "FetchInvDescendents",
                     null);
             server.AddStreamHandler(reqHandler);
         }

OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs

@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenMetaverse.Imaging;
+using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class GetDisplayNamesHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IUserManagement m_UserManagement;
+
+        public GetDisplayNamesHandler(string path, IUserManagement umService, string name, string description)
+            : base("GET", path, name, description)
+        {
+            m_UserManagement = umService;
+        }
+
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            m_log.DebugFormat("[GET_DISPLAY_NAMES]: called {0}", httpRequest.Url.Query);
+
+            NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
+            string[] ids = query.GetValues("ids");
+
+
+            if (m_UserManagement == null)
+            {
+                m_log.Error("[GET_DISPLAY_NAMES]: Cannot fetch display names without a user management component");
+                httpResponse.StatusCode = (int)System.Net.HttpStatusCode.InternalServerError;
+                return new byte[0];
+            }
+
+            OSDMap osdReply = new OSDMap();
+            OSDArray agents = new OSDArray();
+
+            osdReply["agents"] = agents;
+            foreach (string id in ids)
+            {
+                UUID uuid = UUID.Zero;
+                if (UUID.TryParse(id, out uuid))
+                {
+                    string name = m_UserManagement.GetUserName(uuid);
+                    if (!string.IsNullOrEmpty(name))
+                    {
+                        string[] parts = name.Split(new char[] {' '});
+                        OSDMap osdname = new OSDMap();
+                        osdname["display_name_next_update"] = OSD.FromDate(DateTime.MinValue);
+                        osdname["display_name_expires"] = OSD.FromDate(DateTime.Now.AddMonths(1));
+                        osdname["display_name"] = OSD.FromString(name);
+                        osdname["legacy_first_name"] = parts[0];
+                        osdname["legacy_last_name"] = parts[1];
+                        osdname["username"] = OSD.FromString(name);
+                        osdname["id"] = OSD.FromUUID(uuid);
+                        osdname["is_display_name_default"] = OSD.FromBoolean(true);
+
+                        agents.Add(osdname);
+                    }
+                }
+            }
+
+            // Full content request
+            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK;
+            //httpResponse.ContentLength = ??;
+            httpResponse.ContentType = "application/llsd+xml";
+
+            string reply = OSDParser.SerializeLLSDXmlString(osdReply);
+            return System.Text.Encoding.UTF8.GetBytes(reply);
+
+        }
+
+    }
+}

OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs

@@ -35,13 +35,13 @@ using OpenMetaverse;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class FetchInventory2ServerConnector : ServiceConnector
+    public class GetDisplayNamesServerConnector : ServiceConnector
     {
-        private IInventoryService m_InventoryService;
+        private IUserManagement m_UserManagement;
         private string m_ConfigName = "CapsService";
 
-        public FetchInventory2ServerConnector(IConfigSource config, IHttpServer server, string configName)
-            : base(config, server, configName)
+        public GetDisplayNamesServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
             if (configName != String.Empty)
                 m_ConfigName = configName;
@@ -50,22 +50,22 @@ namespace OpenSim.Capabilities.Handlers
             if (serverConfig == null)
                 throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
-            string invService = serverConfig.GetString("InventoryService", String.Empty);
+            string umService = serverConfig.GetString("AssetService", String.Empty);
 
-            if (invService == String.Empty)
-                throw new Exception("No InventoryService in config file");
+            if (umService == String.Empty)
+                throw new Exception("No AssetService in config file");
 
             Object[] args = new Object[] { config };
-            m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
+            m_UserManagement =
+                    ServerUtils.LoadPlugin<IUserManagement>(umService, args);
 
-            if (m_InventoryService == null)
-                throw new Exception(String.Format("Failed to load InventoryService from {0}; config is {1}", invService, m_ConfigName));
+            if (m_UserManagement == null)
+                throw new Exception(String.Format("Failed to load UserManagement from {0}; config is {1}", umService, m_ConfigName));
 
-            FetchInventory2Handler fiHandler = new FetchInventory2Handler(m_InventoryService);
-            IRequestHandler reqHandler
-                = new RestStreamHandler(
-                    "POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest, "FetchInventory", null);
-            server.AddStreamHandler(reqHandler);
+            string rurl = serverConfig.GetString("GetTextureRedirectURL");
+            
+            server.AddStreamHandler(
+                new GetDisplayNamesHandler("/CAPS/agents/", m_UserManagement, "GetDisplayNames", null));
         }
     }
-}
+}

OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs

@@ -25,92 +25,229 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Reflection;
-using System.IO;
-using System.Web;
 using log4net;
-using Nini.Config;
 using OpenMetaverse;
-using OpenMetaverse.StructuredData;
+using OpenMetaverse.Imaging;
 using OpenSim.Framework;
-using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Services.Interfaces;
-using Caps = OpenSim.Framework.Capabilities.Caps;
+using System;
+using System.Collections.Specialized;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Reflection;
+using System.Web;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class GetMeshHandler 
+    public class GetMeshHandler : BaseStreamHandler
     {
-//        private static readonly ILog m_log =
-//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private IAssetService m_assetService;
 
-        public GetMeshHandler(IAssetService assService)
+        // TODO: Change this to a config option
+        private string m_RedirectURL = null;
+
+        public GetMeshHandler(string path, IAssetService assService, string name, string description, string redirectURL)
+            : base("GET", path, name, description)
         {
             m_assetService = assService;
+            m_RedirectURL = redirectURL;
+            if (m_RedirectURL != null && !m_RedirectURL.EndsWith("/"))
+                m_RedirectURL += "/";
         }
 
-        public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap)
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            Hashtable responsedata = new Hashtable();
-            responsedata["int_response_code"] = 400; //501; //410; //404;
-            responsedata["content_type"] = "text/plain";
-            responsedata["keepalive"] = false;
-            responsedata["str_response_string"] = "Request wasn't what was expected";
+            // Try to parse the texture ID from the request URL
+            NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
+            string textureStr = query.GetOne("mesh_id");
 
-            string meshStr = string.Empty;
-
-            if (request.ContainsKey("mesh_id"))
-                meshStr = request["mesh_id"].ToString();
-
-            UUID meshID = UUID.Zero;
-            if (!String.IsNullOrEmpty(meshStr) && UUID.TryParse(meshStr, out meshID))
+            if (m_assetService == null)
             {
-                if (m_assetService == null)
-                {
-                    responsedata["int_response_code"] = 404; //501; //410; //404;
-                    responsedata["content_type"] = "text/plain";
-                    responsedata["keepalive"] = false;
-                    responsedata["str_response_string"] = "The asset service is unavailable.  So is your mesh.";
-                    return responsedata;
-                }
+                m_log.Error("[GETMESH]: Cannot fetch mesh " + textureStr + " without an asset service");
+                httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+            }
 
-                AssetBase mesh = m_assetService.Get(meshID.ToString());
+            UUID meshID;
+            if (!String.IsNullOrEmpty(textureStr) && UUID.TryParse(textureStr, out meshID))
+            {
+                // OK, we have an array with preferred formats, possibly with only one entry
 
-                if (mesh != null)
+                httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                AssetBase mesh;
+
+                if (!String.IsNullOrEmpty(m_RedirectURL))
                 {
-                    if (mesh.Type == (SByte)AssetType.Mesh)
+                    // Only try to fetch locally cached meshes. Misses are redirected
+                    mesh = m_assetService.GetCached(meshID.ToString());
+
+                    if (mesh != null)
                     {
-                        responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
-                        responsedata["content_type"] = "application/vnd.ll.mesh";
-                        responsedata["int_response_code"] = 200;
+                        if (mesh.Type != (sbyte)AssetType.Mesh)
+                        {
+                            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                        }
+                        WriteMeshData(httpRequest, httpResponse, mesh);
                     }
-                    // Optionally add additional mesh types here
                     else
                     {
-                        responsedata["int_response_code"] = 404; //501; //410; //404;
-                        responsedata["content_type"] = "text/plain";
-                        responsedata["keepalive"] = false;
-                        responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh.";
-                        return responsedata;
+                        string textureUrl = m_RedirectURL + "?mesh_id="+ meshID.ToString();
+                        m_log.Debug("[GETMESH]: Redirecting mesh request to " + textureUrl);
+                        httpResponse.StatusCode = (int)OSHttpStatusCode.RedirectMovedPermanently;
+                        httpResponse.RedirectLocation = textureUrl;
+                        return null;
+                    }
+                }
+                else // no redirect
+                {
+                    // try the cache
+                    mesh = m_assetService.GetCached(meshID.ToString());
+
+                    if (mesh == null)
+                    {
+                        // Fetch locally or remotely. Misses return a 404
+                        mesh = m_assetService.Get(meshID.ToString());
+
+                        if (mesh != null)
+                        {
+                            if (mesh.Type != (sbyte)AssetType.Mesh)
+                            {
+                                httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                                return null;
+                            }
+                            WriteMeshData(httpRequest, httpResponse, mesh);
+                            return null;
+                        }
+                   }
+                   else // it was on the cache
+                   {
+                       if (mesh.Type != (sbyte)AssetType.Mesh)
+                       {
+                           httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                           return null;
+                       }
+                       WriteMeshData(httpRequest, httpResponse, mesh);
+                       return null;
+                   }
+                }
+
+                // not found
+                httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                return null;
+            }
+            else
+            {
+                m_log.Warn("[GETTEXTURE]: Failed to parse a mesh_id from GetMesh request: " + httpRequest.Url);
+            }
+
+            return null;
+        }
+
+        private void WriteMeshData(IOSHttpRequest request, IOSHttpResponse response, AssetBase texture)
+        {
+            string range = request.Headers.GetOne("Range");
+
+            if (!String.IsNullOrEmpty(range))
+            {
+                // Range request
+                int start, end;
+                if (TryParseRange(range, out start, out end))
+                {
+                    // Before clamping start make sure we can satisfy it in order to avoid
+                    // sending back the last byte instead of an error status
+                    if (start >= texture.Data.Length)
+                    {
+                        response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent;
+                        response.ContentType = texture.Metadata.ContentType;
+                    }
+                    else
+                    {
+                        // Handle the case where no second range value was given.  This is equivalent to requesting
+                        // the rest of the entity.
+                        if (end == -1)
+                            end = int.MaxValue;
+
+                        end = Utils.Clamp(end, 0, texture.Data.Length - 1);
+                        start = Utils.Clamp(start, 0, end);
+                        int len = end - start + 1;
+
+                        if (0 == start && len == texture.Data.Length)
+                        {
+                            response.StatusCode = (int)System.Net.HttpStatusCode.OK;
+                        }
+                        else
+                        {
+                            response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent;
+                            response.AddHeader("Content-Range", String.Format("bytes {0}-{1}/{2}", start, end, texture.Data.Length));
+                        }
+                        
+                        response.ContentLength = len;
+                        response.ContentType = "application/vnd.ll.mesh";
+    
+                        response.Body.Write(texture.Data, start, len);
                     }
                 }
                 else
                 {
-                    responsedata["int_response_code"] = 404; //501; //410; //404;
-                    responsedata["content_type"] = "text/plain";
-                    responsedata["keepalive"] = false;
-                    responsedata["str_response_string"] = "Your Mesh wasn't found.  Sorry!";
-                    return responsedata;
+                    m_log.Warn("[GETMESH]: Malformed Range header: " + range);
+                    response.StatusCode = (int)System.Net.HttpStatusCode.BadRequest;
+                }
+            }
+            else 
+            {
+                // Full content request
+                response.StatusCode = (int)System.Net.HttpStatusCode.OK;
+                response.ContentLength = texture.Data.Length;
+                response.ContentType = "application/vnd.ll.mesh";
+                response.Body.Write(texture.Data, 0, texture.Data.Length);
+            }
+        }
+
+        /// <summary>
+        /// Parse a range header.
+        /// </summary>
+        /// <remarks>
+        /// As per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html,
+        /// this obeys range headers with two values (e.g. 533-4165) and no second value (e.g. 533-).
+        /// Where there is no value, -1 is returned.
+        /// FIXME: Need to cover the case where only a second value is specified (e.g. -4165), probably by returning -1
+        /// for start.</remarks>
+        /// <returns></returns>
+        /// <param name='header'></param>
+        /// <param name='start'>Start of the range.  Undefined if this was not a number.</param>
+        /// <param name='end'>End of the range.  Will be -1 if no end specified.  Undefined if there was a raw string but this was not a number.</param>
+        private bool TryParseRange(string header, out int start, out int end)
+        {
+            start = end = 0;
+
+            if (header.StartsWith("bytes="))
+            {
+                string[] rangeValues = header.Substring(6).Split('-');
+
+                if (rangeValues.Length == 2)
+                {
+                    if (!Int32.TryParse(rangeValues[0], out start))
+                        return false;
+
+                    string rawEnd = rangeValues[1];
+
+                    if (rawEnd == "")
+                    {
+                        end = -1;
+                        return true;
+                    }
+                    else if (Int32.TryParse(rawEnd, out end))
+                    {
+                        return true;
+                    }
                 }
             }
 
-            return responsedata;
+            start = end = 0;
+            return false;
         }
     }
 }

OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs

@@ -25,16 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections;
 using Nini.Config;
-using OpenSim.Server.Base;
-using OpenSim.Services.Interfaces;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Server.Handlers.Base;
-using OpenSim.Framework.Servers;
-
 using OpenMetaverse;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Base;
+using OpenSim.Server.Handlers.Base;
+using OpenSim.Services.Interfaces;
+using System;
 
 namespace OpenSim.Capabilities.Handlers
 {
@@ -65,15 +62,15 @@ 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));
 
-            GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService);
-            IRequestHandler reqHandler
-                = new RestHTTPHandler(
-                    "GET",
-                    "/CAPS/" + UUID.Random(),
-                    httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
-                    "GetMesh",
-                    null);
-            server.AddStreamHandler(reqHandler);
+            string rurl = serverConfig.GetString("GetMeshRedirectURL");
+
+            server.AddStreamHandler(
+                new GetTextureHandler("/CAPS/GetMesh/" /*+ UUID.Random() */, m_AssetService, "GetMesh", null, rurl));
+
+            rurl = serverConfig.GetString("GetMesh2RedirectURL");
+
+            server.AddStreamHandler(
+                new GetTextureHandler("/CAPS/GetMesh2/" /*+ UUID.Random() */, m_AssetService, "GetMesh2", null, rurl));
         }
     }
 }

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

@@ -37,7 +37,6 @@ using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
 {
@@ -52,7 +51,7 @@ namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
             // Overkill - we only really need the asset service, not a whole scene.
             Scene scene = new SceneHelpers().SetupScene();
 
-            GetTextureHandler handler = new GetTextureHandler(null, scene.AssetService, "TestGetTexture", null, null);
+            GetTextureHandler handler = new GetTextureHandler("/gettexture", scene.AssetService, "TestGetTexture", null, null);
             TestOSHttpRequest req = new TestOSHttpRequest();
             TestOSHttpResponse resp = new TestOSHttpResponse();
             req.Url = new Uri("http://localhost/?texture_id=00000000-0000-1111-9999-000000000012");

OpenSim/Capabilities/LLSD.cs

@@ -68,7 +68,10 @@ namespace OpenSim.Framework.Capabilities
         /// <returns></returns>
         public static object LLSDDeserialize(byte[] b)
         {
-            return LLSDDeserialize(new MemoryStream(b, false));
+            using (MemoryStream ms = new MemoryStream(b, false))
+            {
+                return LLSDDeserialize(ms);
+            }
         }
 
         /// <summary>
@@ -78,21 +81,23 @@ namespace OpenSim.Framework.Capabilities
         /// <returns></returns>
         public static object LLSDDeserialize(Stream st)
         {
-            XmlTextReader reader = new XmlTextReader(st);
-            reader.Read();
-            SkipWS(reader);
+            using (XmlTextReader reader = new XmlTextReader(st))
+            {
+                reader.Read();
+                SkipWS(reader);
 
-            if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "llsd")
-                throw new LLSDParseException("Expected <llsd>");
+                if (reader.NodeType != XmlNodeType.Element || reader.LocalName != "llsd")
+                    throw new LLSDParseException("Expected <llsd>");
 
-            reader.Read();
-            object ret = LLSDParseOne(reader);
-            SkipWS(reader);
+                reader.Read();
+                object ret = LLSDParseOne(reader);
+                SkipWS(reader);
 
-            if (reader.NodeType != XmlNodeType.EndElement || reader.LocalName != "llsd")
-                throw new LLSDParseException("Expected </llsd>");
+                if (reader.NodeType != XmlNodeType.EndElement || reader.LocalName != "llsd")
+                    throw new LLSDParseException("Expected </llsd>");
 
-            return ret;
+                return ret;
+            }
         }
 
         /// <summary>

OpenSim/Data/IRegionData.cs

@@ -52,12 +52,12 @@ namespace OpenSim.Data
         public int sizeY;
 
         /// <summary>
-        /// Return the x-coordinate of this region.
+        /// Return the x-coordinate of this region in region units.
         /// </summary>
         public int coordX { get { return (int)Util.WorldToRegionLoc((uint)posX); } }
 
         /// <summary>
-        /// Return the y-coordinate of this region.
+        /// Return the y-coordinate of this region in region units.
         /// </summary>
         public int coordY { get { return (int)Util.WorldToRegionLoc((uint)posY); } }
 

OpenSim/Data/MSSQL/MSSQLAssetData.cs

@@ -1,314 +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.Data;
-using System.Data.SqlClient;
-using System.Reflection;
-using System.Collections.Generic;
-using OpenMetaverse;
-using log4net;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.MSSQL
-{
-    /// <summary>
-    /// A MSSQL Interface for the Asset server
-    /// </summary>
-    public class MSSQLAssetData : AssetDataBase
-    {
-        private const string _migrationStore = "AssetStore";
-
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private long m_ticksToEpoch;
-        /// <summary>
-        /// Database manager
-        /// </summary>
-        private MSSQLManager m_database;
-        private string m_connectionString;
-
-        #region IPlugin Members
-
-        override public void Dispose() { }
-
-        /// <summary>
-        /// <para>Initialises asset interface</para>
-        /// </summary>
-        // [Obsolete("Cannot be default-initialized!")]
-        override public void Initialise()
-        {
-            m_log.Info("[MSSQLAssetData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException(Name);
-        }
-
-        /// <summary>
-        /// Initialises asset interface
-        /// </summary>
-        /// <para>
-        /// a string instead of file, if someone writes the support
-        /// </para>
-        /// <param name="connectionString">connect string</param>
-        override public void Initialise(string connectionString)
-        {
-            m_ticksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
-
-            m_database = new MSSQLManager(connectionString);
-            m_connectionString = connectionString;
-
-            //New migration to check for DB changes
-            m_database.CheckMigration(_migrationStore);
-        }
-
-        /// <summary>
-        /// Database provider version.
-        /// </summary>
-        override public string Version
-        {
-            get { return m_database.getVersion(); }
-        }
-
-        /// <summary>
-        /// The name of this DB provider.
-        /// </summary>
-        override public string Name
-        {
-            get { return "MSSQL Asset storage engine"; }
-        }
-
-        #endregion
-
-        #region IAssetDataPlugin Members
-
-        /// <summary>
-        /// Fetch Asset from m_database
-        /// </summary>
-        /// <param name="assetID">the asset UUID</param>
-        /// <returns></returns>
-        override public AssetBase GetAsset(UUID assetID)
-        {
-            string sql = "SELECT * FROM assets WHERE id = @id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("id", assetID));
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    if (reader.Read())
-                    {
-                        AssetBase asset = new AssetBase(
-                            DBGuid.FromDB(reader["id"]),
-                            (string)reader["name"],
-                            Convert.ToSByte(reader["assetType"]),
-                            reader["creatorid"].ToString()
-                        );
-                        // Region Main
-                        asset.Description = (string)reader["description"];
-                        asset.Local = Convert.ToBoolean(reader["local"]);
-                        asset.Temporary = Convert.ToBoolean(reader["temporary"]);
-                        asset.Flags = (AssetFlags)(Convert.ToInt32(reader["asset_flags"]));
-                        asset.Data = (byte[])reader["data"];
-                        return asset;
-                    }
-                    return null; // throw new Exception("No rows to return");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Create asset in m_database
-        /// </summary>
-        /// <param name="asset">the asset</param>
-        override public void StoreAsset(AssetBase asset)
-        {
-           
-            string sql =
-                @"IF EXISTS(SELECT * FROM assets WHERE id=@id) 
-                    UPDATE assets set name = @name, description = @description, assetType = @assetType,
-                            local = @local, temporary = @temporary, creatorid = @creatorid, data = @data
-                           WHERE id=@id
-                   ELSE
-                    INSERT INTO assets
-                    ([id], [name], [description], [assetType], [local], 
-                     [temporary], [create_time], [access_time], [creatorid], [asset_flags], [data])
-                    VALUES
-                    (@id, @name, @description, @assetType, @local, 
-                     @temporary, @create_time, @access_time, @creatorid, @asset_flags, @data)";
-            
-            string assetName = asset.Name;
-            if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
-            {
-                assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
-                m_log.WarnFormat(
-                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
-                    asset.Name, asset.ID, asset.Name.Length, assetName.Length);
-            }
-            
-            string assetDescription = asset.Description;
-            if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
-            {
-                assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
-                m_log.WarnFormat(
-                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
-                    asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
-            }
-            
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
-            {
-                int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
-                command.Parameters.Add(m_database.CreateParameter("id", asset.FullID));
-                command.Parameters.Add(m_database.CreateParameter("name", assetName));
-                command.Parameters.Add(m_database.CreateParameter("description", assetDescription));
-                command.Parameters.Add(m_database.CreateParameter("assetType", asset.Type));
-                command.Parameters.Add(m_database.CreateParameter("local", asset.Local));
-                command.Parameters.Add(m_database.CreateParameter("temporary", asset.Temporary));
-                command.Parameters.Add(m_database.CreateParameter("access_time", now));
-                command.Parameters.Add(m_database.CreateParameter("create_time", now));
-                command.Parameters.Add(m_database.CreateParameter("asset_flags", (int)asset.Flags));
-                command.Parameters.Add(m_database.CreateParameter("creatorid", asset.Metadata.CreatorID));
-                command.Parameters.Add(m_database.CreateParameter("data", asset.Data));
-                conn.Open();
-                try
-                {
-                    command.ExecuteNonQuery();
-                }
-                catch(Exception e)
-                {
-                    m_log.Error("[ASSET DB]: Error storing item :" + e.Message);
-                }
-            }
-        }
-
-
-// Commented out since currently unused - this probably should be called in GetAsset()
-//        private void UpdateAccessTime(AssetBase asset)
-//        {
-//            using (AutoClosingSqlCommand cmd = m_database.Query("UPDATE assets SET access_time = @access_time WHERE id=@id"))
-//            {
-//                int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
-//                cmd.Parameters.AddWithValue("@id", asset.FullID.ToString());
-//                cmd.Parameters.AddWithValue("@access_time", now);
-//                try
-//                {
-//                    cmd.ExecuteNonQuery();
-//                }
-//                catch (Exception e)
-//                {
-//                    m_log.Error(e.ToString());
-//                }
-//            }
-//        }
-
-        /// <summary>
-        /// Check if the assets exist in the database.
-        /// </summary>
-        /// <param name="uuids">The assets' IDs</param>
-        /// <returns>For each asset: true if it exists, false otherwise</returns>
-        public override bool[] AssetsExist(UUID[] uuids)
-        {
-            if (uuids.Length == 0)
-                return new bool[0];
-
-            HashSet<UUID> exist = new HashSet<UUID>();
-
-            string ids = "'" + string.Join("','", uuids) + "'";
-            string sql = string.Format("SELECT id FROM assets WHERE id IN ({0})", ids);
-
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    while (reader.Read())
-                    {
-                        UUID id = DBGuid.FromDB(reader["id"]);
-                        exist.Add(id);
-                    }
-                }
-            }
-
-            bool[] results = new bool[uuids.Length];
-            for (int i = 0; i < uuids.Length; i++)
-                results[i] = exist.Contains(uuids[i]);
-            return results;
-        }
-
-        /// <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 override List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
-        {
-            List<AssetMetadata> retList = new List<AssetMetadata>(count);
-            string sql = @"WITH OrderedAssets AS
-                (
-                    SELECT id, name, description, assetType, temporary, creatorid,
-                    RowNumber = ROW_NUMBER() OVER (ORDER BY id)
-                    FROM assets 
-                ) 
-                SELECT * 
-                FROM OrderedAssets
-                WHERE RowNumber BETWEEN @start AND @stop;";
-
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("start", start));
-                cmd.Parameters.Add(m_database.CreateParameter("stop", start + count - 1));
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    while (reader.Read())
-                    {
-                        AssetMetadata metadata = new AssetMetadata();
-                        metadata.FullID = DBGuid.FromDB(reader["id"]);
-                        metadata.Name = (string)reader["name"];
-                        metadata.Description = (string)reader["description"];
-                        metadata.Type = Convert.ToSByte(reader["assetType"]);
-                        metadata.Temporary = Convert.ToBoolean(reader["temporary"]);
-                        metadata.CreatorID = (string)reader["creatorid"];
-                        retList.Add(metadata);
-                    }
-                }
-            }
-
-            return retList;
-        }
-
-        public override bool Delete(string id)
-        {
-            return false;
-        }
-        #endregion
-    }
-}

OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs

@@ -1,227 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
-using System.Data.SqlClient;
-using System.Reflection;
-using System.Text;
-
-namespace OpenSim.Data.MSSQL
-{
-    public class MSSQLAuthenticationData : IAuthenticationData
-    {
-        private string m_Realm;
-        private List<string> m_ColumnNames = null;
-        private int m_LastExpire = 0;
-        private string m_ConnectionString;
-        private MSSQLManager m_database;
-
-        public MSSQLAuthenticationData(string connectionString, string realm)
-        {
-            m_Realm = realm;
-            m_ConnectionString = connectionString;
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            {
-                conn.Open();
-                Migration m = new Migration(conn, GetType().Assembly, "AuthStore");
-                m_database = new MSSQLManager(m_ConnectionString);
-                m.Update();
-            }
-        }
-
-        public AuthenticationData Get(UUID principalID)
-        {
-            AuthenticationData ret = new AuthenticationData();
-            ret.Data = new Dictionary<string, object>();
-
-            string sql = string.Format("select * from {0} where UUID = @principalID", m_Realm);
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
-                conn.Open();
-                using (SqlDataReader result = cmd.ExecuteReader())
-                {
-                    if (result.Read())
-                    {
-                        ret.PrincipalID = principalID;
-
-                        if (m_ColumnNames == null)
-                        {
-                            m_ColumnNames = new List<string>();
-
-                            DataTable schemaTable = result.GetSchemaTable();
-                            foreach (DataRow row in schemaTable.Rows)
-                                m_ColumnNames.Add(row["ColumnName"].ToString());
-                        }
-
-                        foreach (string s in m_ColumnNames)
-                        {
-                            if (s == "UUID")
-                                continue;
-
-                            ret.Data[s] = result[s].ToString();
-                        }
-                        return ret;
-                    }
-                }
-            }
-            return null;
-        }
-
-        public bool Store(AuthenticationData data)
-        {
-            if (data.Data.ContainsKey("UUID"))
-                data.Data.Remove("UUID");
-
-            string[] fields = new List<string>(data.Data.Keys).ToArray();
-            StringBuilder updateBuilder = new StringBuilder();
-           
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-                updateBuilder.AppendFormat("update {0} set ", m_Realm);
-
-                bool first = true;
-                foreach (string field in fields)
-                {
-                    if (!first)
-                        updateBuilder.Append(", ");
-                    updateBuilder.AppendFormat("{0} = @{0}",field);
-
-                    first = false;
-                    cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
-                }
-
-                updateBuilder.Append(" where UUID = @principalID");
-
-                cmd.CommandText = updateBuilder.ToString();
-                cmd.Connection = conn;
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", data.PrincipalID));
-                
-                conn.Open();
-                if (cmd.ExecuteNonQuery() < 1)
-                {
-                    StringBuilder insertBuilder = new StringBuilder();
-
-                    insertBuilder.AppendFormat("insert into {0} (UUID, ", m_Realm);
-                    insertBuilder.Append(String.Join(", ", fields));
-                    insertBuilder.Append(") values (@principalID, @");
-                    insertBuilder.Append(String.Join(", @", fields));
-                    insertBuilder.Append(")");
-
-                    cmd.CommandText = insertBuilder.ToString();
-
-                    if (cmd.ExecuteNonQuery() < 1)
-                    {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        public bool SetDataItem(UUID principalID, string item, string value)
-        {
-            string sql = string.Format("update {0} set {1} = @{1} where UUID = @UUID", m_Realm, item);
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@" + item, value));
-                conn.Open();
-                if (cmd.ExecuteNonQuery() > 0)
-                    return true;
-            }
-            return false;
-        }
-
-        public bool SetToken(UUID principalID, string token, int lifetime)
-        {
-            if (System.Environment.TickCount - m_LastExpire > 30000)
-                DoExpire();
-            
-            string sql = "insert into tokens (UUID, token, validity) values (@principalID, @token, @lifetime)";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
-                cmd.Parameters.Add(m_database.CreateParameter("@token", token));
-                cmd.Parameters.Add(m_database.CreateParameter("@lifetime", DateTime.Now.AddMinutes(lifetime)));
-                conn.Open();
-
-                if (cmd.ExecuteNonQuery() > 0)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public bool CheckToken(UUID principalID, string token, int lifetime)
-        {
-            if (System.Environment.TickCount - m_LastExpire > 30000)
-                DoExpire();
-
-            DateTime validDate = DateTime.Now.AddMinutes(lifetime);
-            string sql = "update tokens set validity = @validDate where UUID = @principalID and token = @token and validity > GetDate()";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
-                cmd.Parameters.Add(m_database.CreateParameter("@token", token));
-                cmd.Parameters.Add(m_database.CreateParameter("@validDate", validDate));
-                conn.Open();
-
-                if (cmd.ExecuteNonQuery() > 0)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private void DoExpire()
-        {
-            DateTime currentDateTime = DateTime.Now;
-            string sql = "delete from tokens where validity < @currentDateTime";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                conn.Open();
-                cmd.Parameters.Add(m_database.CreateParameter("@currentDateTime", currentDateTime));
-                cmd.ExecuteNonQuery();
-            }
-            m_LastExpire = System.Environment.TickCount;
-        }
-    }
-}

OpenSim/Data/MSSQL/MSSQLEstateData.cs

@@ -1,577 +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.Data.SqlClient;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-
-namespace OpenSim.Data.MSSQL
-{
-    public class MSSQLEstateStore : IEstateDataStore
-    {
-        private const string _migrationStore = "EstateStore";
-
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private MSSQLManager _Database;
-        private string m_connectionString;
-        private FieldInfo[] _Fields;
-        private Dictionary<string, FieldInfo> _FieldMap = new Dictionary<string, FieldInfo>();
-
-        #region Public methods
-
-        public MSSQLEstateStore()
-        {
-        }
-
-        public MSSQLEstateStore(string connectionString)
-        {
-            Initialise(connectionString);
-        }
-
-        /// <summary>
-        /// Initialises the estatedata class.
-        /// </summary>
-        /// <param name="connectionString">connectionString.</param>
-        public void Initialise(string connectionString)
-        {
-            if (!string.IsNullOrEmpty(connectionString))
-            {
-                m_connectionString = connectionString;
-                _Database = new MSSQLManager(connectionString);
-            }
-
-            //Migration settings
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            {
-                conn.Open();
-                Migration m = new Migration(conn, GetType().Assembly, "EstateStore");
-                m.Update();
-            }
-
-            //Interesting way to get parameters! Maybe implement that also with other types
-            Type t = typeof(EstateSettings);
-            _Fields = t.GetFields(BindingFlags.NonPublic |
-                                  BindingFlags.Instance |
-                                  BindingFlags.DeclaredOnly);
-
-            foreach (FieldInfo f in _Fields)
-            {
-                if (f.Name.Substring(0, 2) == "m_")
-                    _FieldMap[f.Name.Substring(2)] = f;
-            }
-        }
-
-        /// <summary>
-        /// Loads the estate settings.
-        /// </summary>
-        /// <param name="regionID">region ID.</param>
-        /// <returns></returns>
-        public EstateSettings LoadEstateSettings(UUID regionID, bool create)
-        {
-            EstateSettings es = new EstateSettings();
-
-            string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) + " from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = @RegionID";
-
-            bool insertEstate = false;
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@RegionID", regionID));
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    if (reader.Read())
-                    {
-                        foreach (string name in FieldList)
-                        {
-                            FieldInfo f = _FieldMap[name];
-                            object v = reader[name];
-                            if (f.FieldType == typeof(bool))
-                            {
-                                f.SetValue(es, Convert.ToInt32(v) != 0);
-                            }
-                            else if (f.FieldType == typeof(UUID))
-                            {
-                                f.SetValue(es, new UUID((Guid)v)); // uuid);
-                            }
-                            else if (f.FieldType == typeof(string))
-                            {
-                                f.SetValue(es, v.ToString());
-                            }
-                            else if (f.FieldType == typeof(UInt32))
-                            {
-                                f.SetValue(es, Convert.ToUInt32(v));
-                            }
-                            else if (f.FieldType == typeof(Single))
-                            {
-                                f.SetValue(es, Convert.ToSingle(v));
-                            }
-                            else
-                                f.SetValue(es, v);
-                        }
-                    }
-                    else
-                    {
-                        insertEstate = true;
-                    }
-                }
-            }
-
-            if (insertEstate && create)
-            {
-                DoCreate(es);
-                LinkRegion(regionID, (int)es.EstateID);
-            }
-
-            LoadBanList(es);
-
-            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
-            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
-            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
-
-            //Set event
-            es.OnSave += StoreEstateSettings;
-            return es;
-        }
-
-        public EstateSettings CreateNewEstate()
-        {
-            EstateSettings es = new EstateSettings();
-            es.OnSave += StoreEstateSettings;
-
-            DoCreate(es);
-
-            LoadBanList(es);
-
-            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
-            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
-            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
-
-            return es;
-        }
-
-        private void DoCreate(EstateSettings es)
-        {
-            List<string> names = new List<string>(FieldList);
-
-            names.Remove("EstateID");
-
-            string sql = string.Format("insert into estate_settings ({0}) values ( @{1})", String.Join(",", names.ToArray()), String.Join(", @", names.ToArray()));
-
-            //_Log.Debug("[DB ESTATE]: SQL: " + sql);
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand insertCommand = new SqlCommand(sql, conn))
-            {
-                insertCommand.CommandText = sql + " SET @ID = SCOPE_IDENTITY()";
-
-                foreach (string name in names)
-                {
-                    insertCommand.Parameters.Add(_Database.CreateParameter("@" + name, _FieldMap[name].GetValue(es)));
-                }
-                SqlParameter idParameter = new SqlParameter("@ID", SqlDbType.Int);
-                idParameter.Direction = ParameterDirection.Output;
-                insertCommand.Parameters.Add(idParameter);
-                conn.Open();
-                insertCommand.ExecuteNonQuery();
-
-                es.EstateID = Convert.ToUInt32(idParameter.Value);
-            }
-
-            //TODO check if this is needed??
-            es.Save();
-        }
-
-        /// <summary>
-        /// Stores the estate settings.
-        /// </summary>
-        /// <param name="es">estate settings</param>
-        public void StoreEstateSettings(EstateSettings es)
-        {
-            List<string> names = new List<string>(FieldList);
-
-            names.Remove("EstateID");
-
-            string sql = string.Format("UPDATE estate_settings SET ");
-            foreach (string name in names)
-            {
-                sql += name + " = @" + name + ", ";
-            }
-            sql = sql.Remove(sql.LastIndexOf(","));
-            sql += " WHERE EstateID = @EstateID";
-
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                foreach (string name in names)
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@" + name, _FieldMap[name].GetValue(es)));
-                }
-
-                cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID));
-                conn.Open();
-                cmd.ExecuteNonQuery();
-            }
-
-            SaveBanList(es);
-            SaveUUIDList(es.EstateID, "estate_managers", es.EstateManagers);
-            SaveUUIDList(es.EstateID, "estate_users", es.EstateAccess);
-            SaveUUIDList(es.EstateID, "estate_groups", es.EstateGroups);
-        }
-
-        #endregion
-
-        #region Private methods
-
-        private string[] FieldList
-        {
-            get { return new List<string>(_FieldMap.Keys).ToArray(); }
-        }
-
-        private void LoadBanList(EstateSettings es)
-        {
-            es.ClearBans();
-
-            string sql = "select bannedUUID from estateban where EstateID = @EstateID";
-
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                SqlParameter idParameter = new SqlParameter("@EstateID", SqlDbType.Int);
-                idParameter.Value = es.EstateID;
-                cmd.Parameters.Add(idParameter);
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    while (reader.Read())
-                    {
-                        EstateBan eb = new EstateBan();
-
-                        eb.BannedUserID = new UUID((Guid)reader["bannedUUID"]); //uuid;
-                        eb.BannedHostAddress = "0.0.0.0";
-                        eb.BannedHostIPMask = "0.0.0.0";
-                        es.AddBan(eb);
-                    }
-                }
-            }
-        }
-
-        private UUID[] LoadUUIDList(uint estateID, string table)
-        {
-            List<UUID> uuids = new List<UUID>();
-
-            string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table);
-
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@EstateID", estateID));
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    while (reader.Read())
-                    {
-                        uuids.Add(new UUID((Guid)reader["uuid"])); //uuid);
-                    }
-                }
-            }
-
-            return uuids.ToArray();
-        }
-
-        private void SaveBanList(EstateSettings es)
-        {
-            //Delete first
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            {
-                conn.Open();
-                using (SqlCommand cmd = conn.CreateCommand())
-                {
-                    cmd.CommandText = "delete from estateban where EstateID = @EstateID";
-                    cmd.Parameters.AddWithValue("@EstateID", (int)es.EstateID);
-                    cmd.ExecuteNonQuery();
-
-                    //Insert after
-                    cmd.CommandText = "insert into estateban (EstateID, bannedUUID,bannedIp, bannedIpHostMask, bannedNameMask) values ( @EstateID, @bannedUUID, '','','' )";
-                    cmd.Parameters.AddWithValue("@bannedUUID", Guid.Empty);
-                    foreach (EstateBan b in es.EstateBans)
-                    {
-                        cmd.Parameters["@bannedUUID"].Value = b.BannedUserID.Guid;
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-        }
-
-        private void SaveUUIDList(uint estateID, string table, UUID[] data)
-        {
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            {
-                conn.Open();
-                using (SqlCommand cmd = conn.CreateCommand())
-                {
-                    cmd.Parameters.AddWithValue("@EstateID", (int)estateID);
-                    cmd.CommandText = string.Format("delete from {0} where EstateID = @EstateID", table);
-                    cmd.ExecuteNonQuery();
-
-                    cmd.CommandText = string.Format("insert into {0} (EstateID, uuid) values ( @EstateID, @uuid )", table);
-                    cmd.Parameters.AddWithValue("@uuid", Guid.Empty);
-                    foreach (UUID uuid in data)
-                    {
-                        cmd.Parameters["@uuid"].Value = uuid.Guid; //.ToString(); //TODO check if this works
-                        cmd.ExecuteNonQuery();
-                    }
-                }
-            }
-        }
-
-        public EstateSettings LoadEstateSettings(int estateID)
-        {
-            EstateSettings es = new EstateSettings();
-            string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) + " from estate_settings where EstateID = @EstateID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            {
-                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.AddWithValue("@EstateID", (int)estateID);
-                    using (SqlDataReader reader = cmd.ExecuteReader())
-                    {
-                        if (reader.Read())
-                        {
-                            foreach (string name in FieldList)
-                            {
-                                FieldInfo f = _FieldMap[name];
-                                object v = reader[name];
-                                if (f.FieldType == typeof(bool))
-                                {
-                                    f.SetValue(es, Convert.ToInt32(v) != 0);
-                                }
-                                else if (f.FieldType == typeof(UUID))
-                                {
-                                    f.SetValue(es, new UUID((Guid)v)); // uuid);
-                                }
-                                else if (f.FieldType == typeof(string))
-                                {
-                                    f.SetValue(es, v.ToString());
-                                }
-                                else if (f.FieldType == typeof(UInt32))
-                                {
-                                    f.SetValue(es, Convert.ToUInt32(v));
-                                }
-                                else if (f.FieldType == typeof(Single))
-                                {
-                                    f.SetValue(es, Convert.ToSingle(v));
-                                }
-                                else
-                                    f.SetValue(es, v);
-                            }
-                        }
-
-                    }
-                }
-            }
-            LoadBanList(es);
-
-            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
-            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
-            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
-
-            //Set event
-            es.OnSave += StoreEstateSettings;
-            return es;
-
-        }
-
-        public List<EstateSettings> LoadEstateSettingsAll()
-        {
-            List<EstateSettings> allEstateSettings = new List<EstateSettings>();
-
-            List<int> allEstateIds = GetEstatesAll();
-
-            foreach (int estateId in allEstateIds)
-                allEstateSettings.Add(LoadEstateSettings(estateId));
-
-            return allEstateSettings;
-        }
-
-        public List<int> GetEstates(string search)
-        {
-            List<int> result = new List<int>();
-            string sql = "select estateID from estate_settings where EstateName = @EstateName";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            {
-                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.AddWithValue("@EstateName", search);
-
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
-                        while (reader.Read())
-                        {
-                            result.Add(Convert.ToInt32(reader["EstateID"]));
-                        }
-                        reader.Close();
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        public List<int> GetEstatesAll()
-        {
-            List<int> result = new List<int>();
-            string sql = "select estateID from estate_settings";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            {
-                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
-                        while (reader.Read())
-                        {
-                            result.Add(Convert.ToInt32(reader["EstateID"]));
-                        }
-                        reader.Close();
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        public List<int> GetEstatesByOwner(UUID ownerID)
-        {
-            List<int> result = new List<int>();
-            string sql = "select estateID from estate_settings where EstateOwner = @EstateOwner";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            {
-                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.AddWithValue("@EstateOwner", ownerID);
-
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
-                        while (reader.Read())
-                        {
-                            result.Add(Convert.ToInt32(reader["EstateID"]));
-                        }
-                        reader.Close();
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        public bool LinkRegion(UUID regionID, int estateID)
-        {
-            string deleteSQL = "delete from estate_map where RegionID = @RegionID";
-            string insertSQL = "insert into estate_map values (@RegionID, @EstateID)";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            {
-                conn.Open();
-                SqlTransaction transaction = conn.BeginTransaction();
-
-                try
-                {
-                    using (SqlCommand cmd = new SqlCommand(deleteSQL, conn))
-                    {
-                        cmd.Transaction = transaction;
-                        cmd.Parameters.AddWithValue("@RegionID", regionID.Guid);
-
-                        cmd.ExecuteNonQuery();
-                    }
-
-                    using (SqlCommand cmd = new SqlCommand(insertSQL, conn))
-                    {
-                        cmd.Transaction = transaction;
-                        cmd.Parameters.AddWithValue("@RegionID", regionID.Guid);
-                        cmd.Parameters.AddWithValue("@EstateID", estateID);
-
-                        int ret = cmd.ExecuteNonQuery();
-
-                        if (ret != 0)
-                            transaction.Commit();
-                        else
-                            transaction.Rollback();
-
-                        return (ret != 0);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    m_log.Error("[REGION DB]: LinkRegion failed: " + ex.Message);
-                    transaction.Rollback();
-                }
-            }
-            return false;
-        }
-
-        public List<UUID> GetRegions(int estateID)
-        {
-            List<UUID> result = new List<UUID>();
-            string sql = "select RegionID from estate_map where EstateID = @EstateID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            {
-                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    cmd.Parameters.AddWithValue("@EstateID", estateID);
-
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
-                        while (reader.Read())
-                        {
-                            result.Add(DBGuid.FromDB(reader["RegionID"]));
-                        }
-                        reader.Close();
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        public bool DeleteEstate(int estateID)
-        {
-            // TODO: Implementation!            
-            return false;
-        }
-        #endregion
-    }
-}

OpenSim/Data/MSSQL/MSSQLFriendsData.cs

@@ -1,99 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
-using System.Data.SqlClient;
-using System.Reflection;
-using System.Text;
-
-namespace OpenSim.Data.MSSQL
-{
-    public class MSSQLFriendsData : MSSQLGenericTableHandler<FriendsData>, IFriendsData
-    {
-        public MSSQLFriendsData(string connectionString, string realm)
-            : base(connectionString, realm, "FriendsStore")
-        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            {
-                conn.Open();
-                Migration m = new Migration(conn, GetType().Assembly, "FriendsStore");
-                m.Update();
-            }
-        }
-
-        public bool Delete(UUID principalID, string friend)
-        {
-            return Delete(principalID.ToString(), friend);
-        }
-
-        public override bool Delete(string principalID, string friend)
-        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-                cmd.CommandText = String.Format("delete from {0} where PrincipalID = @PrincipalID and Friend = @Friend", m_Realm);
-                cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@Friend", friend));
-                cmd.Connection = conn;
-                conn.Open();
-                cmd.ExecuteNonQuery();
-
-                return true;
-            }
-        }
-
-        public FriendsData[] GetFriends(UUID principalID)
-        {
-            return GetFriends(principalID.ToString());
-        }
-
-        public FriendsData[] GetFriends(string principalID)
-        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-
-                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.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
-                cmd.Connection = conn;
-                conn.Open();
-                return DoQuery(cmd);
-            }
-        }
-
-        public FriendsData[] GetFriends(Guid principalID)
-        {
-            return GetFriends(principalID.ToString());
-        }
- 
-    }
-}

OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs

@@ -1,384 +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.Reflection;
-using log4net;
-using System.Data.SqlClient;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using System.Text;
-
-namespace OpenSim.Data.MSSQL
-{
-    public class MSSQLGenericTableHandler<T> where T : class, new()
-    {
-//        private static readonly ILog m_log =
-//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        protected string m_ConnectionString;
-        protected MSSQLManager m_database; //used for parameter type translation
-        protected Dictionary<string, FieldInfo> m_Fields =
-                new Dictionary<string, FieldInfo>();
-
-        protected List<string> m_ColumnNames = null;
-        protected string m_Realm;
-        protected FieldInfo m_DataField = null;
-
-        public MSSQLGenericTableHandler(string connectionString,
-                string realm, string storeName)
-        {
-            m_Realm = realm;
-            
-            m_ConnectionString = connectionString;
-
-            if (storeName != String.Empty)
-            {
-                using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-                {
-                    conn.Open();
-                    Migration m = new Migration(conn, GetType().Assembly, storeName);
-                    m.Update();
-                }
-
-            }
-            m_database = new MSSQLManager(m_ConnectionString);
-
-            Type t = typeof(T);
-            FieldInfo[] fields = t.GetFields(BindingFlags.Public |
-                                             BindingFlags.Instance |
-                                             BindingFlags.DeclaredOnly);
-
-            if (fields.Length == 0)
-                return;
-
-            foreach (FieldInfo f in fields)
-            {
-                if (f.Name != "Data")
-                    m_Fields[f.Name] = f;
-                else
-                    m_DataField = f;
-            }
-
-        }
-
-        private void CheckColumnNames(SqlDataReader reader)
-        {
-            if (m_ColumnNames != null)
-                return;
-
-            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())))
-                    m_ColumnNames.Add(row["ColumnName"].ToString());
-
-            }
-        }
-
-        private List<string> GetConstraints()
-        {
-            List<string> constraints = new List<string>();
-            string query = string.Format(@"SELECT 
-                            COL_NAME(ic.object_id,ic.column_id) AS column_name
-                            FROM sys.indexes AS i
-                            INNER JOIN sys.index_columns AS ic 
-                              ON i.object_id = ic.object_id AND i.index_id = ic.index_id
-                            WHERE i.is_primary_key = 1 
-                            AND i.object_id = OBJECT_ID('{0}');", m_Realm);
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(query, conn))
-            {
-                conn.Open();
-                using (SqlDataReader rdr = cmd.ExecuteReader())
-                {
-                    while (rdr.Read())
-                    {
-                        // query produces 0 to many rows of single column, so always add the first item in each row
-                        constraints.Add((string)rdr[0]);
-                    }
-                }
-                return constraints;
-            }
-        }
-
-        public virtual T[] Get(string field, string key)
-        {
-            return Get(new string[] { field }, new string[] { key });
-        }
-
-        public virtual T[] Get(string[] fields, string[] keys)
-        {
-            if (fields.Length != keys.Length)
-                return new T[0];
-
-            List<string> terms = new List<string>();
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-
-                for (int i = 0; i < fields.Length; i++)
-                {
-                    cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
-                    terms.Add("[" + fields[i] + "] = @" + fields[i]);
-                }
-
-                string where = String.Join(" AND ", terms.ToArray());
-
-                string query = String.Format("SELECT * FROM {0} WHERE {1}",
-                        m_Realm, where);
-
-                cmd.Connection = conn;
-                cmd.CommandText = query;
-                conn.Open();
-                return DoQuery(cmd);
-            }
-        }
-
-        protected T[] DoQuery(SqlCommand cmd)
-        {
-            List<T> result = new List<T>();
-            using (SqlDataReader reader = cmd.ExecuteReader())
-            {
-                if (reader == null)
-                    return new T[0];
-
-                CheckColumnNames(reader);                
-
-                while (reader.Read())
-                {
-                    T row = new T();
-
-                    foreach (string name in m_Fields.Keys)
-                    {
-                        if (m_Fields[name].GetValue(row) is bool)
-                        {
-                            int v = Convert.ToInt32(reader[name]);
-                            m_Fields[name].SetValue(row, v != 0 ? true : false);
-                        }
-                        else if (m_Fields[name].GetValue(row) is UUID)
-                        {
-                            UUID uuid = UUID.Zero;
-
-                            UUID.TryParse(reader[name].ToString(), out uuid);
-                            m_Fields[name].SetValue(row, uuid);
-                        }
-                        else if (m_Fields[name].GetValue(row) is int)
-                        {
-                            int v = Convert.ToInt32(reader[name]);
-                            m_Fields[name].SetValue(row, v);
-                        }
-                        else
-                        {
-                            m_Fields[name].SetValue(row, reader[name]);
-                        }
-                    }
-
-                    if (m_DataField != null)
-                    {
-                        Dictionary<string, string> data =
-                                new Dictionary<string, string>();
-
-                        foreach (string col in m_ColumnNames)
-                        {
-                            data[col] = reader[col].ToString();
-                            if (data[col] == null)
-                                data[col] = String.Empty;
-                        }
-
-                        m_DataField.SetValue(row, data);
-                    }
-
-                    result.Add(row);
-                }
-                return result.ToArray();
-            }
-        }
-
-        public virtual T[] Get(string where)
-        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-
-                string query = String.Format("SELECT * FROM {0} WHERE {1}",
-                        m_Realm, where);
-                cmd.Connection = conn;
-                cmd.CommandText = query;
-
-                //m_log.WarnFormat("[MSSQLGenericTable]: SELECT {0} WHERE {1}", m_Realm, where);
-
-                conn.Open();
-                return DoQuery(cmd);
-            }
-        }
-
-        public virtual bool Store(T row)
-        {
-            List<string> constraintFields = GetConstraints();
-            List<KeyValuePair<string, string>> constraints = new List<KeyValuePair<string, string>>();
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-
-                StringBuilder query = new StringBuilder();
-                List<String> names = new List<String>();
-                List<String> values = new List<String>();
-
-                foreach (FieldInfo fi in m_Fields.Values)
-                {
-                    names.Add(fi.Name);
-                    values.Add("@" + fi.Name);
-                    // Temporarily return more information about what field is unexpectedly null for
-                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the 
-                    // InventoryTransferModule or we may be required to substitute a DBNull here.
-                    if (fi.GetValue(row) == null)
-                        throw new NullReferenceException(
-                            string.Format(
-                                "[MSSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null",
-                                fi.Name, row));
-
-                    if (constraintFields.Count > 0 && constraintFields.Contains(fi.Name))
-                    {
-                        constraints.Add(new KeyValuePair<string, string>(fi.Name, fi.GetValue(row).ToString()));
-                    }
-                    cmd.Parameters.Add(m_database.CreateParameter(fi.Name, fi.GetValue(row).ToString()));
-                }
-
-                if (m_DataField != null)
-                {
-                    Dictionary<string, string> data =
-                            (Dictionary<string, string>)m_DataField.GetValue(row);
-
-                    foreach (KeyValuePair<string, string> kvp in data)
-                    {
-                        if (constraintFields.Count > 0 && constraintFields.Contains(kvp.Key))
-                        {
-                            constraints.Add(new KeyValuePair<string, string>(kvp.Key, kvp.Key));
-                        }
-                        names.Add(kvp.Key);
-                        values.Add("@" + kvp.Key);
-                        cmd.Parameters.Add(m_database.CreateParameter("@" + kvp.Key, kvp.Value));
-                    }
-
-                }
-
-                query.AppendFormat("UPDATE {0} SET ", m_Realm);
-                int i = 0;
-                for (i = 0; i < names.Count - 1; i++)
-                {
-                    query.AppendFormat("[{0}] = {1}, ", names[i], values[i]);
-                }
-                query.AppendFormat("[{0}] = {1} ", names[i], values[i]);
-                if (constraints.Count > 0)
-                {
-                    List<string> terms = new List<string>();
-                    for (int j = 0; j < constraints.Count; j++)
-                    {
-                        terms.Add(" [" + constraints[j].Key + "] = @" + constraints[j].Key);
-                    }
-                    string where = String.Join(" AND ", terms.ToArray());
-                    query.AppendFormat(" WHERE {0} ", where);
-                    
-                }
-                cmd.Connection = conn;
-                cmd.CommandText = query.ToString();
-                
-                conn.Open();
-                if (cmd.ExecuteNonQuery() > 0)
-                {
-                    //m_log.WarnFormat("[MSSQLGenericTable]: Updating {0}", m_Realm);
-                    return true;
-                }
-                else
-                {
-                    // assume record has not yet been inserted
-
-                    query = new StringBuilder();
-                    query.AppendFormat("INSERT INTO {0} ([", m_Realm);
-                    query.Append(String.Join("],[", names.ToArray()));
-                    query.Append("]) values (" + String.Join(",", values.ToArray()) + ")");
-                    cmd.Connection = conn;
-                    cmd.CommandText = query.ToString();
-                    //m_log.WarnFormat("[MSSQLGenericTable]: Inserting into {0}", m_Realm);
-                    if (conn.State != ConnectionState.Open)
-                        conn.Open();
-                    if (cmd.ExecuteNonQuery() > 0)
-                        return true;
-                }
-
-                return false;
-            }
-        }
-
-        public virtual bool Delete(string field, string key)
-        {
-            return Delete(new string[] { field }, new string[] { key });
-        }
-
-        public virtual bool Delete(string[] fields, string[] keys)
-        {
-            if (fields.Length != keys.Length)
-                return false;
-
-            List<string> terms = new List<string>();
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-                for (int i = 0; i < fields.Length; i++)
-                {
-                    cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
-                    terms.Add("[" + fields[i] + "] = @" + fields[i]);
-                }
-
-                string where = String.Join(" AND ", terms.ToArray());
-
-                string query = String.Format("DELETE FROM {0} WHERE {1}", m_Realm, where);
-
-                cmd.Connection = conn;
-                cmd.CommandText = query;
-                conn.Open();
-
-                if (cmd.ExecuteNonQuery() > 0)
-                {
-                    //m_log.Warn("[MSSQLGenericTable]: " + deleteCommand);
-                    return true;
-                }
-                return false;
-            }
-        }
-    }
-}

OpenSim/Data/MSSQL/MSSQLInventoryData.cs

@@ -1,831 +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.Data.SqlClient;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.MSSQL
-{
-    /// <summary>
-    /// A MSSQL interface for the inventory server
-    /// </summary>
-    public class MSSQLInventoryData : IInventoryDataPlugin
-    {
-        private const string _migrationStore = "InventoryStore";
-
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// The database manager
-        /// </summary>
-        private MSSQLManager database;
-        private string m_connectionString;
-
-        #region IPlugin members
-
-        [Obsolete("Cannot be default-initialized!")]
-        public void Initialise()
-        {
-            m_log.Info("[MSSQLInventoryData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException(Name);
-        }
-
-        /// <summary>
-        /// Loads and initialises the MSSQL inventory storage interface
-        /// </summary>
-        /// <param name="connectionString">connect string</param>
-        /// <remarks>use mssql_connection.ini</remarks>
-        public void Initialise(string connectionString)
-        {
-            m_connectionString = connectionString;
-            database = new MSSQLManager(connectionString);
-          
-            //New migrations check of store
-            database.CheckMigration(_migrationStore);
-        }
-
-        /// <summary>
-        /// The name of this DB provider
-        /// </summary>
-        /// <returns>A string containing the name of the DB provider</returns>
-        public string Name
-        {
-            get { return "MSSQL Inventory Data Interface"; }
-        }
-
-        /// <summary>
-        /// Closes this DB provider
-        /// </summary>
-        public void Dispose()
-        {
-            database = null;
-        }
-
-        /// <summary>
-        /// Returns the version of this DB provider
-        /// </summary>
-        /// <returns>A string containing the DB provider</returns>
-        public string Version
-        {
-            get { return database.getVersion(); }
-        }
-
-        #endregion
-
-        #region Folder methods
-
-        /// <summary>
-        /// Returns a list of the root folders within a users inventory
-        /// </summary>
-        /// <param name="user">The user whos inventory is to be searched</param>
-        /// <returns>A list of folder objects</returns>
-        public List<InventoryFolderBase> getUserRootFolders(UUID user)
-        {
-            if (user == UUID.Zero)
-                return new List<InventoryFolderBase>();
-
-            return getInventoryFolders(UUID.Zero, user);
-        }
-
-        /// <summary>
-        /// see InventoryItemBase.getUserRootFolder
-        /// </summary>
-        /// <param name="user">the User UUID</param>
-        /// <returns></returns>
-        public InventoryFolderBase getUserRootFolder(UUID user)
-        {
-            List<InventoryFolderBase> items = getUserRootFolders(user);
-
-            InventoryFolderBase rootFolder = null;
-
-            // There should only ever be one root folder for a user.  However, if there's more
-            // than one we'll simply use the first one rather than failing.  It would be even
-            // nicer to print some message to this effect, but this feels like it's too low a
-            // to put such a message out, and it's too minor right now to spare the time to
-            // suitably refactor.
-            if (items.Count > 0)
-            {
-                rootFolder = items[0];
-            }
-
-            return rootFolder;
-        }
-
-        /// <summary>
-        /// Returns a list of folders in a users inventory contained within the specified folder
-        /// </summary>
-        /// <param name="parentID">The folder to search</param>
-        /// <returns>A list of inventory folders</returns>
-        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
-        {
-            return getInventoryFolders(parentID, UUID.Zero);
-        }
-
-        /// <summary>
-        /// Returns a specified inventory folder
-        /// </summary>
-        /// <param name="folderID">The folder to return</param>
-        /// <returns>A folder class</returns>
-        public InventoryFolderBase getInventoryFolder(UUID folderID)
-        {
-            string sql = "SELECT * FROM inventoryfolders WHERE folderID = @folderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(database.CreateParameter("folderID", folderID));
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    if (reader.Read())
-                    {
-                        return readInventoryFolder(reader);
-                    }
-                }
-            }
-            m_log.InfoFormat("[INVENTORY DB] : Found no inventory folder with ID : {0}", folderID);
-            return null;
-        }
-
-        /// <summary>
-        /// Returns all child folders in the hierarchy from the parent folder and down.
-        /// Does not return the parent folder itself.
-        /// </summary>
-        /// <param name="parentID">The folder to get subfolders for</param>
-        /// <returns>A list of inventory folders</returns>
-        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
-        {
-            //Note maybe change this to use a Dataset that loading in all folders of a user and then go throw it that way.
-            //Note this is changed so it opens only one connection to the database and not everytime it wants to get data.
-
-            /*  NOTE: the implementation below is very inefficient (makes a separate request to get subfolders for
-             * every found folder, recursively).  Inventory code for other DBs has been already rewritten to get ALL
-             * inventory for a specific user at once.
-             * 
-             * Meanwhile, one little thing is corrected:  getFolderHierarchy(UUID.Zero) doesn't make sense and should never 
-             * be used, so check for that and return an empty list.
-             */
-
-            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-
-            if (parentID == UUID.Zero)
-                return folders;
-
-            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(database.CreateParameter("@parentID", parentID));
-                conn.Open();
-                folders.AddRange(getInventoryFolders(cmd));
-
-                List<InventoryFolderBase> tempFolders = new List<InventoryFolderBase>();
-
-                foreach (InventoryFolderBase folderBase in folders)
-                {
-                    tempFolders.AddRange(getFolderHierarchy(folderBase.ID, cmd));
-                }
-                if (tempFolders.Count > 0)
-                {
-                    folders.AddRange(tempFolders);
-                }
-            }
-            return folders;
-        }
-
-        /// <summary>
-        /// Creates a new inventory folder
-        /// </summary>
-        /// <param name="folder">Folder to create</param>
-        public void addInventoryFolder(InventoryFolderBase folder)
-        {
-            string sql = @"INSERT INTO inventoryfolders ([folderID], [agentID], [parentFolderID], [folderName], [type], [version]) 
-                            VALUES (@folderID, @agentID, @parentFolderID, @folderName, @type, @version);";
-
-            string folderName = folder.Name;
-            if (folderName.Length > 64)
-            {
-                folderName = folderName.Substring(0, 64);
-                m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on add");
-            }
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
-                cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
-                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
-                cmd.Parameters.Add(database.CreateParameter("folderName", folderName));
-                cmd.Parameters.Add(database.CreateParameter("type", folder.Type));
-                cmd.Parameters.Add(database.CreateParameter("version", folder.Version));
-                conn.Open();
-                try
-                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[INVENTORY DB]: Error : {0}", e.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Updates an inventory folder
-        /// </summary>
-        /// <param name="folder">Folder to update</param>
-        public void updateInventoryFolder(InventoryFolderBase folder)
-        {
-            string sql = @"UPDATE inventoryfolders SET agentID = @agentID, 
-                                                       parentFolderID = @parentFolderID,
-                                                       folderName = @folderName,
-                                                       type = @type,
-                                                       version = @version 
-                           WHERE folderID = @folderID";
-
-            string folderName = folder.Name;
-            if (folderName.Length > 64)
-            {
-                folderName = folderName.Substring(0, 64);
-                m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on update");
-            }
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
-                cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
-                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
-                cmd.Parameters.Add(database.CreateParameter("folderName", folderName));
-                cmd.Parameters.Add(database.CreateParameter("type", folder.Type));
-                cmd.Parameters.Add(database.CreateParameter("version", folder.Version));
-                conn.Open();
-                try
-                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[INVENTORY DB]: Error : {0}", e.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Updates an inventory folder
-        /// </summary>
-        /// <param name="folder">Folder to update</param>
-        public void moveInventoryFolder(InventoryFolderBase folder)
-        {
-            string sql = @"UPDATE inventoryfolders SET parentFolderID = @parentFolderID WHERE folderID = @folderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
-                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
-                conn.Open();
-                try
-                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[INVENTORY DB]: Error : {0}", e.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Delete an inventory folder
-        /// </summary>
-        /// <param name="folderID">Id of folder to delete</param>
-        public void deleteInventoryFolder(UUID folderID)
-        {
-            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID";
-
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                List<InventoryFolderBase> subFolders;
-                cmd.Parameters.Add(database.CreateParameter("@parentID", UUID.Zero));
-                conn.Open();
-                subFolders = getFolderHierarchy(folderID, cmd);
-                
-
-                //Delete all sub-folders
-                foreach (InventoryFolderBase f in subFolders)
-                {
-                    DeleteOneFolder(f.ID, conn);
-                    DeleteItemsInFolder(f.ID, conn);
-                }
-
-                //Delete the actual row
-                DeleteOneFolder(folderID, conn);
-                DeleteItemsInFolder(folderID, conn);
-            }
-        }
-
-        #endregion
-
-        #region Item Methods
-
-        /// <summary>
-        /// Returns a list of items in a specified folder
-        /// </summary>
-        /// <param name="folderID">The folder to search</param>
-        /// <returns>A list containing inventory items</returns>
-        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
-        {
-            string sql = "SELECT * FROM inventoryitems WHERE parentFolderID = @parentFolderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folderID));
-                conn.Open();
-                List<InventoryItemBase> items = new List<InventoryItemBase>();
-
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    while (reader.Read())
-                    {
-                        items.Add(readInventoryItem(reader));
-                    }
-                }
-                return items;
-            }
-        }
-
-        /// <summary>
-        /// Returns a specified inventory item
-        /// </summary>
-        /// <param name="itemID">The item ID</param>
-        /// <returns>An inventory item</returns>
-        public InventoryItemBase getInventoryItem(UUID itemID)
-        {
-            string sql = "SELECT * FROM inventoryitems WHERE inventoryID = @inventoryID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    if (reader.Read())
-                    {
-                        return readInventoryItem(reader);
-                    }
-                }
-            }
-            
-            m_log.InfoFormat("[INVENTORY DB]: Found no inventory item with ID : {0}", itemID);
-            return null;
-        }
-
-        /// <summary>
-        /// Adds a specified item to the database
-        /// </summary>
-        /// <param name="item">The inventory item</param>
-        public void addInventoryItem(InventoryItemBase item)
-        {
-            if (getInventoryItem(item.ID) != null)
-            {
-                updateInventoryItem(item);
-                return;
-            }
-
-            string sql = @"INSERT INTO inventoryitems 
-                            ([inventoryID], [assetID], [assetType], [parentFolderID], [avatarID], [inventoryName], 
-                             [inventoryDescription], [inventoryNextPermissions], [inventoryCurrentPermissions],
-                             [invType], [creatorID], [inventoryBasePermissions], [inventoryEveryOnePermissions], [inventoryGroupPermissions],
-                             [salePrice], [saleType], [creationDate], [groupID], [groupOwned], [flags]) 
-                        VALUES
-                            (@inventoryID, @assetID, @assetType, @parentFolderID, @avatarID, @inventoryName, @inventoryDescription,
-                             @inventoryNextPermissions, @inventoryCurrentPermissions, @invType, @creatorID,
-                             @inventoryBasePermissions, @inventoryEveryOnePermissions, @inventoryGroupPermissions, @salePrice, @saleType,
-                             @creationDate, @groupID, @groupOwned, @flags)";
-            
-            string itemName = item.Name;
-            if (item.Name.Length > 64)
-            {
-                itemName = item.Name.Substring(0, 64);
-                m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length.ToString() + " to " + itemName.Length.ToString() + " characters");
-            }
-            
-            string itemDesc = item.Description;
-            if (item.Description.Length > 128)
-            {
-                itemDesc = item.Description.Substring(0, 128);
-                m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters");
-            }
-
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
-            {
-                command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
-                command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
-                command.Parameters.Add(database.CreateParameter("assetType", item.AssetType));
-                command.Parameters.Add(database.CreateParameter("parentFolderID", item.Folder));
-                command.Parameters.Add(database.CreateParameter("avatarID", item.Owner));
-                command.Parameters.Add(database.CreateParameter("inventoryName", itemName));
-                command.Parameters.Add(database.CreateParameter("inventoryDescription", itemDesc));
-                command.Parameters.Add(database.CreateParameter("inventoryNextPermissions", item.NextPermissions));
-                command.Parameters.Add(database.CreateParameter("inventoryCurrentPermissions", item.CurrentPermissions));
-                command.Parameters.Add(database.CreateParameter("invType", item.InvType));
-                command.Parameters.Add(database.CreateParameter("creatorID", item.CreatorId));
-                command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions));
-                command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions));
-                command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions));
-                command.Parameters.Add(database.CreateParameter("salePrice", item.SalePrice));
-                command.Parameters.Add(database.CreateParameter("saleType", item.SaleType));
-                command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate));
-                command.Parameters.Add(database.CreateParameter("groupID", item.GroupID));
-                command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned));
-                command.Parameters.Add(database.CreateParameter("flags", item.Flags));
-                conn.Open();
-                try
-                {
-                    command.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[INVENTORY DB]: Error inserting item :" + e.Message);
-                }
-            }
-
-            sql = "UPDATE inventoryfolders SET version = version + 1 WHERE folderID = @folderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
-            {
-                command.Parameters.Add(database.CreateParameter("folderID", item.Folder.ToString()));
-                conn.Open();
-                try
-                {
-                    command.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[INVENTORY DB] Error updating inventory folder for new item :" + e.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Updates the specified inventory item
-        /// </summary>
-        /// <param name="item">Inventory item to update</param>
-        public void updateInventoryItem(InventoryItemBase item)
-        {
-            string sql = @"UPDATE inventoryitems SET assetID = @assetID, 
-                                                assetType = @assetType,
-                                                parentFolderID = @parentFolderID,
-                                                avatarID = @avatarID,
-                                                inventoryName = @inventoryName, 
-                                                inventoryDescription = @inventoryDescription, 
-                                                inventoryNextPermissions = @inventoryNextPermissions, 
-                                                inventoryCurrentPermissions = @inventoryCurrentPermissions, 
-                                                invType = @invType, 
-                                                creatorID = @creatorID, 
-                                                inventoryBasePermissions = @inventoryBasePermissions, 
-                                                inventoryEveryOnePermissions = @inventoryEveryOnePermissions, 
-                                                inventoryGroupPermissions = @inventoryGroupPermissions, 
-                                                salePrice = @salePrice, 
-                                                saleType = @saleType, 
-                                                creationDate = @creationDate, 
-                                                groupID = @groupID, 
-                                                groupOwned = @groupOwned, 
-                                                flags = @flags 
-                                        WHERE inventoryID = @inventoryID";
-
-            string itemName = item.Name;
-            if (item.Name.Length > 64)
-            {
-                itemName = item.Name.Substring(0, 64);
-                m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length.ToString() + " to " + itemName.Length.ToString() + " characters on update");
-            }
-            
-            string itemDesc = item.Description;
-            if (item.Description.Length > 128)
-            {
-                itemDesc = item.Description.Substring(0, 128);
-                m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update");
-            }
-
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
-            {
-                command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
-                command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
-                command.Parameters.Add(database.CreateParameter("assetType", item.AssetType));
-                command.Parameters.Add(database.CreateParameter("parentFolderID", item.Folder));
-                command.Parameters.Add(database.CreateParameter("avatarID", item.Owner));
-                command.Parameters.Add(database.CreateParameter("inventoryName", itemName));
-                command.Parameters.Add(database.CreateParameter("inventoryDescription", itemDesc));
-                command.Parameters.Add(database.CreateParameter("inventoryNextPermissions", item.NextPermissions));
-                command.Parameters.Add(database.CreateParameter("inventoryCurrentPermissions", item.CurrentPermissions));
-                command.Parameters.Add(database.CreateParameter("invType", item.InvType));
-                command.Parameters.Add(database.CreateParameter("creatorID", item.CreatorId));
-                command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions));
-                command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions));
-                command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions));
-                command.Parameters.Add(database.CreateParameter("salePrice", item.SalePrice));
-                command.Parameters.Add(database.CreateParameter("saleType", item.SaleType));
-                command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate));
-                command.Parameters.Add(database.CreateParameter("groupID", item.GroupID));
-                command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned));
-                command.Parameters.Add(database.CreateParameter("flags", item.Flags));
-                conn.Open();
-                try
-                {
-                    command.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[INVENTORY DB]: Error updating item :" + e.Message);
-                }
-            }
-        }
-
-        // See IInventoryDataPlugin
-
-        /// <summary>
-        /// Delete an item in inventory database
-        /// </summary>
-        /// <param name="itemID">the item UUID</param>
-        public void deleteInventoryItem(UUID itemID)
-        {
-            string sql = "DELETE FROM inventoryitems WHERE inventoryID=@inventoryID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
-                try
-                {
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[INVENTORY DB]: Error deleting item :" + e.Message);
-                }
-            }
-        }
-
-        public InventoryItemBase queryInventoryItem(UUID itemID)
-        {
-            return getInventoryItem(itemID);
-        }
-
-        public InventoryFolderBase queryInventoryFolder(UUID folderID)
-        {
-            return getInventoryFolder(folderID);
-        }
-
-        /// <summary>
-        /// Returns all activated gesture-items in the inventory of the specified avatar.
-        /// </summary>
-        /// <param name="avatarID">The <see cref="UUID"/> of the avatar</param>
-        /// <returns>
-        /// The list of gestures (<see cref="InventoryItemBase"/>s)
-        /// </returns>
-        public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
-        {
-            string sql = "SELECT * FROM inventoryitems WHERE avatarId = @uuid AND assetType = @assetType and flags = 1";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(database.CreateParameter("uuid", avatarID));
-                cmd.Parameters.Add(database.CreateParameter("assetType", (int)AssetType.Gesture));
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
-                {
-                    List<InventoryItemBase> gestureList = new List<InventoryItemBase>();
-                    while (reader.Read())
-                    {
-                        gestureList.Add(readInventoryItem(reader));
-                    }
-                    return gestureList;
-                }
-            }
-        }
-
-        #endregion
-
-        #region Private methods
-
-        /// <summary>
-        /// Delete an item in inventory database
-        /// </summary>
-        /// <param name="folderID">the item ID</param>
-        /// <param name="connection">connection to the database</param>
-        private void DeleteItemsInFolder(UUID folderID, SqlConnection connection)
-        {
-            using (SqlCommand command = new SqlCommand("DELETE FROM inventoryitems WHERE folderID=@folderID", connection))
-            {
-                command.Parameters.Add(database.CreateParameter("folderID", folderID));
-
-                try
-                {
-                    command.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[INVENTORY DB] Error deleting item :" + e.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the folder hierarchy in a loop.
-        /// </summary>
-        /// <param name="parentID">parent ID.</param>
-        /// <param name="command">SQL command/connection to database</param>
-        /// <returns></returns>
-        private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, SqlCommand command)
-        {
-            command.Parameters["@parentID"].Value = parentID.Guid; //.ToString();
-
-            List<InventoryFolderBase> folders = getInventoryFolders(command);
-
-            if (folders.Count > 0)
-            {
-                List<InventoryFolderBase> tempFolders = new List<InventoryFolderBase>();
-
-                foreach (InventoryFolderBase folderBase in folders)
-                {
-                    tempFolders.AddRange(getFolderHierarchy(folderBase.ID, command));
-                }
-
-                if (tempFolders.Count > 0)
-                {
-                    folders.AddRange(tempFolders);
-                }
-            }
-            return folders;
-        }
-
-        /// <summary>
-        /// Gets the inventory folders.
-        /// </summary>
-        /// <param name="parentID">parentID, use UUID.Zero to get root</param>
-        /// <param name="user">user id, use UUID.Zero, if you want all folders from a parentID.</param>
-        /// <returns></returns>
-        private List<InventoryFolderBase> getInventoryFolders(UUID parentID, UUID user)
-        {
-            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID AND agentID LIKE @uuid";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
-            {
-                if (user == UUID.Zero)
-                {
-                    command.Parameters.Add(database.CreateParameter("uuid", "%"));
-                }
-                else
-                {
-                    command.Parameters.Add(database.CreateParameter("uuid", user));
-                }
-                command.Parameters.Add(database.CreateParameter("parentID", parentID));
-                conn.Open();
-                return getInventoryFolders(command);
-            }
-        }
-
-        /// <summary>
-        /// Gets the inventory folders.
-        /// </summary>
-        /// <param name="command">SQLcommand.</param>
-        /// <returns></returns>
-        private static List<InventoryFolderBase> getInventoryFolders(SqlCommand command)
-        {
-            using (SqlDataReader reader = command.ExecuteReader())
-            {
-
-                List<InventoryFolderBase> items = new List<InventoryFolderBase>();
-                while (reader.Read())
-                {
-                    items.Add(readInventoryFolder(reader));
-                }
-                return items;
-            }
-        }
-
-        /// <summary>
-        /// Reads a list of inventory folders returned by a query.
-        /// </summary>
-        /// <param name="reader">A MSSQL Data Reader</param>
-        /// <returns>A List containing inventory folders</returns>
-        protected static InventoryFolderBase readInventoryFolder(SqlDataReader reader)
-        {
-            try
-            {
-                InventoryFolderBase folder = new InventoryFolderBase();
-                folder.Owner = DBGuid.FromDB(reader["agentID"]);
-                folder.ParentID = DBGuid.FromDB(reader["parentFolderID"]);
-                folder.ID = DBGuid.FromDB(reader["folderID"]);
-                folder.Name = (string)reader["folderName"];
-                folder.Type = (short)reader["type"];
-                folder.Version = Convert.ToUInt16(reader["version"]);
-
-                return folder;
-            }
-            catch (Exception e)
-            {
-                m_log.Error("[INVENTORY DB] Error reading inventory folder :" + e.Message);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Reads a one item from an SQL result
-        /// </summary>
-        /// <param name="reader">The SQL Result</param>
-        /// <returns>the item read</returns>
-        private static InventoryItemBase readInventoryItem(IDataRecord reader)
-        {
-            try
-            {
-                InventoryItemBase item = new InventoryItemBase();
-
-                item.ID = DBGuid.FromDB(reader["inventoryID"]);
-                item.AssetID = DBGuid.FromDB(reader["assetID"]);
-                item.AssetType = Convert.ToInt32(reader["assetType"].ToString());
-                item.Folder = DBGuid.FromDB(reader["parentFolderID"]);
-                item.Owner = DBGuid.FromDB(reader["avatarID"]);
-                item.Name = reader["inventoryName"].ToString();
-                item.Description = reader["inventoryDescription"].ToString();
-                item.NextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"]);
-                item.CurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"]);
-                item.InvType = Convert.ToInt32(reader["invType"].ToString());
-                item.CreatorId = reader["creatorID"].ToString();
-                item.BasePermissions = Convert.ToUInt32(reader["inventoryBasePermissions"]);
-                item.EveryOnePermissions = Convert.ToUInt32(reader["inventoryEveryOnePermissions"]);
-                item.GroupPermissions = Convert.ToUInt32(reader["inventoryGroupPermissions"]);
-                item.SalePrice = Convert.ToInt32(reader["salePrice"]);
-                item.SaleType = Convert.ToByte(reader["saleType"]);
-                item.CreationDate = Convert.ToInt32(reader["creationDate"]);
-                item.GroupID = DBGuid.FromDB(reader["groupID"]);
-                item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
-                item.Flags = Convert.ToUInt32(reader["flags"]);
-
-                return item;
-            }
-            catch (SqlException e)
-            {
-                m_log.Error("[INVENTORY DB]: Error reading inventory item :" + e.Message);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Delete a folder in inventory databasae
-        /// </summary>
-        /// <param name="folderID">the folder UUID</param>
-        /// <param name="connection">connection to database</param>
-        private void DeleteOneFolder(UUID folderID, SqlConnection connection)
-        {
-            try
-            {
-                using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID and type=-1", connection))
-                {
-                    command.Parameters.Add(database.CreateParameter("folderID", folderID));
-
-                    command.ExecuteNonQuery();
-                }
-            }
-            catch (SqlException e)
-            {
-                m_log.Error("[INVENTORY DB]: Error deleting folder :" + e.Message);
-            }
-        }
-
-        #endregion
-    }
-}

OpenSim/Data/MSSQL/MSSQLManager.cs

@@ -1,219 +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.Data.SqlClient;
-using System.IO;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-
-namespace OpenSim.Data.MSSQL
-{
-    /// <summary>
-    /// A management class for the MS SQL Storage Engine
-    /// </summary>
-    public class MSSQLManager
-    {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// Connection string for ADO.net
-        /// </summary>
-        private readonly string connectionString;
-
-        /// <summary>
-        /// Initialize the manager and set the connectionstring
-        /// </summary>
-        /// <param name="connection"></param>
-        public MSSQLManager(string connection)
-        {
-            connectionString = connection;
-        }
-
-        /// <summary>
-        /// Type conversion to a SQLDbType functions
-        /// </summary>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        internal SqlDbType DbtypeFromType(Type type)
-        {
-            if (type == typeof(string))
-            {
-                return SqlDbType.VarChar;
-            }
-            if (type == typeof(double))
-            {
-                return SqlDbType.Float;
-            }
-            if (type == typeof(Single))
-            {
-                return SqlDbType.Float;
-            }
-            if (type == typeof(int))
-            {
-                return SqlDbType.Int;
-            }
-            if (type == typeof(bool))
-            {
-                return SqlDbType.Bit;
-            }
-            if (type == typeof(UUID))
-            {
-                return SqlDbType.UniqueIdentifier;
-            }
-            if (type == typeof(sbyte))
-            {
-                return SqlDbType.Int;
-            }
-            if (type == typeof(Byte[]))
-            {
-                return SqlDbType.Image;
-            }
-            if (type == typeof(uint) || type == typeof(ushort))
-            {
-                return SqlDbType.Int;
-            }
-            if (type == typeof(ulong))
-            {
-                return SqlDbType.BigInt;
-            }
-            if (type == typeof(DateTime))
-            {
-                return SqlDbType.DateTime;
-            }
-
-            return SqlDbType.VarChar;
-        }
-
-        /// <summary>
-        /// Creates value for parameter.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns></returns>
-        private static object CreateParameterValue(object value)
-        {
-            Type valueType = value.GetType();
-
-            if (valueType == typeof(UUID)) //TODO check if this works
-            {
-                return ((UUID) value).Guid;
-            }
-            if (valueType == typeof(UUID))
-            {
-                return ((UUID)value).Guid;
-            }
-            if (valueType == typeof(bool))
-            {
-                return (bool)value ? 1 : 0;
-            }
-            if (valueType == typeof(Byte[]))
-            {
-                return value;
-            }
-            if (valueType == typeof(int))
-            {
-                return value;
-            }
-            return value;
-        }
-
-        /// <summary>
-        /// Create a parameter for a command
-        /// </summary>
-        /// <param name="parameterName">Name of the parameter.</param>
-        /// <param name="parameterObject">parameter object.</param>
-        /// <returns></returns>
-        internal SqlParameter CreateParameter(string parameterName, object parameterObject)
-        {
-            return CreateParameter(parameterName, parameterObject, false);
-        }
-
-        /// <summary>
-        /// Creates the parameter for a command.
-        /// </summary>
-        /// <param name="parameterName">Name of the parameter.</param>
-        /// <param name="parameterObject">parameter object.</param>
-        /// <param name="parameterOut">if set to <c>true</c> parameter is a output parameter</param>
-        /// <returns></returns>
-        internal SqlParameter CreateParameter(string parameterName, object parameterObject, bool parameterOut)
-        {
-            //Tweak so we dont always have to add @ sign
-            if (!parameterName.StartsWith("@")) parameterName = "@" + parameterName;
-
-            //HACK if object is null, it is turned into a string, there are no nullable type till now
-            if (parameterObject == null) parameterObject = "";
-
-            SqlParameter parameter = new SqlParameter(parameterName, DbtypeFromType(parameterObject.GetType()));
-
-            if (parameterOut)
-            {
-                parameter.Direction = ParameterDirection.Output;
-            }
-            else
-            {
-                parameter.Direction = ParameterDirection.Input;
-                parameter.Value = CreateParameterValue(parameterObject);
-            }
-
-            return parameter;
-        }
-
-        /// <summary>
-        /// Checks if we need to do some migrations to the database
-        /// </summary>
-        /// <param name="migrationStore">migrationStore.</param>
-        public void CheckMigration(string migrationStore)
-        {
-            using (SqlConnection connection = new SqlConnection(connectionString)) 
-            {
-                connection.Open();
-                Assembly assem = GetType().Assembly;
-                MSSQLMigration migration = new MSSQLMigration(connection, assem, migrationStore);
-
-                migration.Update();
-            }
-        }
-
-        /// <summary>
-        /// Returns the version of this DB provider
-        /// </summary>
-        /// <returns>A string containing the DB provider</returns>
-        public string getVersion()
-        {
-            Module module = GetType().Module;
-            // string dllName = module.Assembly.ManifestModule.Name;
-            Version dllVersion = module.Assembly.GetName().Version;
-
-            return
-                string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
-                              dllVersion.Revision);
-        }
-    }
-}

OpenSim/Data/MSSQL/MSSQLPresenceData.cs

@@ -1,117 +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.Reflection;
-using System.Threading;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using System.Data.SqlClient;
-
-namespace OpenSim.Data.MSSQL
-{
-    /// <summary>
-    /// A MySQL Interface for the Presence Server
-    /// </summary>
-    public class MSSQLPresenceData : MSSQLGenericTableHandler<PresenceData>,
-            IPresenceData
-    {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public MSSQLPresenceData(string connectionString, string realm) :
-                base(connectionString, realm, "Presence")
-        {
-        }
-
-        public PresenceData Get(UUID sessionID)
-        {
-            PresenceData[] ret = Get("SessionID",
-                    sessionID.ToString());
-
-            if (ret.Length == 0)
-                return null;
-
-            return ret[0];
-        }
-
-        public void LogoutRegionAgents(UUID regionID)
-        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-
-                cmd.CommandText = String.Format("DELETE FROM {0} WHERE [RegionID]=@RegionID", m_Realm);
-
-                cmd.Parameters.Add(m_database.CreateParameter("@RegionID", regionID.ToString()));
-                cmd.Connection = conn;
-                conn.Open();
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        public bool ReportAgent(UUID sessionID, UUID regionID)
-        {
-            PresenceData[] pd = Get("SessionID", sessionID.ToString());
-            if (pd.Length == 0)
-                return false;
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-
-                cmd.CommandText = String.Format(@"UPDATE {0} SET 
-                                                [RegionID] = @RegionID
-                                        WHERE [SessionID] = @SessionID", m_Realm);
-
-                cmd.Parameters.Add(m_database.CreateParameter("@SessionID", sessionID.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@RegionID", regionID.ToString()));
-                cmd.Connection = conn;
-                conn.Open();
-                if (cmd.ExecuteNonQuery() == 0)
-                    return false;
-            }
-            return true;
-        }
-
-        public bool VerifyAgent(UUID agentId, UUID secureSessionID)
-        {
-            PresenceData[] ret = Get("SecureSessionID",
-                    secureSessionID.ToString());
-            
-            if (ret.Length == 0)
-                return false;
-
-            if(ret[0].UserID != agentId.ToString())
-                return false;
-
-            return true;
-        }
-    }
-}

OpenSim/Data/MSSQL/MSSQLRegionData.cs

@@ -1,352 +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.Data.SqlClient;
-using System.Drawing;
-using System.IO;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using RegionFlags = OpenSim.Framework.RegionFlags;
-
-namespace OpenSim.Data.MSSQL
-{
-    /// <summary>
-    /// A MSSQL Interface for the Region Server.
-    /// </summary>
-    public class MSSQLRegionData : IRegionData
-    {
-        private string m_Realm;
-        private List<string> m_ColumnNames = null;
-        private string m_ConnectionString;
-        private MSSQLManager m_database;
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public MSSQLRegionData(string connectionString, string realm) 
-        {
-            m_Realm = realm;
-            m_ConnectionString = connectionString;
-            m_database = new MSSQLManager(connectionString);
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            {
-                conn.Open();
-                Migration m = new Migration(conn, GetType().Assembly, "GridStore");
-                m.Update();
-            }
-         }
-
-        public List<RegionData> Get(string regionName, UUID scopeID)
-        {
-            string sql = "select * from ["+m_Realm+"] where regionName like @regionName";
-            if (scopeID != UUID.Zero)
-                sql += " and ScopeID = @scopeID";
-            sql += " order by regionName";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@regionName", regionName));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                conn.Open();
-                return RunCommand(cmd);
-            }
-        }
-
-        public RegionData Get(int posX, int posY, UUID scopeID)
-        {
-            string sql = "select * from ["+m_Realm+"] where locX = @posX and locY = @posY";
-            if (scopeID != UUID.Zero)
-                sql += " and ScopeID = @scopeID";
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@posX", posX.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@posY", posY.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                conn.Open();
-                List<RegionData> ret = RunCommand(cmd);
-                if (ret.Count == 0)
-                    return null;
-
-                return ret[0];
-            }
-        }
-
-        public RegionData Get(UUID regionID, UUID scopeID)
-        {
-            string sql = "select * from ["+m_Realm+"] where uuid = @regionID";
-            if (scopeID != UUID.Zero)
-                sql += " and ScopeID = @scopeID";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@regionID", regionID));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                conn.Open();
-                List<RegionData> ret = RunCommand(cmd);
-                if (ret.Count == 0)
-                    return null;
-
-                return ret[0];
-            }
-        }
-
-        public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
-        {
-            string sql = "select * from ["+m_Realm+"] where locX between @startX and @endX and locY between @startY and @endY";
-            if (scopeID != UUID.Zero)
-                sql += " and ScopeID = @scopeID";
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@startX", startX));
-                cmd.Parameters.Add(m_database.CreateParameter("@startY", startY));
-                cmd.Parameters.Add(m_database.CreateParameter("@endX", endX));
-                cmd.Parameters.Add(m_database.CreateParameter("@endY", endY));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                conn.Open();
-                return RunCommand(cmd);
-            }
-        }
-
-        public List<RegionData> RunCommand(SqlCommand cmd)
-        {
-            List<RegionData> retList = new List<RegionData>();
-
-            SqlDataReader result = cmd.ExecuteReader();
-
-            while (result.Read())
-            {
-                RegionData ret = new RegionData();
-                ret.Data = new Dictionary<string, object>();
-
-                UUID regionID;
-                UUID.TryParse(result["uuid"].ToString(), out regionID);
-                ret.RegionID = regionID;
-                UUID scope;
-                UUID.TryParse(result["ScopeID"].ToString(), out scope);
-                ret.ScopeID = scope;
-                ret.RegionName = result["regionName"].ToString();
-                ret.posX = Convert.ToInt32(result["locX"]);
-                ret.posY = Convert.ToInt32(result["locY"]);
-                ret.sizeX = Convert.ToInt32(result["sizeX"]);
-                ret.sizeY = Convert.ToInt32(result["sizeY"]);
-
-                if (m_ColumnNames == null)
-                {
-                    m_ColumnNames = new List<string>();
-
-                    DataTable schemaTable = result.GetSchemaTable();
-                    foreach (DataRow row in schemaTable.Rows)
-                        m_ColumnNames.Add(row["ColumnName"].ToString());
-                }
-
-                foreach (string s in m_ColumnNames)
-                {
-                    if (s == "uuid")
-                        continue;
-                    if (s == "ScopeID")
-                        continue;
-                    if (s == "regionName")
-                        continue;
-                    if (s == "locX")
-                        continue;
-                    if (s == "locY")
-                        continue;
-
-                    ret.Data[s] = result[s].ToString();
-                }
-
-                retList.Add(ret);
-            }
-            return retList;
-        }
-
-        public bool Store(RegionData data)
-        {
-            if (data.Data.ContainsKey("uuid"))
-                data.Data.Remove("uuid");
-            if (data.Data.ContainsKey("ScopeID"))
-                data.Data.Remove("ScopeID");
-            if (data.Data.ContainsKey("regionName"))
-                data.Data.Remove("regionName");
-            if (data.Data.ContainsKey("posX"))
-                data.Data.Remove("posX");
-            if (data.Data.ContainsKey("posY"))
-                data.Data.Remove("posY");
-            if (data.Data.ContainsKey("sizeX"))
-                data.Data.Remove("sizeX");
-            if (data.Data.ContainsKey("sizeY"))
-                data.Data.Remove("sizeY");
-            if (data.Data.ContainsKey("locX"))
-                data.Data.Remove("locX");
-            if (data.Data.ContainsKey("locY"))
-                data.Data.Remove("locY");
-
-            string[] fields = new List<string>(data.Data.Keys).ToArray();
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-
-                string update = "update [" + m_Realm + "] set locX=@posX, locY=@posY, sizeX=@sizeX, sizeY=@sizeY ";
-                
-                foreach (string field in fields)
-                {
-
-                    update += ", ";
-                    update += "[" + field + "] = @" + field;
-
-                    cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
-                }
-
-                update += " where uuid = @regionID";
-
-                if (data.ScopeID != UUID.Zero)
-                    update += " and ScopeID = @scopeID";
-
-                cmd.CommandText = update;
-                cmd.Connection = conn;
-                cmd.Parameters.Add(m_database.CreateParameter("@regionID", data.RegionID));
-                cmd.Parameters.Add(m_database.CreateParameter("@regionName", data.RegionName));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", data.ScopeID));
-                cmd.Parameters.Add(m_database.CreateParameter("@posX", data.posX));
-                cmd.Parameters.Add(m_database.CreateParameter("@posY", data.posY));
-                cmd.Parameters.Add(m_database.CreateParameter("@sizeX", data.sizeX));
-                cmd.Parameters.Add(m_database.CreateParameter("@sizeY", data.sizeY));
-                conn.Open();
-                try
-                {
-                    if (cmd.ExecuteNonQuery() < 1)
-                    {
-                        string insert = "insert into [" + m_Realm + "] ([uuid], [ScopeID], [locX], [locY], [sizeX], [sizeY], [regionName], [" +
-                                String.Join("], [", fields) +
-                                "]) values (@regionID, @scopeID, @posX, @posY, @sizeX, @sizeY, @regionName, @" + String.Join(", @", fields) + ")";
-
-                        cmd.CommandText = insert;
-
-                        try
-                        {
-                            if (cmd.ExecuteNonQuery() < 1)
-                            {
-                                return false;
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            m_log.Warn("[MSSQL Grid]: Error inserting into Regions table: " + ex.Message + ", INSERT sql: " + insert);
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    m_log.Warn("[MSSQL Grid]: Error updating Regions table: " + ex.Message + ", UPDATE sql: " + update);
-                }
-            }
-
-            return true;
-        }
-
-        public bool SetDataItem(UUID regionID, string item, string value)
-        {
-            string sql = "update [" + m_Realm +
-                    "] set [" + item + "] = @" + item + " where uuid = @UUID";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@" + item, value));
-                cmd.Parameters.Add(m_database.CreateParameter("@UUID", regionID));
-                conn.Open();
-                if (cmd.ExecuteNonQuery() > 0)
-                    return true;
-            }
-            return false;
-        }
-
-        public bool Delete(UUID regionID)
-        {
-            string sql = "delete from [" + m_Realm +
-                    "] where uuid = @UUID";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@UUID", regionID));
-                conn.Open();
-                if (cmd.ExecuteNonQuery() > 0)
-                    return true;
-            }
-            return false;
-        }
-
-        public List<RegionData> GetDefaultRegions(UUID scopeID)
-        {
-            return Get((int)RegionFlags.DefaultRegion, scopeID);
-        }
-
-        public List<RegionData> GetDefaultHypergridRegions(UUID scopeID)
-        {
-            return Get((int)RegionFlags.DefaultHGRegion, scopeID);
-        }
-
-        public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
-        {
-            List<RegionData> regions = Get((int)RegionFlags.FallbackRegion, scopeID);
-            RegionDataDistanceCompare distanceComparer = new RegionDataDistanceCompare(x, y);
-            regions.Sort(distanceComparer);
-
-            return regions;
-        }
-
-        public List<RegionData> GetHyperlinks(UUID scopeID)
-        {
-            return Get((int)RegionFlags.Hyperlink, scopeID);
-        }
-
-        private List<RegionData> Get(int regionFlags, UUID scopeID)
-        {
-            string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & " + regionFlags.ToString() + ") <> 0";
-            if (scopeID != UUID.Zero)
-                sql += " AND ScopeID = @scopeID";
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                conn.Open();
-                return RunCommand(cmd);
-            }
-        }
-    }
-}

OpenSim/Data/MSSQL/MSSQLUserAccountData.cs

@@ -1,246 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
-using System.Data.SqlClient;
-using System.Text;
-
-namespace OpenSim.Data.MSSQL
-{
-    public class MSSQLUserAccountData : MSSQLGenericTableHandler<UserAccountData>,IUserAccountData
-    {
-        public MSSQLUserAccountData(string connectionString, string realm) :
-            base(connectionString, realm, "UserAccount")
-        {
-        }
-        //private string m_Realm;
-        //private List<string> m_ColumnNames = null;
-        //private MSSQLManager m_database;
-
-        //public MSSQLUserAccountData(string connectionString, string realm)
-        //{
-        //    m_Realm = realm;
-        //    m_ConnectionString = connectionString;
-        //    m_database = new MSSQLManager(connectionString);
-
-        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-        //    {
-        //        conn.Open();
-        //        Migration m = new Migration(conn, GetType().Assembly, "UserStore");
-        //        m.Update();
-        //    }
-        //}
-
-        //public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
-        //{
-        //    return null;
-        //}
-
-        //public UserAccountData Get(UUID principalID, UUID scopeID)
-        //{
-        //    UserAccountData ret = new UserAccountData();
-        //    ret.Data = new Dictionary<string, string>();
-
-        //    string sql = string.Format("select * from {0} where UUID = @principalID", m_Realm);
-        //    if (scopeID != UUID.Zero)
-        //        sql += " and ScopeID = @scopeID";
-
-        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-        //    using (SqlCommand cmd = new SqlCommand(sql, conn))
-        //    {
-        //        cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
-        //        cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                
-        //        conn.Open();
-        //        using (SqlDataReader result = cmd.ExecuteReader())
-        //        {
-        //            if (result.Read())
-        //            {
-        //                ret.PrincipalID = principalID;
-        //                UUID scope;
-        //                UUID.TryParse(result["ScopeID"].ToString(), out scope);
-        //                ret.ScopeID = scope;
-
-        //                if (m_ColumnNames == null)
-        //                {
-        //                    m_ColumnNames = new List<string>();
-
-        //                    DataTable schemaTable = result.GetSchemaTable();
-        //                    foreach (DataRow row in schemaTable.Rows)
-        //                        m_ColumnNames.Add(row["ColumnName"].ToString());
-        //                }
-
-        //                foreach (string s in m_ColumnNames)
-        //                {
-        //                    if (s == "UUID")
-        //                        continue;
-        //                    if (s == "ScopeID")
-        //                        continue;
-
-        //                    ret.Data[s] = result[s].ToString();
-        //                }
-        //                return ret;
-        //            }
-        //        }
-        //    }
-        //    return null;
-        //}
-
-        //public bool Store(UserAccountData data)
-        //{
-        //    if (data.Data.ContainsKey("UUID"))
-        //        data.Data.Remove("UUID");
-        //    if (data.Data.ContainsKey("ScopeID"))
-        //        data.Data.Remove("ScopeID");
-
-        //    string[] fields = new List<string>(data.Data.Keys).ToArray();
-
-        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-        //    using (SqlCommand cmd = new SqlCommand())
-        //    {
-        //        StringBuilder updateBuilder = new StringBuilder();
-        //        updateBuilder.AppendFormat("update {0} set ", m_Realm);
-        //        bool first = true;
-        //        foreach (string field in fields)
-        //        {
-        //            if (!first)
-        //                updateBuilder.Append(", ");
-        //            updateBuilder.AppendFormat("{0} = @{0}", field);
-
-        //            first = false;
-        //            cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
-        //        }
-
-        //        updateBuilder.Append(" where UUID = @principalID");
-
-        //        if (data.ScopeID != UUID.Zero)
-        //            updateBuilder.Append(" and ScopeID = @scopeID");
-
-        //        cmd.CommandText = updateBuilder.ToString();
-        //        cmd.Connection = conn;
-        //        cmd.Parameters.Add(m_database.CreateParameter("@principalID", data.PrincipalID));
-        //        cmd.Parameters.Add(m_database.CreateParameter("@scopeID", data.ScopeID));
-        //        conn.Open();
-
-        //        if (cmd.ExecuteNonQuery() < 1)
-        //        {
-        //            StringBuilder insertBuilder = new StringBuilder();
-        //            insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm);
-        //            insertBuilder.Append(String.Join(", ", fields));
-        //            insertBuilder.Append(") values (@principalID, @scopeID, @");
-        //            insertBuilder.Append(String.Join(", @", fields));
-        //            insertBuilder.Append(")");
-
-        //            cmd.CommandText = insertBuilder.ToString();
-
-        //            if (cmd.ExecuteNonQuery() < 1)
-        //            {
-        //                return false;
-        //            }
-        //        }
-        //    }
-        //    return true;
-        //}
-
-        //public bool Store(UserAccountData data, UUID principalID, string token)
-        //{
-        //    return false;
-        //}
-
-        //public bool SetDataItem(UUID principalID, string item, string value)
-        //{
-        //    string sql = string.Format("update {0} set {1} = @{1} where UUID = @UUID", m_Realm, item);
-        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-        //    using (SqlCommand cmd = new SqlCommand(sql, conn))
-        //    {
-        //        cmd.Parameters.Add(m_database.CreateParameter("@" + item, value));
-        //        cmd.Parameters.Add(m_database.CreateParameter("@UUID", principalID));
-
-        //        conn.Open();
-
-        //        if (cmd.ExecuteNonQuery() > 0)
-        //            return true;
-        //    }
-        //    return false;
-        //}
-
-        //public UserAccountData[] Get(string[] keys, string[] vals)
-        //{
-        //    return null;
-        //}
-
-        public UserAccountData[] GetUsers(UUID scopeID, string query)
-        {
-            string[] words = query.Split(new char[] { ' ' });
-
-            for (int i = 0; i < words.Length; i++)
-            {
-                if (words[i].Length < 3)
-                {
-                    if (i != words.Length - 1)
-                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
-                    Array.Resize(ref words, words.Length - 1);
-                }
-            }
-
-            if (words.Length == 0)
-                return new UserAccountData[0];
-
-            if (words.Length > 2)
-                return new UserAccountData[0];
-
-            string sql = "";
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
-            {
-                if (words.Length == 1)
-                {
-                    sql = 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.Add(m_database.CreateParameter("@scopeID", scopeID));
-                    cmd.Parameters.Add(m_database.CreateParameter("@search", "%" + words[0] + "%"));
-                }
-                else
-                {
-                    sql = 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.Add(m_database.CreateParameter("@searchFirst", "%" + words[0] + "%"));
-                    cmd.Parameters.Add(m_database.CreateParameter("@searchLast", "%" + words[1] + "%"));
-                    cmd.Parameters.Add(m_database.CreateParameter("@ScopeID", scopeID.ToString()));
-                }
-                cmd.Connection = conn;
-                cmd.CommandText = sql;
-                conn.Open();
-                return DoQuery(cmd);
-            }
-        }
-    }
-}

OpenSim/Data/MSSQL/MSSQLXInventoryData.cs

@@ -1,305 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ''AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
-using System.Data.SqlClient;
-using System.Reflection;
-using System.Text;
-using log4net;
-
-namespace OpenSim.Data.MSSQL
-{
-    public class MSSQLXInventoryData : IXInventoryData
-    {
-//        private static readonly ILog m_log = LogManager.GetLogger(
-//                MethodBase.GetCurrentMethod().DeclaringType);
-
-        private MSSQLFolderHandler m_Folders;
-        private MSSQLItemHandler m_Items;
-
-        public MSSQLXInventoryData(string conn, string realm)
-        {
-            m_Folders = new MSSQLFolderHandler(
-                    conn, "inventoryfolders", "InventoryStore");
-            m_Items = new MSSQLItemHandler(
-                    conn, "inventoryitems", String.Empty);
-        }
-
-        public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
-        {
-            return m_Folders.Get(fields, vals);
-        }
-
-        public XInventoryItem[] GetItems(string[] fields, string[] vals)
-        {
-            return m_Items.Get(fields, vals);
-        }
-
-        public bool StoreFolder(XInventoryFolder folder)
-        {
-            if (folder.folderName.Length > 64)
-                folder.folderName = folder.folderName.Substring(0, 64);
-            return m_Folders.Store(folder);
-        }
-
-        public bool StoreItem(XInventoryItem item)
-        {
-            if (item.inventoryName.Length > 64)
-                item.inventoryName = item.inventoryName.Substring(0, 64);
-            if (item.inventoryDescription.Length > 128)
-                item.inventoryDescription = item.inventoryDescription.Substring(0, 128);
-
-            return m_Items.Store(item);
-        }
-
-        public bool DeleteFolders(string field, string val)
-        {
-            return m_Folders.Delete(field, val);
-        }
-
-        public bool DeleteFolders(string[] fields, string[] vals)
-        {
-            return m_Folders.Delete(fields, vals);
-        }
-
-        public bool DeleteItems(string field, string val)
-        {
-            return m_Items.Delete(field, val);
-        }
-
-        public bool DeleteItems(string[] fields, string[] vals)
-        {
-            return m_Items.Delete(fields, vals);
-        }
-
-        public bool MoveItem(string id, string newParent)
-        {
-            return m_Items.MoveItem(id, newParent);
-        }
-
-        public bool MoveFolder(string id, string newParent)
-        {
-            return m_Folders.MoveFolder(id, newParent);
-        }
-
-        public XInventoryItem[] GetActiveGestures(UUID principalID)
-        {
-            return m_Items.GetActiveGestures(principalID);
-        }
-
-        public int GetAssetPermissions(UUID principalID, UUID assetID)
-        {
-            return m_Items.GetAssetPermissions(principalID, assetID);
-        }
-    }
-
-    public class MSSQLItemHandler : MSSQLInventoryHandler<XInventoryItem>
-    {
-        public MSSQLItemHandler(string c, string t, string m) :
-            base(c, t, m)
-        {
-        }
-
-        public bool MoveItem(string id, string newParent)
-        {
-            XInventoryItem[] retrievedItems = Get(new string[] { "inventoryID" }, new string[] { id });
-            if (retrievedItems.Length == 0)
-                return false;
-
-            UUID oldParent = retrievedItems[0].parentFolderID;
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            {
-                using (SqlCommand cmd = new SqlCommand())
-                {
-
-                    cmd.CommandText = String.Format("update {0} set parentFolderID = @ParentFolderID where inventoryID = @InventoryID", m_Realm);
-                    cmd.Parameters.Add(m_database.CreateParameter("@ParentFolderID", newParent));
-                    cmd.Parameters.Add(m_database.CreateParameter("@InventoryID", id));
-                    cmd.Connection = conn;
-                    conn.Open();
-
-                    if (cmd.ExecuteNonQuery() == 0)
-                        return false;
-                }
-            }
-
-            IncrementFolderVersion(oldParent);
-            IncrementFolderVersion(newParent);
-
-            return true;
-        }
-
-        public XInventoryItem[] GetActiveGestures(UUID principalID)
-        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            {
-                using (SqlCommand cmd = new SqlCommand())
-                {
-                    cmd.CommandText = String.Format("select * from inventoryitems where avatarId = @uuid and assetType = @type and flags = 1", m_Realm);
-
-                    cmd.Parameters.Add(m_database.CreateParameter("@uuid", principalID.ToString()));
-                    cmd.Parameters.Add(m_database.CreateParameter("@type", (int)AssetType.Gesture));
-                    cmd.Connection = conn;
-                    conn.Open();
-                    return DoQuery(cmd);
-                }
-            }
-        }
-
-        public int GetAssetPermissions(UUID principalID, UUID assetID)
-        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            {
-                using (SqlCommand cmd = new SqlCommand())
-                {
-                    cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = @PrincipalID and assetID = @AssetID group by assetID", m_Realm);
-                    cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
-                    cmd.Parameters.Add(m_database.CreateParameter("@AssetID", assetID.ToString()));
-                    cmd.Connection = conn;
-                    conn.Open();
-                    using (SqlDataReader reader = cmd.ExecuteReader())
-                    {
-
-                        int perms = 0;
-
-                        if (reader.Read())
-                        {
-                            perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
-                        }
-
-                        return perms;
-                    }
-
-                }
-            }
-        }
-
-        public override bool Store(XInventoryItem item)
-        {
-            if (!base.Store(item))
-                return false;
-
-            IncrementFolderVersion(item.parentFolderID);
-
-            return true;
-        }
-    }
-
-    public class MSSQLFolderHandler : MSSQLInventoryHandler<XInventoryFolder>
-    {
-        public MSSQLFolderHandler(string c, string t, string m) :
-            base(c, t, m)
-        {
-        }
-
-        public bool MoveFolder(string id, string newParentFolderID)
-        {
-            XInventoryFolder[] folders = Get(new string[] { "folderID" }, new string[] { id });
-
-            if (folders.Length == 0)
-                return false;
-
-            UUID oldParentFolderUUID = folders[0].parentFolderID;
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            {
-                using (SqlCommand cmd = new SqlCommand())
-                {
-
-                    cmd.CommandText = String.Format("update {0} set parentFolderID = @ParentFolderID where folderID = @folderID", m_Realm);
-                    cmd.Parameters.Add(m_database.CreateParameter("@ParentFolderID", newParentFolderID));
-                    cmd.Parameters.Add(m_database.CreateParameter("@folderID", id));
-                    cmd.Connection = conn;
-                    conn.Open();
-
-                    if (cmd.ExecuteNonQuery() == 0)
-                        return false;
-                }
-            }
-
-            IncrementFolderVersion(oldParentFolderUUID);
-            IncrementFolderVersion(newParentFolderID);
-
-            return true;
-        }
-
-        public override bool Store(XInventoryFolder folder)
-        {
-            if (!base.Store(folder))
-                return false;
-
-            IncrementFolderVersion(folder.parentFolderID);
-
-            return true;
-        }
-    }
-
-    public class MSSQLInventoryHandler<T> : MSSQLGenericTableHandler<T> where T: class, new()
-    {
-        public MSSQLInventoryHandler(string c, string t, string m) : base(c, t, m) {}
-
-        protected bool IncrementFolderVersion(UUID folderID)
-        {
-            return IncrementFolderVersion(folderID.ToString());
-        }
-
-        protected bool IncrementFolderVersion(string folderID)
-        {
-//            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
-//            Util.PrintCallStack();
-
-            string sql = "update inventoryfolders set version=version+1 where folderID = @folderID";
-            
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            {
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
-                {
-                    conn.Open();
-
-                    cmd.Parameters.AddWithValue("@folderID", folderID);
-
-                    try
-                    {
-                        cmd.ExecuteNonQuery();
-                    }
-                    catch (Exception)
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
-        }
-    }
-}

OpenSim/Data/MSSQL/Resources/AssetStore.migrations

@@ -1,106 +0,0 @@
-:VERSION 1
-
-CREATE TABLE [assets] (
-  [id] [varchar](36) NOT NULL,
-  [name] [varchar](64) NOT NULL,
-  [description] [varchar](64) NOT NULL,
-  [assetType] [tinyint] NOT NULL,
-  [local] [tinyint] NOT NULL,
-  [temporary] [tinyint] NOT NULL,
-  [data] [image] NOT NULL,
-PRIMARY KEY CLUSTERED 
-(
-	[id] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-
-:VERSION 2
-
-BEGIN TRANSACTION
-
-CREATE TABLE Tmp_assets
-	(
-	id varchar(36) NOT NULL,
-	name varchar(64) NOT NULL,
-	description varchar(64) NOT NULL,
-	assetType tinyint NOT NULL,
-	local bit NOT NULL,
-	temporary bit NOT NULL,
-	data image NOT NULL
-	)  ON [PRIMARY]
-	 TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM assets)
-	 EXEC('INSERT INTO Tmp_assets (id, name, description, assetType, local, temporary, data)
-		SELECT id, name, description, assetType, CONVERT(bit, local), CONVERT(bit, temporary), data FROM assets WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE assets
-
-EXECUTE sp_rename N'Tmp_assets', N'assets', 'OBJECT' 
-
-ALTER TABLE dbo.assets ADD CONSTRAINT
-	PK__assets__id PRIMARY KEY CLUSTERED 
-	(
-	id
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 3
-
-BEGIN TRANSACTION
-
-ALTER TABLE assets add create_time integer default 0
-ALTER TABLE assets add access_time integer default 0
-
-COMMIT
-
-
-:VERSION 4
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_assets
-	(
-	id uniqueidentifier NOT NULL,
-	name varchar(64) NOT NULL,
-	description varchar(64) NOT NULL,
-	assetType tinyint NOT NULL,
-	local bit NOT NULL,
-	temporary bit NOT NULL,
-	data image NOT NULL,
-	create_time int NULL,
-	access_time int NULL
-	)  ON [PRIMARY]
-	 TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.assets)
-	 EXEC('INSERT INTO dbo.Tmp_assets (id, name, description, assetType, local, temporary, data, create_time, access_time)
-		SELECT CONVERT(uniqueidentifier, id), name, description, assetType, local, temporary, data, create_time, access_time FROM dbo.assets WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE assets
-
-EXECUTE sp_rename N'Tmp_assets', N'assets', 'OBJECT' 
-
-ALTER TABLE dbo.assets ADD CONSTRAINT
-	PK__assets__id PRIMARY KEY CLUSTERED 
-	(
-	id
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 5
-
-DELETE FROM assets WHERE id = 'dc4b9f0b-d008-45c6-96a4-01dd947ac621';
-
-:VERSION 6
-
-ALTER TABLE assets ADD asset_flags INTEGER NOT NULL DEFAULT 0;
-
-:VERSION 7
-
-alter table assets add creatorid varchar(36) not null default '';

OpenSim/Data/MSSQL/Resources/AuthStore.migrations

@@ -1,32 +0,0 @@
-:VERSION 1
-
-BEGIN TRANSACTION
-
-CREATE TABLE [auth] (
-  [uuid] [uniqueidentifier] NOT NULL default '00000000-0000-0000-0000-000000000000',
-  [passwordHash] [varchar](32) NOT NULL,
-  [passwordSalt] [varchar](32) NOT NULL,
-  [webLoginKey] [varchar](255) NOT NULL,
-  [accountType] VARCHAR(32) NOT NULL DEFAULT 'UserAccount',
-) ON [PRIMARY]
-
-CREATE TABLE [tokens] (
-  [uuid] [uniqueidentifier] NOT NULL default '00000000-0000-0000-0000-000000000000',
-  [token] [varchar](255) NOT NULL,
-  [validity] [datetime] NOT NULL )
-  ON [PRIMARY]
-
-COMMIT
-
-:VERSION 2
-
-BEGIN TRANSACTION
-
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[users]') AND type in (N'U'))
-	INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey, accountType) SELECT [UUID] AS UUID, [passwordHash] AS passwordHash, [passwordSalt] AS passwordSalt, [webLoginKey] AS webLoginKey, 'UserAccount' as [accountType] FROM users;
-
-COMMIT
-
-
-
-

OpenSim/Data/MSSQL/Resources/Avatar.migrations

@@ -1,64 +0,0 @@
-:VERSION 1
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Avatars] (
-[PrincipalID] uniqueidentifier NOT NULL, 
-[Name] varchar(32) NOT NULL, 
-[Value] varchar(255) NOT NULL DEFAULT '',
-PRIMARY KEY CLUSTERED 
-(
-	[PrincipalID] ASC, [Name] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-
-COMMIT
-
-:VERSION 2
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_Avatars
-	(
-	PrincipalID uniqueidentifier NOT NULL,
-	[Name] varchar(32) NOT NULL, 
-	Value text NOT NULL DEFAULT '',
-	)  ON [PRIMARY]
-	 TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.Avatars)
-	 EXEC('INSERT INTO dbo.Tmp_Avatars (PrincipalID, Name, Value)
-		SELECT PrincipalID, CONVERT(text, Name), Value FROM dbo.Avatars WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.Avatars
-
-EXECUTE sp_rename N'dbo.Tmp_Avatars', N'Avatars', 'OBJECT' 
-
-COMMIT
-
-:VERSION 3
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_Avatars
-	(
-	PrincipalID uniqueidentifier NOT NULL,
-	[Name] varchar(32) NOT NULL, 
-	Value text NOT NULL DEFAULT '',
-	PRIMARY KEY CLUSTERED 
-(
-	[PrincipalID] ASC, [Name] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-)  ON [PRIMARY]
-	 TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.Avatars)
-	 EXEC('INSERT INTO dbo.Tmp_Avatars (PrincipalID, Name, Value)
-		SELECT PrincipalID, CONVERT(text, Name), Value FROM dbo.Avatars WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.Avatars
-
-EXECUTE sp_rename N'dbo.Tmp_Avatars', N'Avatars', 'OBJECT' 
-COMMIT
-

OpenSim/Data/MSSQL/Resources/EstateStore.migrations

@@ -1,342 +0,0 @@
-:VERSION 1
-
-BEGIN TRANSACTION
-
-CREATE TABLE [dbo].[estate_managers](
-	[EstateID] [int] NOT NULL,
-	[uuid] [varchar](36) NOT NULL,
- CONSTRAINT [PK_estate_managers] PRIMARY KEY CLUSTERED 
-(
-	[EstateID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-CREATE TABLE [dbo].[estate_groups](
-	[EstateID] [int] NOT NULL,
-	[uuid] [varchar](36) NOT NULL,
- CONSTRAINT [PK_estate_groups] PRIMARY KEY CLUSTERED 
-(
-	[EstateID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-
-CREATE TABLE [dbo].[estate_users](
-	[EstateID] [int] NOT NULL,
-	[uuid] [varchar](36) NOT NULL,
- CONSTRAINT [PK_estate_users] PRIMARY KEY CLUSTERED 
-(
-	[EstateID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-
-CREATE TABLE [dbo].[estateban](
-	[EstateID] [int] NOT NULL,
-	[bannedUUID] [varchar](36) NOT NULL,
-	[bannedIp] [varchar](16) NOT NULL,
-	[bannedIpHostMask] [varchar](16) NOT NULL,
-	[bannedNameMask] [varchar](64) NULL DEFAULT (NULL),
- CONSTRAINT [PK_estateban] PRIMARY KEY CLUSTERED 
-(
-	[EstateID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-CREATE TABLE [dbo].[estate_settings](
-	[EstateID] [int] IDENTITY(1,100) NOT NULL,
-	[EstateName] [varchar](64) NULL DEFAULT (NULL),
-	[AbuseEmailToEstateOwner] [bit] NOT NULL,
-	[DenyAnonymous] [bit] NOT NULL,
-	[ResetHomeOnTeleport] [bit] NOT NULL,
-	[FixedSun] [bit] NOT NULL,
-	[DenyTransacted] [bit] NOT NULL,
-	[BlockDwell] [bit] NOT NULL,
-	[DenyIdentified] [bit] NOT NULL,
-	[AllowVoice] [bit] NOT NULL,
-	[UseGlobalTime] [bit] NOT NULL,
-	[PricePerMeter] [int] NOT NULL,
-	[TaxFree] [bit] NOT NULL,
-	[AllowDirectTeleport] [bit] NOT NULL,
-	[RedirectGridX] [int] NOT NULL,
-	[RedirectGridY] [int] NOT NULL,
-	[ParentEstateID] [int] NOT NULL,
-	[SunPosition] [float] NOT NULL,
-	[EstateSkipScripts] [bit] NOT NULL,
-	[BillableFactor] [float] NOT NULL,
-	[PublicAccess] [bit] NOT NULL,
-	[AbuseEmail] [varchar](255) NOT NULL,
-	[EstateOwner] [varchar](36) NOT NULL,
-	[DenyMinors] [bit] NOT NULL,
- CONSTRAINT [PK_estate_settings] PRIMARY KEY CLUSTERED 
-(
-	[EstateID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-
-CREATE TABLE [dbo].[estate_map](
-	[RegionID] [varchar](36) NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-	[EstateID] [int] NOT NULL,
- CONSTRAINT [PK_estate_map] PRIMARY KEY CLUSTERED 
-(
-	[RegionID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-COMMIT
-
-:VERSION 2
-
-BEGIN TRANSACTION
-
-ALTER TABLE dbo.estate_managers DROP CONSTRAINT PK_estate_managers
-
-CREATE NONCLUSTERED INDEX IX_estate_managers ON dbo.estate_managers
-	(
-	EstateID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-ALTER TABLE dbo.estate_groups DROP CONSTRAINT PK_estate_groups
-
-CREATE NONCLUSTERED INDEX IX_estate_groups ON dbo.estate_groups
-	(
-	EstateID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-ALTER TABLE dbo.estate_users DROP CONSTRAINT PK_estate_users
-
-CREATE NONCLUSTERED INDEX IX_estate_users ON dbo.estate_users
-	(
-	EstateID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 3
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estateban
-	(
-	EstateID int NOT NULL,
-	bannedUUID varchar(36) NOT NULL,
-	bannedIp varchar(16) NULL,
-	bannedIpHostMask varchar(16) NULL,
-	bannedNameMask varchar(64) NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estateban)
-	 EXEC('INSERT INTO dbo.Tmp_estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask)
-		SELECT EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask FROM dbo.estateban')
-
-DROP TABLE dbo.estateban
-
-EXECUTE sp_rename N'dbo.Tmp_estateban', N'estateban', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_estateban ON dbo.estateban
-	(
-	EstateID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 4
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estate_managers
-	(
-	EstateID int NOT NULL,
-	uuid uniqueidentifier NOT NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estate_managers)
-	 EXEC('INSERT INTO dbo.Tmp_estate_managers (EstateID, uuid)
-		SELECT EstateID, CONVERT(uniqueidentifier, uuid) FROM dbo.estate_managers WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.estate_managers
-
-EXECUTE sp_rename N'dbo.Tmp_estate_managers', N'estate_managers', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_estate_managers ON dbo.estate_managers
-	(
-	EstateID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 5
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estate_groups
-	(
-	EstateID int NOT NULL,
-	uuid uniqueidentifier NOT NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estate_groups)
-	 EXEC('INSERT INTO dbo.Tmp_estate_groups (EstateID, uuid)
-		SELECT EstateID, CONVERT(uniqueidentifier, uuid) FROM dbo.estate_groups WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.estate_groups
-
-EXECUTE sp_rename N'dbo.Tmp_estate_groups', N'estate_groups', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_estate_groups ON dbo.estate_groups
-	(
-	EstateID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 6
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estate_users
-	(
-	EstateID int NOT NULL,
-	uuid uniqueidentifier NOT NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estate_users)
-	 EXEC('INSERT INTO dbo.Tmp_estate_users (EstateID, uuid)
-		SELECT EstateID, CONVERT(uniqueidentifier, uuid) FROM dbo.estate_users WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.estate_users
-
-EXECUTE sp_rename N'dbo.Tmp_estate_users', N'estate_users', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_estate_users ON dbo.estate_users
-	(
-	EstateID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 7
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estateban
-	(
-	EstateID int NOT NULL,
-	bannedUUID uniqueidentifier NOT NULL,
-	bannedIp varchar(16) NULL,
-	bannedIpHostMask varchar(16) NULL,
-	bannedNameMask varchar(64) NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estateban)
-	 EXEC('INSERT INTO dbo.Tmp_estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask)
-		SELECT EstateID, CONVERT(uniqueidentifier, bannedUUID), bannedIp, bannedIpHostMask, bannedNameMask FROM dbo.estateban WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.estateban
-
-EXECUTE sp_rename N'dbo.Tmp_estateban', N'estateban', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_estateban ON dbo.estateban
-	(
-	EstateID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 8
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estate_settings
-	(
-	EstateID int NOT NULL IDENTITY (1, 100),
-	EstateName varchar(64) NULL DEFAULT (NULL),
-	AbuseEmailToEstateOwner bit NOT NULL,
-	DenyAnonymous bit NOT NULL,
-	ResetHomeOnTeleport bit NOT NULL,
-	FixedSun bit NOT NULL,
-	DenyTransacted bit NOT NULL,
-	BlockDwell bit NOT NULL,
-	DenyIdentified bit NOT NULL,
-	AllowVoice bit NOT NULL,
-	UseGlobalTime bit NOT NULL,
-	PricePerMeter int NOT NULL,
-	TaxFree bit NOT NULL,
-	AllowDirectTeleport bit NOT NULL,
-	RedirectGridX int NOT NULL,
-	RedirectGridY int NOT NULL,
-	ParentEstateID int NOT NULL,
-	SunPosition float(53) NOT NULL,
-	EstateSkipScripts bit NOT NULL,
-	BillableFactor float(53) NOT NULL,
-	PublicAccess bit NOT NULL,
-	AbuseEmail varchar(255) NOT NULL,
-	EstateOwner uniqueidentifier NOT NULL,
-	DenyMinors bit NOT NULL
-	)  ON [PRIMARY]
-
-SET IDENTITY_INSERT dbo.Tmp_estate_settings ON
-
-IF EXISTS(SELECT * FROM dbo.estate_settings)
-	 EXEC('INSERT INTO dbo.Tmp_estate_settings (EstateID, EstateName, AbuseEmailToEstateOwner, DenyAnonymous, ResetHomeOnTeleport, FixedSun, DenyTransacted, BlockDwell, DenyIdentified, AllowVoice, UseGlobalTime, PricePerMeter, TaxFree, AllowDirectTeleport, RedirectGridX, RedirectGridY, ParentEstateID, SunPosition, EstateSkipScripts, BillableFactor, PublicAccess, AbuseEmail, EstateOwner, DenyMinors)
-		SELECT EstateID, EstateName, AbuseEmailToEstateOwner, DenyAnonymous, ResetHomeOnTeleport, FixedSun, DenyTransacted, BlockDwell, DenyIdentified, AllowVoice, UseGlobalTime, PricePerMeter, TaxFree, AllowDirectTeleport, RedirectGridX, RedirectGridY, ParentEstateID, SunPosition, EstateSkipScripts, BillableFactor, PublicAccess, AbuseEmail, CONVERT(uniqueidentifier, EstateOwner), DenyMinors FROM dbo.estate_settings WITH (HOLDLOCK TABLOCKX)')
-
-SET IDENTITY_INSERT dbo.Tmp_estate_settings OFF
-
-DROP TABLE dbo.estate_settings
-
-EXECUTE sp_rename N'dbo.Tmp_estate_settings', N'estate_settings', 'OBJECT' 
-
-ALTER TABLE dbo.estate_settings ADD CONSTRAINT
-	PK_estate_settings PRIMARY KEY CLUSTERED 
-	(
-	EstateID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 9
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estate_map
-	(
-	RegionID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-	EstateID int NOT NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estate_map)
-	 EXEC('INSERT INTO dbo.Tmp_estate_map (RegionID, EstateID)
-		SELECT CONVERT(uniqueidentifier, RegionID), EstateID FROM dbo.estate_map WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.estate_map
-
-EXECUTE sp_rename N'dbo.Tmp_estate_map', N'estate_map', 'OBJECT' 
-
-ALTER TABLE dbo.estate_map ADD CONSTRAINT
-	PK_estate_map PRIMARY KEY CLUSTERED 
-	(
-	RegionID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-COMMIT
-
-:VERSION 10
-
-BEGIN transaction
-
-ALTER TABLE estate_settings ADD AllowLandmark tinyint NOT NULL default 1;
-ALTER TABLE estate_settings ADD AllowParcelChanges tinyint NOT NULL default 1;
-ALTER TABLE estate_settings ADD AllowSetHome tinyint NOT NULL default 1;
-
-COMMIT;

OpenSim/Data/MSSQL/Resources/FriendsStore.migrations

@@ -1,50 +0,0 @@
-:VERSION 1
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Friends] (
-[PrincipalID] uniqueidentifier NOT NULL, 
-[Friend] varchar(255) NOT NULL, 
-[Flags] char(16) NOT NULL DEFAULT '0',
-[Offered] varchar(32) NOT NULL DEFAULT 0)
- ON [PRIMARY]
-
-COMMIT
-
-:VERSION 2
-
-BEGIN TRANSACTION
-
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[userfriends]') AND type in (N'U'))
-INSERT INTO Friends (PrincipalID, Friend, Flags, Offered) 
-SELECT [ownerID], [friendID], [friendPerms], 0 FROM userfriends;
-
-COMMIT
-
-:VERSION 3 
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Tmp_Friends]
-	([PrincipalID] varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', 
-[Friend] varchar(255) NOT NULL, 
-[Flags] char(16) NOT NULL DEFAULT '0',
-[Offered] varchar(32) NOT NULL DEFAULT 0) 
-ON [PRIMARY]
-
-
-IF EXISTS(SELECT * FROM dbo.Friends)
-	 EXEC('INSERT INTO dbo.Tmp_Friends (PrincipalID, Friend, Flags, Offered)
-		SELECT CONVERT(varchar(255),PrincipalID), Friend, Flags, Offered FROM dbo.Friends WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.Friends
-
-EXECUTE sp_rename N'dbo.Tmp_Friends', N'Friends', 'OBJECT' 
-
-ALTER TABLE dbo.Friends ADD 
-	PRIMARY KEY CLUSTERED 
-(
-	[PrincipalID] ASC, [Friend] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-COMMIT

OpenSim/Data/MSSQL/Resources/GridStore.migrations

@@ -1,245 +0,0 @@
-:VERSION 1
-
-BEGIN TRANSACTION
-
-CREATE TABLE [dbo].[regions](
- [regionHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionName] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [uuid] [varchar](255) COLLATE Latin1_General_CI_AS NOT NULL,
- [regionRecvKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionSecret] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionSendKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionDataURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [serverIP] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [serverPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [serverURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [locX] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [locY] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [locZ] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [eastOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [westOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [southOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [northOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionAssetURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionAssetRecvKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionAssetSendKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionUserURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionUserRecvKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionUserSendKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionMapTexture] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [serverHttpPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [serverRemotingPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [owner_uuid] [varchar](36) COLLATE Latin1_General_CI_AS NULL,
-PRIMARY KEY CLUSTERED 
-(
- [uuid] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 2
-
-BEGIN TRANSACTION
-
-CREATE TABLE Tmp_regions
-	(
-	uuid varchar(36) COLLATE Latin1_General_CI_AS NOT NULL,
-	regionHandle bigint NULL,
-	regionName varchar(20) NULL,
-	regionRecvKey varchar(128) NULL,
-	regionSendKey varchar(128) NULL,
-	regionSecret varchar(128) NULL,
-	regionDataURI varchar(128) NULL,
-	serverIP varchar(64) NULL,
-	serverPort int NULL,
-	serverURI varchar(255) NULL,
-	locX int NULL,
-	locY int NULL,
-	locZ int NULL,
-	eastOverrideHandle bigint NULL,
-	westOverrideHandle bigint NULL,
-	southOverrideHandle bigint NULL,
-	northOverrideHandle bigint NULL,
-	regionAssetURI varchar(255) NULL,
-	regionAssetRecvKey varchar(128) NULL,
-	regionAssetSendKey varchar(128) NULL,
-	regionUserURI varchar(255) NULL,
-	regionUserRecvKey varchar(128) NULL,
-	regionUserSendKey varchar(128) NULL,
-	regionMapTexture varchar(36) NULL,
-	serverHttpPort int NULL,
-	serverRemotingPort int NULL,
-	owner_uuid varchar(36) NULL,
-	originUUID varchar(36) NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000')
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM regions)
-	 EXEC('INSERT INTO Tmp_regions (uuid, regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid)
-		SELECT CONVERT(varchar(36), uuid), CONVERT(bigint, regionHandle), CONVERT(varchar(20), regionName), CONVERT(varchar(128), regionRecvKey), CONVERT(varchar(128), regionSendKey), CONVERT(varchar(128), regionSecret), CONVERT(varchar(128), regionDataURI), CONVERT(varchar(64), serverIP), CONVERT(int, serverPort), serverURI, CONVERT(int, locX), CONVERT(int, locY), CONVERT(int, locZ), CONVERT(bigint, eastOverrideHandle), CONVERT(bigint, westOverrideHandle), CONVERT(bigint, southOverrideHandle), CONVERT(bigint, northOverrideHandle), regionAssetURI, CONVERT(varchar(128), regionAssetRecvKey), CONVERT(varchar(128), regionAssetSendKey), regionUserURI, CONVERT(varchar(128), regionUserRecvKey), CONVERT(varchar(128), regionUserSendKey), CONVERT(varchar(36), regionMapTexture), CONVERT(int, serverHttpPort), CONVERT(int, serverRemotingPort), owner_uuid FROM regions')
-
-DROP TABLE regions
-
-EXECUTE sp_rename N'Tmp_regions', N'regions', 'OBJECT' 
-
-ALTER TABLE regions ADD CONSTRAINT
-	PK__regions__uuid PRIMARY KEY CLUSTERED 
-	(
-	uuid
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-:VERSION 3
-
-BEGIN TRANSACTION
-
-CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions
-	(
-	regionName
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_regions_handle ON dbo.regions
-	(
-	regionHandle
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX IX_regions_override ON dbo.regions
-	(
-	eastOverrideHandle,
-	westOverrideHandle,
-	southOverrideHandle,
-	northOverrideHandle
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 4
-
-/* To prevent any potential data loss issues, you should review this script in detail before running it outside the context of the database designer.*/
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_regions
-	(
-	uuid uniqueidentifier NOT NULL,
-	regionHandle bigint NULL,
-	regionName varchar(20) NULL,
-	regionRecvKey varchar(128) NULL,
-	regionSendKey varchar(128) NULL,
-	regionSecret varchar(128) NULL,
-	regionDataURI varchar(128) NULL,
-	serverIP varchar(64) NULL,
-	serverPort int NULL,
-	serverURI varchar(255) NULL,
-	locX int NULL,
-	locY int NULL,
-	locZ int NULL,
-	eastOverrideHandle bigint NULL,
-	westOverrideHandle bigint NULL,
-	southOverrideHandle bigint NULL,
-	northOverrideHandle bigint NULL,
-	regionAssetURI varchar(255) NULL,
-	regionAssetRecvKey varchar(128) NULL,
-	regionAssetSendKey varchar(128) NULL,
-	regionUserURI varchar(255) NULL,
-	regionUserRecvKey varchar(128) NULL,
-	regionUserSendKey varchar(128) NULL,
-	regionMapTexture uniqueidentifier NULL,
-	serverHttpPort int NULL,
-	serverRemotingPort int NULL,
-	owner_uuid uniqueidentifier NOT NULL,
-	originUUID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000')
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.regions)
-	 EXEC('INSERT INTO dbo.Tmp_regions (uuid, regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid, originUUID)
-		SELECT CONVERT(uniqueidentifier, uuid), regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, CONVERT(uniqueidentifier, regionMapTexture), serverHttpPort, serverRemotingPort, CONVERT(uniqueidentifier, owner_uuid), CONVERT(uniqueidentifier, originUUID) FROM dbo.regions WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.regions
-
-EXECUTE sp_rename N'dbo.Tmp_regions', N'regions', 'OBJECT' 
-
-ALTER TABLE dbo.regions ADD CONSTRAINT
-	PK__regions__uuid PRIMARY KEY CLUSTERED 
-	(
-	uuid
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions
-	(
-	regionName
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_regions_handle ON dbo.regions
-	(
-	regionHandle
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_regions_override ON dbo.regions
-	(
-	eastOverrideHandle,
-	westOverrideHandle,
-	southOverrideHandle,
-	northOverrideHandle
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 5
-
-BEGIN TRANSACTION
-
-ALTER TABLE regions ADD access int default 0;
-
-COMMIT
-
-
-:VERSION 6
-
-BEGIN TRANSACTION
-
-ALTER TABLE regions ADD scopeid uniqueidentifier default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE regions ADD DEFAULT ('00000000-0000-0000-0000-000000000000') FOR [owner_uuid];
-ALTER TABLE regions ADD sizeX integer not null default 0;
-ALTER TABLE regions ADD sizeY integer not null default 0;
-
-COMMIT
-
-
-:VERSION 7
-
-BEGIN TRANSACTION
-
-ALTER TABLE regions ADD [flags] integer NOT NULL DEFAULT 0;
-CREATE INDEX [flags] ON regions(flags);
-ALTER TABLE [regions] ADD [last_seen] integer NOT NULL DEFAULT 0;
-ALTER TABLE [regions] ADD [PrincipalID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-ALTER TABLE [regions] ADD [Token] varchar(255) NOT NULL DEFAULT 0;
-
-COMMIT
-
-:VERSION 8
-
-BEGIN TRANSACTION
-ALTER TABLE regions ALTER COLUMN regionName VarChar(128) 
-
-DROP INDEX IX_regions_name ON dbo.regions
-ALTER TABLE regions ALTER COLUMN regionName VarChar(128) null
-
-CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions
-	(
-	regionName
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-:VERSION 9
-
-BEGIN TRANSACTION
-ALTER TABLE regions ADD parcelMapTexture uniqueidentifier NULL;
-
-COMMIT

OpenSim/Data/MSSQL/Resources/GridUserStore.migrations

@@ -1,65 +0,0 @@
-:VERSION 1         # -------------------------- 
-
-BEGIN TRANSACTION
-
-CREATE TABLE "GridUser" (
-    "UserID" VARCHAR(255) NOT NULL,
-    "HomeRegionID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    "HomePosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-    "HomeLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-    "LastRegionID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    "LastPosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-    "LastLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-    "Online" CHAR(5) NOT NULL DEFAULT 'false',
-    "Login" CHAR(16) NOT NULL DEFAULT '0',
-    "Logout" CHAR(16) NOT NULL DEFAULT '0',
-    PRIMARY KEY  ("UserID")
-) 
-
-COMMIT
-
-:VERSION 2         # -------------------------- 
-
-BEGIN TRANSACTION
-
-CREATE TABLE [GridUser_tmp] (
-    [UserID] VARCHAR(255) NOT NULL,
-    [HomeRegionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    [HomePosition] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-    [HomeLookAt] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-    [LastRegionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    [LastPosition] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-    [LastLookAt] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-    [Online] CHAR(5) NOT NULL DEFAULT 'false',
-    [Login] CHAR(16) NOT NULL DEFAULT '0',
-    [Logout] CHAR(16) NOT NULL DEFAULT '0',
-    
-	  PRIMARY KEY CLUSTERED
-		(
-			[UserID] ASC
-		)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-	) ON [PRIMARY]
-
-COMMIT
-
-IF EXISTS(SELECT * FROM dbo.GridUser)
-	 EXEC('INSERT INTO dbo.GridUser_tmp ([UserID]
-           ,[HomeRegionID]
-           ,[HomePosition]
-           ,[HomeLookAt]
-           ,[LastRegionID]
-           ,[LastPosition]
-           ,[LastLookAt]
-           ,[Online]
-           ,[Login]
-           ,[Logout])
-		SELECT CONVERT(varchar(36), [HomeRegionID]), [HomePosition] ,[HomeLookAt] , CONVERT(varchar(36),[LastRegionID])
-      ,[LastPosition]
-      ,[LastLookAt]
-      ,[Online]
-      ,[Login]
-      ,[Logout] FROM dbo.GridUser WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.GridUser
-
-EXECUTE sp_rename N'dbo.GridUser_tmp', N'GridUser', 'OBJECT' 

OpenSim/Data/MSSQL/Resources/InventoryStore.migrations

@@ -1,279 +0,0 @@
-:VERSION 1
-
-BEGIN TRANSACTION
-
-CREATE TABLE [inventoryfolders] (
-  [folderID] [varchar](36) NOT NULL default '',
-  [agentID] [varchar](36) default NULL,
-  [parentFolderID] [varchar](36) default NULL,
-  [folderName] [varchar](64) default NULL,
-  [type] [smallint] NOT NULL default 0,
-  [version] [int] NOT NULL default 0,  
-  PRIMARY KEY CLUSTERED
-(
-	[folderID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX [owner] ON [inventoryfolders]
-(
-	[agentID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX [parent] ON [inventoryfolders]
-(
-	[parentFolderID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-
-CREATE TABLE [inventoryitems] (
-  [inventoryID] [varchar](36) NOT NULL default '',
-  [assetID] [varchar](36) default NULL,
-  [assetType] [int] default NULL,
-  [parentFolderID] [varchar](36) default NULL,
-  [avatarID] [varchar](36) default NULL,
-  [inventoryName] [varchar](64) default NULL,
-  [inventoryDescription] [varchar](128) default NULL,
-  [inventoryNextPermissions] [int] default NULL,
-  [inventoryCurrentPermissions] [int] default NULL,
-  [invType] [int] default NULL,
-  [creatorID] [varchar](36) default NULL,
-  [inventoryBasePermissions] [int] NOT NULL default 0,
-  [inventoryEveryOnePermissions] [int] NOT NULL default 0,
-  [salePrice] [int] default NULL,
-  [saleType] [tinyint] default NULL,
-  [creationDate] [int] default NULL,
-  [groupID] [varchar](36) default NULL,
-  [groupOwned] [bit] default NULL,
-  [flags] [int] default NULL,
-  PRIMARY KEY CLUSTERED
-(
-	[inventoryID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX [owner] ON [inventoryitems]
-(
-	[avatarID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX [folder] ON [inventoryitems]
-(
-	[parentFolderID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 2
-
-BEGIN TRANSACTION
-
-ALTER TABLE inventoryitems ADD inventoryGroupPermissions INTEGER NOT NULL default 0
-
-COMMIT
-
-:VERSION 3
-
-/* To prevent any potential data loss issues, you should review this script in detail before running it outside the context of the database designer.*/
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_inventoryfolders
-	(
-	folderID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-	agentID uniqueidentifier NULL DEFAULT (NULL),
-	parentFolderID uniqueidentifier NULL DEFAULT (NULL),
-	folderName varchar(64) NULL DEFAULT (NULL),
-	type smallint NOT NULL DEFAULT ((0)),
-	version int NOT NULL DEFAULT ((0))
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.inventoryfolders)
-	 EXEC('INSERT INTO dbo.Tmp_inventoryfolders (folderID, agentID, parentFolderID, folderName, type, version)
-		SELECT CONVERT(uniqueidentifier, folderID), CONVERT(uniqueidentifier, agentID), CONVERT(uniqueidentifier, parentFolderID), folderName, type, version FROM dbo.inventoryfolders WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.inventoryfolders
-
-EXECUTE sp_rename N'dbo.Tmp_inventoryfolders', N'inventoryfolders', 'OBJECT' 
-
-ALTER TABLE dbo.inventoryfolders ADD CONSTRAINT
-	PK__inventor__C2FABFB3173876EA PRIMARY KEY CLUSTERED 
-	(
-	folderID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX owner ON dbo.inventoryfolders
-	(
-	agentID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX parent ON dbo.inventoryfolders
-	(
-	parentFolderID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 4
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_inventoryitems
-	(
-	inventoryID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-	assetID uniqueidentifier NULL DEFAULT (NULL),
-	assetType int NULL DEFAULT (NULL),
-	parentFolderID uniqueidentifier NULL DEFAULT (NULL),
-	avatarID uniqueidentifier NULL DEFAULT (NULL),
-	inventoryName varchar(64) NULL DEFAULT (NULL),
-	inventoryDescription varchar(128) NULL DEFAULT (NULL),
-	inventoryNextPermissions int NULL DEFAULT (NULL),
-	inventoryCurrentPermissions int NULL DEFAULT (NULL),
-	invType int NULL DEFAULT (NULL),
-	creatorID uniqueidentifier NULL DEFAULT (NULL),
-	inventoryBasePermissions int NOT NULL DEFAULT ((0)),
-	inventoryEveryOnePermissions int NOT NULL DEFAULT ((0)),
-	salePrice int NULL DEFAULT (NULL),
-	saleType tinyint NULL DEFAULT (NULL),
-	creationDate int NULL DEFAULT (NULL),
-	groupID uniqueidentifier NULL DEFAULT (NULL),
-	groupOwned bit NULL DEFAULT (NULL),
-	flags int NULL DEFAULT (NULL),
-	inventoryGroupPermissions int NOT NULL DEFAULT ((0))
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.inventoryitems)
-	 EXEC('INSERT INTO dbo.Tmp_inventoryitems (inventoryID, assetID, assetType, parentFolderID, avatarID, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryGroupPermissions)
-		SELECT CONVERT(uniqueidentifier, inventoryID), CONVERT(uniqueidentifier, assetID), assetType, CONVERT(uniqueidentifier, parentFolderID), CONVERT(uniqueidentifier, avatarID), inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, CONVERT(uniqueidentifier, creatorID), inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, CONVERT(uniqueidentifier, groupID), groupOwned, flags, inventoryGroupPermissions FROM dbo.inventoryitems WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.inventoryitems
-
-EXECUTE sp_rename N'dbo.Tmp_inventoryitems', N'inventoryitems', 'OBJECT' 
-
-ALTER TABLE dbo.inventoryitems ADD CONSTRAINT
-	PK__inventor__C4B7BC2220C1E124 PRIMARY KEY CLUSTERED 
-	(
-	inventoryID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX owner ON dbo.inventoryitems
-	(
-	avatarID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX folder ON dbo.inventoryitems
-	(
-	parentFolderID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-:VERSION 5
-
-# It would be totally crazy to have to recreate the whole table just to change one column type,
-# just because MS SQL treats each DEFAULT as a constraint object that must be dropped
-# before anything can be done to the column.  Since all defaults here are unnamed, there is
-# no easy way to drop them!  The hairy piece of code below removes all DEFAULT constraints
-# from InventoryItems.
-
-# SO: anything that's NULLable is by default NULL, so please don't declare DEFAULT(NULL), 
-# they do nothing but prevent changes to the columns. If you really
-# need to have DEFAULTs or other constraints, give them names so they can be dropped when needed!
-
-BEGIN TRANSACTION
-DECLARE @nm varchar(80);
-DECLARE x CURSOR LOCAL FORWARD_ONLY READ_ONLY
-  FOR SELECT name FROM sys.default_constraints where parent_object_id = OBJECT_ID('inventoryitems');  
-OPEN x;
-FETCH NEXT FROM x INTO @nm;
-WHILE @@FETCH_STATUS = 0
-BEGIN
-  EXEC('alter table inventoryitems drop ' + @nm);
-  FETCH NEXT FROM x INTO @nm;
-END
-CLOSE x
-DEALLOCATE x 
-COMMIT     
-
-# all DEFAULTs dropped!
-
-:GO
-
-BEGIN TRANSACTION
-
-# Restoring defaults:   
-# NOTE: [inventoryID] does NOT need one: it's NOT NULL PK and a unique Guid must be provided every time anyway!
- 
-alter table inventoryitems
-   add constraint def_baseperm default 0 for inventoryBasePermissions    
-alter table inventoryitems
-   add constraint def_allperm default 0 for inventoryEveryOnePermissions    
-alter table inventoryitems
-   add constraint def_grpperm default 0 for inventoryGroupPermissions    
-   
-COMMIT     
-   
-:VERSION 7
-
-BEGIN TRANSACTION
-
-# CreatorID goes back to VARCHAR(36) (???)
-
-exec sp_rename 'inventoryitems.CreatorID', 'cr_old', 'COLUMN'
-
-:GO
-
-alter table inventoryitems
-   add creatorID varchar(36) NULL
-   
-:GO   
-   
-update inventoryitems set creatorID = CONVERT(VARCHAR(36), cr_old)
-
-alter table inventoryitems
-   drop column cr_old
-
-COMMIT	
-   
-:VERSION 8
-
-ALTER TABLE inventoryitems
-ADD CONSTRAINT DF_inventoryitems_creatorID 
-DEFAULT '00000000-0000-0000-0000-000000000000' FOR creatorID
-   
-:GO
-
-:VERSION 9
-
-BEGIN TRANSACTION
-
-# CreatorID goes up to VARCHAR(255)
-
-exec sp_rename 'inventoryitems.CreatorID', 'cr_old', 'COLUMN'
-
-:GO
-
-alter table inventoryitems
-   add creatorID varchar(255) NULL
-   
-:GO   
-   
-update inventoryitems set creatorID = cr_old
-
-alter table inventoryitems
-drop CONSTRAINT DF_inventoryitems_creatorID
-:GO   
-
-alter table inventoryitems
-   drop column cr_old
-   :GO   
-COMMIT	
-
-ALTER TABLE inventoryitems
-ADD CONSTRAINT DF_inventoryitems_creatorID 
-DEFAULT '00000000-0000-0000-0000-000000000000' FOR creatorID
-   
-:GO

OpenSim/Data/MSSQL/Resources/LogStore.migrations

@@ -1,19 +0,0 @@
-:VERSION 1
-
-BEGIN TRANSACTION
-
-CREATE TABLE [logs] (
-  [logID] [int] NOT NULL,
-  [target] [varchar](36) default NULL,
-  [server] [varchar](64) default NULL,
-  [method] [varchar](64) default NULL,
-  [arguments] [varchar](255) default NULL,
-  [priority] [int] default NULL,
-  [message] [ntext],
-  PRIMARY KEY CLUSTERED
-(
-	[logID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-COMMIT

OpenSim/Data/MSSQL/Resources/Presence.migrations

@@ -1,39 +0,0 @@
-:VERSION 1
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Presence] (
-[UserID] varchar(255) NOT NULL, 
-[RegionID] uniqueidentifier NOT NULL, 
-[SessionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-[SecureSessionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-
-)
- ON [PRIMARY]
-
-COMMIT
-
-:VERSION 2
-
-BEGIN TRANSACTION
-
-CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
-CREATE INDEX UserID ON Presence(UserID);
-
-COMMIT
-
-:VERSION 2
-
-BEGIN TRANSACTION
-
-ALTER TABLE Presence ADD LastSeen DateTime;
-
-COMMIT
-
-:VERSION 3
-
-BEGIN TRANSACTION
-
-CREATE INDEX RegionID ON Presence(RegionID);
-
-COMMIT

OpenSim/Data/MSSQL/Resources/UserAccount.migrations

@@ -1,55 +0,0 @@
-:VERSION 1
-
-CREATE TABLE [UserAccounts] (
-  [PrincipalID] uniqueidentifier NOT NULL,
-  [ScopeID] uniqueidentifier NOT NULL,
-  [FirstName] [varchar](64) NOT NULL,
-  [LastName] [varchar](64) NOT NULL,
-  [Email] [varchar](64) NULL,
-  [ServiceURLs] [text] NULL,
-  [Created] [int] default NULL,
-  
-  PRIMARY KEY CLUSTERED
-(
-	[PrincipalID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-
-:VERSION 2
-
-BEGIN TRANSACTION
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[users]') AND type in (N'U'))
-INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created) SELECT [UUID] AS PrincipalID, '00000000-0000-0000-0000-000000000000' AS ScopeID, 
-username AS FirstName, 
-lastname AS LastName, 
-email as Email, (
-'AssetServerURI=' +  
-userAssetURI + ' InventoryServerURI='  + userInventoryURI + ' GatewayURI= HomeURI=') AS ServiceURLs, 
-created as Created FROM users;
-
-
-COMMIT
-
-:VERSION 3
-
-BEGIN TRANSACTION
-
-CREATE UNIQUE INDEX PrincipalID ON UserAccounts(PrincipalID);
-CREATE INDEX Email ON UserAccounts(Email);
-CREATE INDEX FirstName ON UserAccounts(FirstName);
-CREATE INDEX LastName ON UserAccounts(LastName);
-CREATE INDEX Name ON UserAccounts(FirstName,LastName);
-
-COMMIT
-
-:VERSION 4
-
-BEGIN TRANSACTION
-
-ALTER TABLE UserAccounts ADD UserLevel integer NOT NULL DEFAULT 0;
-ALTER TABLE UserAccounts ADD UserFlags integer NOT NULL DEFAULT 0;
-ALTER TABLE UserAccounts ADD UserTitle varchar(64) NOT NULL DEFAULT '';
-
-COMMIT
-

OpenSim/Data/MSSQL/Resources/UserStore.migrations

@@ -1,421 +0,0 @@
-:VERSION 1
-
-CREATE TABLE [users] (
-  [UUID] [varchar](36) NOT NULL default '',
-  [username] [varchar](32) NOT NULL,
-  [lastname] [varchar](32) NOT NULL,
-  [passwordHash] [varchar](32) NOT NULL,
-  [passwordSalt] [varchar](32) NOT NULL,
-  [homeRegion] [bigint] default NULL,
-  [homeLocationX] [float] default NULL,
-  [homeLocationY] [float] default NULL,
-  [homeLocationZ] [float] default NULL,
-  [homeLookAtX] [float] default NULL,
-  [homeLookAtY] [float] default NULL,
-  [homeLookAtZ] [float] default NULL,
-  [created] [int] NOT NULL,
-  [lastLogin] [int] NOT NULL,
-  [userInventoryURI] [varchar](255) default NULL,
-  [userAssetURI] [varchar](255) default NULL,
-  [profileCanDoMask] [int] default NULL,
-  [profileWantDoMask] [int] default NULL,
-  [profileAboutText] [ntext],
-  [profileFirstText] [ntext],
-  [profileImage] [varchar](36) default NULL,
-  [profileFirstImage] [varchar](36) default NULL,
-  [webLoginKey] [varchar](36) default NULL,
-  PRIMARY KEY CLUSTERED
-(
-	[UUID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX [usernames] ON [users]
-(
-	[username] ASC,
-	[lastname] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-
-CREATE TABLE [agents] (
-  [UUID] [varchar](36) NOT NULL,
-  [sessionID] [varchar](36) NOT NULL,
-  [secureSessionID] [varchar](36) NOT NULL,
-  [agentIP] [varchar](16) NOT NULL,
-  [agentPort] [int] NOT NULL,
-  [agentOnline] [tinyint] NOT NULL,
-  [loginTime] [int] NOT NULL,
-  [logoutTime] [int] NOT NULL,
-  [currentRegion] [varchar](36) NOT NULL,
-  [currentHandle] [bigint] NOT NULL,
-  [currentPos] [varchar](64) NOT NULL,
-  PRIMARY KEY CLUSTERED
-(
-	[UUID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX [session] ON [agents]
-(
-	[sessionID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX [ssession] ON [agents]
-(
-	[secureSessionID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-
-CREATE TABLE [dbo].[userfriends](
-	[ownerID] [varchar](50) COLLATE Latin1_General_CI_AS NOT NULL,
-	[friendID] [varchar](50) COLLATE Latin1_General_CI_AS NOT NULL,
-	[friendPerms] [nvarchar](50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
-	[datetimestamp] [nvarchar](50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
-) ON [PRIMARY]
-
-CREATE TABLE [avatarappearance]  (
-  [Owner]  [varchar](36) NOT NULL,
-  [Serial]  int NOT NULL,
-  [Visual_Params] [image] NOT NULL,
-  [Texture] [image] NOT NULL,
-  [Avatar_Height] float NOT NULL,
-  [Body_Item] [varchar](36) NOT NULL,
-  [Body_Asset] [varchar](36) NOT NULL,
-  [Skin_Item] [varchar](36) NOT NULL,
-  [Skin_Asset] [varchar](36) NOT NULL,
-  [Hair_Item] [varchar](36) NOT NULL,
-  [Hair_Asset] [varchar](36) NOT NULL,
-  [Eyes_Item] [varchar](36) NOT NULL,
-  [Eyes_Asset] [varchar](36) NOT NULL,
-  [Shirt_Item] [varchar](36) NOT NULL,
-  [Shirt_Asset] [varchar](36) NOT NULL,
-  [Pants_Item] [varchar](36) NOT NULL,
-  [Pants_Asset] [varchar](36) NOT NULL,
-  [Shoes_Item] [varchar](36) NOT NULL,
-  [Shoes_Asset] [varchar](36) NOT NULL,
-  [Socks_Item] [varchar](36) NOT NULL,
-  [Socks_Asset] [varchar](36) NOT NULL,
-  [Jacket_Item] [varchar](36) NOT NULL,
-  [Jacket_Asset] [varchar](36) NOT NULL,
-  [Gloves_Item] [varchar](36) NOT NULL,
-  [Gloves_Asset] [varchar](36) NOT NULL,
-  [Undershirt_Item] [varchar](36) NOT NULL,
-  [Undershirt_Asset] [varchar](36) NOT NULL,
-  [Underpants_Item] [varchar](36) NOT NULL,
-  [Underpants_Asset] [varchar](36) NOT NULL,
-  [Skirt_Item] [varchar](36) NOT NULL,
-  [Skirt_Asset] [varchar](36) NOT NULL,
-
-  PRIMARY KEY  CLUSTERED (
-  [Owner]
-  ) WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-:VERSION 2
-
-BEGIN TRANSACTION
-
-ALTER TABLE users ADD homeRegionID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE users ADD userFlags int NOT NULL default 0;
-ALTER TABLE users ADD godLevel int NOT NULL default 0;
-ALTER TABLE users ADD customType varchar(32) not null default '';
-ALTER TABLE users ADD partner varchar(36) not null default '00000000-0000-0000-0000-000000000000';
-
-COMMIT
-
-
-:VERSION 3
-
-BEGIN TRANSACTION
-
-CREATE TABLE [avatarattachments] (
-	[UUID] varchar(36) NOT NULL
-	, [attachpoint] int NOT NULL
-	, [item] varchar(36) NOT NULL
-	, [asset] varchar(36) NOT NULL)
-
-CREATE NONCLUSTERED INDEX IX_avatarattachments ON dbo.avatarattachments
-	(
-	UUID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-COMMIT
-
-
-:VERSION 4
-
-BEGIN TRANSACTION
-
-CREATE TABLE Tmp_userfriends
-	(
-	ownerID varchar(36) NOT NULL,
-	friendID varchar(36) NOT NULL,
-	friendPerms int NOT NULL,
-	datetimestamp int NOT NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM userfriends)
-	 EXEC('INSERT INTO dbo.Tmp_userfriends (ownerID, friendID, friendPerms, datetimestamp)
-		SELECT CONVERT(varchar(36), ownerID), CONVERT(varchar(36), friendID), CONVERT(int, friendPerms), CONVERT(int, datetimestamp) FROM dbo.userfriends WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.userfriends
-
-EXECUTE sp_rename N'Tmp_userfriends', N'userfriends', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_userfriends_ownerID ON userfriends
-	(
-	ownerID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON userfriends
-	(
-	friendID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 5
-
-BEGIN TRANSACTION
-
- ALTER TABLE users add email varchar(250);
- 
-COMMIT
-
-
-:VERSION 6
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_users
-	(
-	UUID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-	username varchar(32) NOT NULL,
-	lastname varchar(32) NOT NULL,
-	passwordHash varchar(32) NOT NULL,
-	passwordSalt varchar(32) NOT NULL,
-	homeRegion bigint NULL DEFAULT (NULL),
-	homeLocationX float(53) NULL DEFAULT (NULL),
-	homeLocationY float(53) NULL DEFAULT (NULL),
-	homeLocationZ float(53) NULL DEFAULT (NULL),
-	homeLookAtX float(53) NULL DEFAULT (NULL),
-	homeLookAtY float(53) NULL DEFAULT (NULL),
-	homeLookAtZ float(53) NULL DEFAULT (NULL),
-	created int NOT NULL,
-	lastLogin int NOT NULL,
-	userInventoryURI varchar(255) NULL DEFAULT (NULL),
-	userAssetURI varchar(255) NULL DEFAULT (NULL),
-	profileCanDoMask int NULL DEFAULT (NULL),
-	profileWantDoMask int NULL DEFAULT (NULL),
-	profileAboutText ntext NULL,
-	profileFirstText ntext NULL,
-	profileImage uniqueidentifier NULL DEFAULT (NULL),
-	profileFirstImage uniqueidentifier NULL DEFAULT (NULL),
-	webLoginKey uniqueidentifier NULL DEFAULT (NULL),
-	homeRegionID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-	userFlags int NOT NULL DEFAULT ((0)),
-	godLevel int NOT NULL DEFAULT ((0)),
-	customType varchar(32) NOT NULL DEFAULT (''),
-	partner uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-	email varchar(250) NULL
-	)  ON [PRIMARY]
-	 TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.users)
-	 EXEC('INSERT INTO dbo.Tmp_users (UUID, username, lastname, passwordHash, passwordSalt, homeRegion, homeLocationX, homeLocationY, homeLocationZ, homeLookAtX, homeLookAtY, homeLookAtZ, created, lastLogin, userInventoryURI, userAssetURI, profileCanDoMask, profileWantDoMask, profileAboutText, profileFirstText, profileImage, profileFirstImage, webLoginKey, homeRegionID, userFlags, godLevel, customType, partner, email)
-		SELECT CONVERT(uniqueidentifier, UUID), username, lastname, passwordHash, passwordSalt, homeRegion, homeLocationX, homeLocationY, homeLocationZ, homeLookAtX, homeLookAtY, homeLookAtZ, created, lastLogin, userInventoryURI, userAssetURI, profileCanDoMask, profileWantDoMask, profileAboutText, profileFirstText, CONVERT(uniqueidentifier, profileImage), CONVERT(uniqueidentifier, profileFirstImage), CONVERT(uniqueidentifier, webLoginKey), CONVERT(uniqueidentifier, homeRegionID), userFlags, godLevel, customType, CONVERT(uniqueidentifier, partner), email FROM dbo.users WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.users
-
-EXECUTE sp_rename N'dbo.Tmp_users', N'users', 'OBJECT' 
-
-ALTER TABLE dbo.users ADD CONSTRAINT
-	PK__users__65A475E737A5467C PRIMARY KEY CLUSTERED 
-	(
-	UUID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX usernames ON dbo.users
-	(
-	username,
-	lastname
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 7
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_agents
-	(
-	UUID uniqueidentifier NOT NULL,
-	sessionID uniqueidentifier NOT NULL,
-	secureSessionID uniqueidentifier NOT NULL,
-	agentIP varchar(16) NOT NULL,
-	agentPort int NOT NULL,
-	agentOnline tinyint NOT NULL,
-	loginTime int NOT NULL,
-	logoutTime int NOT NULL,
-	currentRegion uniqueidentifier NOT NULL,
-	currentHandle bigint NOT NULL,
-	currentPos varchar(64) NOT NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.agents)
-	 EXEC('INSERT INTO dbo.Tmp_agents (UUID, sessionID, secureSessionID, agentIP, agentPort, agentOnline, loginTime, logoutTime, currentRegion, currentHandle, currentPos)
-		SELECT CONVERT(uniqueidentifier, UUID), CONVERT(uniqueidentifier, sessionID), CONVERT(uniqueidentifier, secureSessionID), agentIP, agentPort, agentOnline, loginTime, logoutTime, CONVERT(uniqueidentifier, currentRegion), currentHandle, currentPos FROM dbo.agents WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.agents
-
-EXECUTE sp_rename N'dbo.Tmp_agents', N'agents', 'OBJECT' 
-
-ALTER TABLE dbo.agents ADD CONSTRAINT
-	PK__agents__65A475E749C3F6B7 PRIMARY KEY CLUSTERED 
-	(
-	UUID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX session ON dbo.agents
-	(
-	sessionID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX ssession ON dbo.agents
-	(
-	secureSessionID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 8
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_userfriends
-	(
-	ownerID uniqueidentifier NOT NULL,
-	friendID uniqueidentifier NOT NULL,
-	friendPerms int NOT NULL,
-	datetimestamp int NOT NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.userfriends)
-	 EXEC('INSERT INTO dbo.Tmp_userfriends (ownerID, friendID, friendPerms, datetimestamp)
-		SELECT CONVERT(uniqueidentifier, ownerID), CONVERT(uniqueidentifier, friendID), friendPerms, datetimestamp FROM dbo.userfriends WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.userfriends
-
-EXECUTE sp_rename N'dbo.Tmp_userfriends', N'userfriends', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_userfriends_ownerID ON dbo.userfriends
-	(
-	ownerID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON dbo.userfriends
-	(
-	friendID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 9
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_avatarappearance
-	(
-	Owner uniqueidentifier NOT NULL,
-	Serial int NOT NULL,
-	Visual_Params image NOT NULL,
-	Texture image NOT NULL,
-	Avatar_Height float(53) NOT NULL,
-	Body_Item uniqueidentifier NOT NULL,
-	Body_Asset uniqueidentifier NOT NULL,
-	Skin_Item uniqueidentifier NOT NULL,
-	Skin_Asset uniqueidentifier NOT NULL,
-	Hair_Item uniqueidentifier NOT NULL,
-	Hair_Asset uniqueidentifier NOT NULL,
-	Eyes_Item uniqueidentifier NOT NULL,
-	Eyes_Asset uniqueidentifier NOT NULL,
-	Shirt_Item uniqueidentifier NOT NULL,
-	Shirt_Asset uniqueidentifier NOT NULL,
-	Pants_Item uniqueidentifier NOT NULL,
-	Pants_Asset uniqueidentifier NOT NULL,
-	Shoes_Item uniqueidentifier NOT NULL,
-	Shoes_Asset uniqueidentifier NOT NULL,
-	Socks_Item uniqueidentifier NOT NULL,
-	Socks_Asset uniqueidentifier NOT NULL,
-	Jacket_Item uniqueidentifier NOT NULL,
-	Jacket_Asset uniqueidentifier NOT NULL,
-	Gloves_Item uniqueidentifier NOT NULL,
-	Gloves_Asset uniqueidentifier NOT NULL,
-	Undershirt_Item uniqueidentifier NOT NULL,
-	Undershirt_Asset uniqueidentifier NOT NULL,
-	Underpants_Item uniqueidentifier NOT NULL,
-	Underpants_Asset uniqueidentifier NOT NULL,
-	Skirt_Item uniqueidentifier NOT NULL,
-	Skirt_Asset uniqueidentifier NOT NULL
-	)  ON [PRIMARY]
-	 TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.avatarappearance)
-	 EXEC('INSERT INTO dbo.Tmp_avatarappearance (Owner, Serial, Visual_Params, Texture, Avatar_Height, Body_Item, Body_Asset, Skin_Item, Skin_Asset, Hair_Item, Hair_Asset, Eyes_Item, Eyes_Asset, Shirt_Item, Shirt_Asset, Pants_Item, Pants_Asset, Shoes_Item, Shoes_Asset, Socks_Item, Socks_Asset, Jacket_Item, Jacket_Asset, Gloves_Item, Gloves_Asset, Undershirt_Item, Undershirt_Asset, Underpants_Item, Underpants_Asset, Skirt_Item, Skirt_Asset)
-		SELECT CONVERT(uniqueidentifier, Owner), Serial, Visual_Params, Texture, Avatar_Height, CONVERT(uniqueidentifier, Body_Item), CONVERT(uniqueidentifier, Body_Asset), CONVERT(uniqueidentifier, Skin_Item), CONVERT(uniqueidentifier, Skin_Asset), CONVERT(uniqueidentifier, Hair_Item), CONVERT(uniqueidentifier, Hair_Asset), CONVERT(uniqueidentifier, Eyes_Item), CONVERT(uniqueidentifier, Eyes_Asset), CONVERT(uniqueidentifier, Shirt_Item), CONVERT(uniqueidentifier, Shirt_Asset), CONVERT(uniqueidentifier, Pants_Item), CONVERT(uniqueidentifier, Pants_Asset), CONVERT(uniqueidentifier, Shoes_Item), CONVERT(uniqueidentifier, Shoes_Asset), CONVERT(uniqueidentifier, Socks_Item), CONVERT(uniqueidentifier, Socks_Asset), CONVERT(uniqueidentifier, Jacket_Item), CONVERT(uniqueidentifier, Jacket_Asset), CONVERT(uniqueidentifier, Gloves_Item), CONVERT(uniqueidentifier, Gloves_Asset), CONVERT(uniqueidentifier, Undershirt_Item), CONVERT(uniqueidentifier, Undershirt_Asset), CONVERT(uniqueidentifier, Underpants_Item), CONVERT(uniqueidentifier, Underpants_Asset), CONVERT(uniqueidentifier, Skirt_Item), CONVERT(uniqueidentifier, Skirt_Asset) FROM dbo.avatarappearance WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.avatarappearance
-
-EXECUTE sp_rename N'dbo.Tmp_avatarappearance', N'avatarappearance', 'OBJECT' 
-
-ALTER TABLE dbo.avatarappearance ADD CONSTRAINT
-	PK__avatarap__7DD115CC4E88ABD4 PRIMARY KEY CLUSTERED 
-	(
-	Owner
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 10
-
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_avatarattachments
-	(
-	UUID uniqueidentifier NOT NULL,
-	attachpoint int NOT NULL,
-	item uniqueidentifier NOT NULL,
-	asset uniqueidentifier NOT NULL
-	)  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.avatarattachments)
-	 EXEC('INSERT INTO dbo.Tmp_avatarattachments (UUID, attachpoint, item, asset)
-		SELECT CONVERT(uniqueidentifier, UUID), attachpoint, CONVERT(uniqueidentifier, item), CONVERT(uniqueidentifier, asset) FROM dbo.avatarattachments WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.avatarattachments
-
-EXECUTE sp_rename N'dbo.Tmp_avatarattachments', N'avatarattachments', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_avatarattachments ON dbo.avatarattachments
-	(
-	UUID
-	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
-
-
-:VERSION 11
-
-BEGIN TRANSACTION
-
-ALTER TABLE users ADD scopeID uniqueidentifier not null default '00000000-0000-0000-0000-000000000000'
-
-COMMIT

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -45,7 +45,6 @@ namespace OpenSim.Data.MySQL
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private string m_connectionString;
-        private object m_dbLock = new object();
 
         protected virtual Assembly Assembly
         {
@@ -107,47 +106,46 @@ namespace OpenSim.Data.MySQL
         override public AssetBase GetAsset(UUID assetID)
         {
             AssetBase asset = null;
-            lock (m_dbLock)
+
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+
+                using (MySqlCommand cmd = new MySqlCommand(
+                    "SELECT name, description, assetType, local, temporary, asset_flags, CreatorID, data FROM assets WHERE id=?id",
+                    dbcon))
                 {
-                    dbcon.Open();
+                    cmd.Parameters.AddWithValue("?id", assetID.ToString());
 
-                    using (MySqlCommand cmd = new MySqlCommand(
-                        "SELECT name, description, assetType, local, temporary, asset_flags, CreatorID, data FROM assets WHERE id=?id",
-                        dbcon))
+                    try
                     {
-                        cmd.Parameters.AddWithValue("?id", assetID.ToString());
-
-                        try
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                            if (dbReader.Read())
                             {
-                                if (dbReader.Read())
-                                {
-                                    asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"], dbReader["CreatorID"].ToString());
-                                    asset.Data = (byte[])dbReader["data"];
-                                    asset.Description = (string)dbReader["description"];
+                                asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"], dbReader["CreatorID"].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;
+                                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"]);
-                                }
+                                asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
+                                asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
                             }
                         }
-                        catch (Exception e)
-                        {
-                            m_log.Error(
-                                string.Format("[ASSETS DB]: MySql failure fetching asset {0}.  Exception  ", assetID), e);
-                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(
+                            string.Format("[ASSETS DB]: MySql failure fetching asset {0}.  Exception  ", assetID), e);
                     }
                 }
             }
+
             return asset;
         }
 
@@ -158,100 +156,94 @@ namespace OpenSim.Data.MySQL
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
         override public void StoreAsset(AssetBase asset)
         {
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
+                dbcon.Open();
 
-                    using (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))
+                using (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))
+                {
+                    string assetName = asset.Name;
+                    if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
                     {
-                        string assetName = asset.Name;
-                        if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
+                        assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
+                        m_log.WarnFormat(
+                            "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                            asset.Name, asset.ID, asset.Name.Length, assetName.Length);
+                    }
+
+                    string assetDescription = asset.Description;
+                    if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
+                    {
+                        assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
+                        m_log.WarnFormat(
+                            "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                            asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
+                    }
+
+                    try
+                    {
+                        using (cmd)
                         {
-                            assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
-                            m_log.WarnFormat(
-                                "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
-                                asset.Name, asset.ID, asset.Name.Length, assetName.Length);
-                        }
-    
-                        string assetDescription = asset.Description;
-                        if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
-                        {
-                            assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
-                            m_log.WarnFormat(
-                                "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
-                                asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
-                        }
-    
-                        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.Error(
-                                string.Format(
-                                    "[ASSET DB]: MySQL failure creating asset {0} with name {1}.  Exception  ",
-                                    asset.FullID, asset.Name)
-                                , e);
+                            // 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.Error(
+                            string.Format(
+                                "[ASSET DB]: MySQL failure creating asset {0} with name {1}.  Exception  ",
+                                asset.FullID, asset.Name)
+                            , e);
+                    }
                 }
             }
         }
 
         private void UpdateAccessTime(AssetBase asset)
         {
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
+                dbcon.Open();
 
-                    using (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))
+                {
+                    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.Error(
-                                string.Format(
-                                    "[ASSETS DB]: Failure updating access_time for asset {0} with name {1}.  Exception  ", 
-                                    asset.FullID, asset.Name), 
-                                e);
+                            // 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.Error(
+                            string.Format(
+                                "[ASSETS DB]: Failure updating access_time for asset {0} with name {1}.  Exception  ", 
+                                asset.FullID, asset.Name), 
+                            e);
+                    }
                 }
             }
         }
@@ -271,20 +263,17 @@ namespace OpenSim.Data.MySQL
             string ids = "'" + string.Join("','", uuids) + "'";
             string sql = string.Format("SELECT id FROM assets WHERE id IN ({0})", ids);
 
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+                using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
                 {
-                    dbcon.Open();
-                    using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
+                    using (MySqlDataReader dbReader = cmd.ExecuteReader())
                     {
-                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
+                        while (dbReader.Read())
                         {
-                            while (dbReader.Read())
-                            {
-                                UUID id = DBGuid.FromDB(dbReader["id"]);
-                                exist.Add(id);
-                            }
+                            UUID id = DBGuid.FromDB(dbReader["id"]);
+                            exist.Add(id);
                         }
                     }
                 }
@@ -309,50 +298,47 @@ namespace OpenSim.Data.MySQL
         {
             List<AssetMetadata> retList = new List<AssetMetadata>(count);
 
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
+                dbcon.Open();
 
-                    using (MySqlCommand cmd
-                        = new MySqlCommand(
-                            "SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count",
-                            dbcon))
+                using (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);
+
+                    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(
-                                string.Format(
-                                    "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}.  Exception  ", 
-                                    start, count), 
-                                e);
-                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(
+                            string.Format(
+                                "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}.  Exception  ", 
+                                start, count), 
+                            e);
                     }
                 }
             }
@@ -362,17 +348,14 @@ namespace OpenSim.Data.MySQL
 
         public override bool Delete(string id)
         {
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
+                dbcon.Open();
 
-                    using (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();
                 }
             }
 

OpenSim/Data/MySQL/MySQLFramework.cs

@@ -45,38 +45,29 @@ namespace OpenSim.Data.MySQL
                 System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         protected string m_connectionString;
-        protected object m_dbLock = new object();
 
         protected MySqlFramework(string connectionString)
         {
             m_connectionString = connectionString;
         }
 
-        //////////////////////////////////////////////////////////////
-        //
-        // All non queries are funneled through one connection
-        // to increase performance a little
-        //
         protected int ExecuteNonQuery(MySqlCommand cmd)
         {
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-                    cmd.Connection = dbcon;
+                dbcon.Open();
+                cmd.Connection = dbcon;
 
-                    try
-                    {
-                        return cmd.ExecuteNonQuery();
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error(e.Message, e);
-                        return 0;
-                    }
+                try
+                {
+                    return cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error(e.Message, e);
+                    return 0;
                 }
             }
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -51,6 +51,15 @@ namespace OpenSim.Data.MySQL
         private static string LogHeader = "[REGION DB MYSQL]";
 
         private string m_connectionString;
+
+        /// <summary>
+        /// This lock was being used to serialize database operations when the connection was shared, but this has
+        /// been unnecessary for a long time after we switched to using MySQL's underlying connection pooling instead.
+        /// FIXME: However, the locks remain in many places since they are effectively providing a level of 
+        /// transactionality.  This should be replaced by more efficient database transactions which would not require
+        /// unrelated operations to block each other or unrelated operations on the same tables from blocking each
+        /// other.
+        /// </summary>
         private object m_dbLock = new object();
 
         protected virtual Assembly Assembly
@@ -738,95 +747,92 @@ 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;
+                        //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;
+                    }
+                    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;
                     }
                 }
             }
@@ -876,124 +882,118 @@ 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())
                 {
-                    dbcon.Open();
-    
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "delete from `regionwindlight` where `region_id`=?regionID";
-                        cmd.Parameters.AddWithValue("?regionID", regionID.ToString());
-                        ExecuteNonQuery(cmd);
-                    }
+                    cmd.CommandText = "delete from `regionwindlight` where `region_id`=?regionID";
+                    cmd.Parameters.AddWithValue("?regionID", regionID.ToString());
+                    ExecuteNonQuery(cmd);
                 }
             }
         }
@@ -1001,29 +1001,26 @@ namespace OpenSim.Data.MySQL
         #region RegionEnvironmentSettings
         public string LoadRegionEnvironmentSettings(UUID regionUUID)
         {
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+
+                string command = "select * from `regionenvironment` where region_id = ?region_id";
+
+                using (MySqlCommand cmd = new MySqlCommand(command))
                 {
-                    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())
                     {
-                        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"]);
-                        }
+                        return String.Empty;
+                    }
+                    else
+                    {
+                        return Convert.ToString(result["llsd_settings"]);
                     }
                 }
             }
@@ -1031,39 +1028,33 @@ namespace OpenSim.Data.MySQL
 
         public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
         {
-            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 `regionenvironment` (`region_id`, `llsd_settings`) VALUES (?region_id, ?llsd_settings)";
-    
-                        cmd.Parameters.AddWithValue("region_id", regionUUID);
-                        cmd.Parameters.AddWithValue("llsd_settings", settings);
-    
-                        ExecuteNonQuery(cmd);
-                    }
+                    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))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+
+                using (MySqlCommand cmd = dbcon.CreateCommand())
                 {
-                    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);
-                    }
+                    cmd.CommandText = "delete from `regionenvironment` where region_id = ?region_id";
+                    cmd.Parameters.AddWithValue("?region_id", regionUUID.ToString());
+                    ExecuteNonQuery(cmd);
                 }
             }
         }
@@ -1071,57 +1062,55 @@ namespace OpenSim.Data.MySQL
 
         public void StoreRegionSettings(RegionSettings rs)
         {
-            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();
+                    cmd.CommandText = "replace into regionsettings (regionUUID, " +
+                        "block_terraform, block_fly, allow_damage, " +
+                        "restrict_pushing, allow_land_resell, " +
+                        "allow_land_join_divide, block_show_in_search, " +
+                        "agent_limit, object_bonus, maturity, " +
+                        "disable_scripts, disable_collisions, " +
+                        "disable_physics, terrain_texture_1, " +
+                        "terrain_texture_2, terrain_texture_3, " +
+                        "terrain_texture_4, elevation_1_nw, " +
+                        "elevation_2_nw, elevation_1_ne, " +
+                        "elevation_2_ne, elevation_1_se, " +
+                        "elevation_2_se, elevation_1_sw, " +
+                        "elevation_2_sw, water_height, " +
+                        "terrain_raise_limit, terrain_lower_limit, " +
+                        "use_estate_sun, fixed_sun, sun_position, " +
+                        "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
+                        "sunvectorz, loaded_creation_datetime, " +
+                        "loaded_creation_id, map_tile_ID, " +
+                        "TelehubObject, parcel_tile_ID) " +
+                         "values (?RegionUUID, ?BlockTerraform, " +
+                        "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
+                        "?AllowLandResell, ?AllowLandJoinDivide, " +
+                        "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
+                        "?Maturity, ?DisableScripts, ?DisableCollisions, " +
+                        "?DisablePhysics, ?TerrainTexture1, " +
+                        "?TerrainTexture2, ?TerrainTexture3, " +
+                        "?TerrainTexture4, ?Elevation1NW, ?Elevation2NW, " +
+                        "?Elevation1NE, ?Elevation2NE, ?Elevation1SE, " +
+                        "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " +
+                        "?WaterHeight, ?TerrainRaiseLimit, " +
+                        "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
+                        "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
+                        "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
+                        "?LoadedCreationDateTime, ?LoadedCreationID, " +
+                        "?TerrainImageID, " +
+                        "?TelehubObject, ?ParcelImageID)";
 
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = "replace into regionsettings (regionUUID, " +
-                            "block_terraform, block_fly, allow_damage, " +
-                            "restrict_pushing, allow_land_resell, " +
-                            "allow_land_join_divide, block_show_in_search, " +
-                            "agent_limit, object_bonus, maturity, " +
-                            "disable_scripts, disable_collisions, " +
-                            "disable_physics, terrain_texture_1, " +
-                            "terrain_texture_2, terrain_texture_3, " +
-                            "terrain_texture_4, elevation_1_nw, " +
-                            "elevation_2_nw, elevation_1_ne, " +
-                            "elevation_2_ne, elevation_1_se, " +
-                            "elevation_2_se, elevation_1_sw, " +
-                            "elevation_2_sw, water_height, " +
-                            "terrain_raise_limit, terrain_lower_limit, " +
-                            "use_estate_sun, fixed_sun, sun_position, " +
-                            "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
-                            "sunvectorz, loaded_creation_datetime, " +
-                            "loaded_creation_id, map_tile_ID, " +
-                            "TelehubObject, parcel_tile_ID) " +
-                             "values (?RegionUUID, ?BlockTerraform, " +
-                            "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
-                            "?AllowLandResell, ?AllowLandJoinDivide, " +
-                            "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
-                            "?Maturity, ?DisableScripts, ?DisableCollisions, " +
-                            "?DisablePhysics, ?TerrainTexture1, " +
-                            "?TerrainTexture2, ?TerrainTexture3, " +
-                            "?TerrainTexture4, ?Elevation1NW, ?Elevation2NW, " +
-                            "?Elevation1NE, ?Elevation2NE, ?Elevation1SE, " +
-                            "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " +
-                            "?WaterHeight, ?TerrainRaiseLimit, " +
-                            "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
-                            "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
-                            "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
-                            "?LoadedCreationDateTime, ?LoadedCreationID, " +
-                            "?TerrainImageID, " +
-                            "?TelehubObject, ?ParcelImageID)";
+                    FillRegionSettingsCommand(cmd, rs);
 
-                        FillRegionSettingsCommand(cmd, rs);
-
-                        ExecuteNonQuery(cmd);
-                    }
+                    ExecuteNonQuery(cmd);
                 }
             }
+
             SaveSpawnPoints(rs);
         }
 
@@ -2043,41 +2032,35 @@ namespace OpenSim.Data.MySQL
 
         public void SaveExtra(UUID regionID, string name, string val)
         {
-            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();
+                    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);
 
-                    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();
-                    }
+                    cmd.ExecuteNonQuery();
                 }
             }
         }
 
         public void RemoveExtra(UUID regionID, string name)
         {
-            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();
+                    cmd.CommandText = "delete from regionextra where RegionID=?RegionID and Name=?Name";
+                    cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+                    cmd.Parameters.AddWithValue("?Name", name);
 
-                    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();
-                    }
+                    cmd.ExecuteNonQuery();
                 }
             }
         }
@@ -2086,22 +2069,19 @@ namespace OpenSim.Data.MySQL
         {
             Dictionary<string, string> ret = new Dictionary<string, string>();
 
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
+                dbcon.Open();
 
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                using (MySqlCommand cmd = dbcon.CreateCommand())
+                {
+                    cmd.CommandText = "select * from regionextra where RegionID=?RegionID";
+                    cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+                    using (IDataReader r = cmd.ExecuteReader())
                     {
-                        cmd.CommandText = "select * from regionextra where RegionID=?RegionID";
-                        cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-                        using (IDataReader r = cmd.ExecuteReader())
+                        while (r.Read())
                         {
-                            while (r.Read())
-                            {
-                                ret[r["Name"].ToString()] = r["value"].ToString();
-                            }
+                            ret[r["Name"].ToString()] = r["value"].ToString();
                         }
                     }
                 }

OpenSim/Data/MySQL/MySQLUserProfilesData.cs

@@ -46,11 +46,6 @@ namespace OpenSim.Data.MySQL
         {
             get; set;
         }
-
-        protected object Lock
-        {
-            get; set;
-        }
         
         protected virtual Assembly Assembly
         {
@@ -116,7 +111,7 @@ namespace OpenSim.Data.MySQL
                                 }
                                 catch (Exception e)
                                 {
-                                    m_log.DebugFormat("[PROFILES_DATA]" +
+                                    m_log.ErrorFormat("[PROFILES_DATA]" +
                                                      ": UserAccount exception {0}", e.Message);
                                 }
                                 n.Add("classifieduuid", OSD.FromUUID(Id));
@@ -237,7 +232,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": ClassifiedesUpdate exception {0}", e.Message);
                 result = e.Message;
                 return false;
@@ -250,7 +245,7 @@ namespace OpenSim.Data.MySQL
             string query = string.Empty;
             
             query += "DELETE FROM classifieds WHERE ";
-            query += "classifieduuid = ?ClasifiedId";
+            query += "classifieduuid = ?recordId";
             
             try
             {
@@ -260,18 +255,14 @@ namespace OpenSim.Data.MySQL
                     
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("?ClassifiedId", recordId.ToString());
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+                        cmd.Parameters.AddWithValue("?recordId", recordId.ToString());
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": DeleteClassifiedRecord exception {0}", e.Message);
                 return false;
             }
@@ -321,7 +312,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": GetPickInfo exception {0}", e.Message);
             }
             return true;
@@ -365,7 +356,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": GetAvatarPicks exception {0}", e.Message);
             }
             return data;
@@ -406,6 +397,7 @@ namespace OpenSim.Data.MySQL
                                 UUID.TryParse((string)reader["parceluuid"], out pick.ParcelId);
                                 UUID.TryParse((string)reader["snapshotuuid"], out pick.SnapshotId);
                                 pick.GlobalPos = (string)reader["posglobal"];
+                                pick.Gatekeeper = (string)reader["gatekeeper"];
                                 bool.TryParse((string)reader["toppick"], out pick.TopPick);
                                 bool.TryParse((string)reader["enabled"], out pick.Enabled);
                                 pick.Name = (string)reader["name"];
@@ -422,7 +414,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": GetPickInfo exception {0}", e.Message);
             }
             return pick;
@@ -445,14 +437,16 @@ namespace OpenSim.Data.MySQL
             query += "?SimName,";
             query += "?GlobalPos,";
             query += "?SortOrder,";
-            query += "?Enabled) ";
+            query += "?Enabled,";
+            query += "?Gatekeeper)";
             query += "ON DUPLICATE KEY UPDATE ";
             query += "parceluuid=?ParcelId,";
             query += "name=?Name,";
             query += "description=?Desc,";
             query += "snapshotuuid=?SnapshotId,";
             query += "pickuuid=?PickId,";
-            query += "posglobal=?GlobalPos";
+            query += "posglobal=?GlobalPos,";
+            query += "gatekeeper=?Gatekeeper";
             
             try
             {
@@ -472,6 +466,7 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?Original", pick.OriginalName.ToString());
                         cmd.Parameters.AddWithValue("?SimName",pick.SimName.ToString());
                         cmd.Parameters.AddWithValue("?GlobalPos", pick.GlobalPos);
+                        cmd.Parameters.AddWithValue("?Gatekeeper",pick.Gatekeeper);
                         cmd.Parameters.AddWithValue("?SortOrder", pick.SortOrder.ToString ());
                         cmd.Parameters.AddWithValue("?Enabled", pick.Enabled.ToString());
                         
@@ -481,7 +476,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": UpdateAvatarNotes exception {0}", e.Message);
                 return false;
             }
@@ -511,7 +506,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": DeleteUserPickRecord exception {0}", e.Message);
                 return false;
             }
@@ -556,7 +551,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": GetAvatarNotes exception {0}", e.Message);
             }
             return true;
@@ -604,7 +599,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": UpdateAvatarNotes exception {0}", e.Message);
                 return false;
             }
@@ -722,7 +717,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": Requst properties exception {0}", e.Message);
                 result = e.Message;
                 return false;
@@ -762,7 +757,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": AgentPropertiesUpdate exception {0}", e.Message);
                 
                 return false;
@@ -804,7 +799,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": AgentInterestsUpdate exception {0}", e.Message);
                 result = e.Message;
                 return false;
@@ -887,7 +882,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": GetAvatarNotes exception {0}", e.Message);
             }
             return data;
@@ -945,7 +940,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": Get preferences exception {0}", e.Message);
                 result = e.Message;
                 return false;
@@ -959,7 +954,8 @@ namespace OpenSim.Data.MySQL
 
             query += "UPDATE usersettings SET ";
             query += "imviaemail=?ImViaEmail, ";
-            query += "visible=?Visible ";
+            query += "visible=?Visible, ";
+            query += "email=?EMail ";
             query += "WHERE useruuid=?uuid";
             
             try
@@ -972,6 +968,7 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail.ToString().ToLower());
                         cmd.Parameters.AddWithValue("?Visible", pref.Visible.ToString().ToLower());
                         cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
+                        cmd.Parameters.AddWithValue("?EMail", pref.EMail.ToString().ToLower());
 
                         cmd.ExecuteNonQuery();
                     }
@@ -979,8 +976,8 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": AgentInterestsUpdate exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                    ": UserPreferencesUpdate exception {0} {1}", e.Message, e.InnerException);
                 result = e.Message;
                 return false;
             }
@@ -1025,15 +1022,12 @@ namespace OpenSim.Data.MySQL
                                 
                                 using (MySqlCommand put = new MySqlCommand(query, dbcon))
                                 {
-                                    put.Parameters.AddWithValue("?Id", props.UserId.ToString());
+                                    put.Parameters.AddWithValue("?UserId", props.UserId.ToString());
                                     put.Parameters.AddWithValue("?TagId", props.TagId.ToString());
                                     put.Parameters.AddWithValue("?DataKey", props.DataKey.ToString());
                                     put.Parameters.AddWithValue("?DataVal", props.DataVal.ToString());
-                                    
-                                    lock(Lock)
-                                    {
-                                        put.ExecuteNonQuery();
-                                    }
+
+                                    put.ExecuteNonQuery();
                                 }
                             }
                         }
@@ -1042,7 +1036,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": Requst application data exception {0}", e.Message);
                 result = e.Message;
                 return false;
@@ -1069,20 +1063,17 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?UserId", props.UserId.ToString());
-                        cmd.Parameters.AddWithValue("?TagId", props.TagId.ToString ());
-                        cmd.Parameters.AddWithValue("?DataKey", props.DataKey.ToString ());
-                        cmd.Parameters.AddWithValue("?DataVal", props.DataKey.ToString ());
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+                        cmd.Parameters.AddWithValue("?TagId", props.TagId.ToString());
+                        cmd.Parameters.AddWithValue("?DataKey", props.DataKey.ToString());
+                        cmd.Parameters.AddWithValue("?DataVal", props.DataKey.ToString());
+
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                  ": SetUserData exception {0}", e.Message);
                 return false;
             }
@@ -1090,5 +1081,4 @@ namespace OpenSim.Data.MySQL
         }
         #endregion Integration
     }
-}
-
+}

OpenSim/Data/MySQL/MySQLXAssetData.cs

@@ -57,7 +57,6 @@ namespace OpenSim.Data.MySQL
 
         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
@@ -131,60 +130,58 @@ namespace OpenSim.Data.MySQL
 //            m_log.DebugFormat("[MYSQL XASSET DATA]: Looking for asset {0}", assetID);
 
             AssetBase asset = null;
-            lock (m_dbLock)
+
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+
+                using (MySqlCommand cmd = new MySqlCommand(
+                    "SELECT Name, Description, AccessTime, AssetType, Local, Temporary, AssetFlags, CreatorID, Data FROM XAssetsMeta JOIN XAssetsData ON XAssetsMeta.Hash = XAssetsData.Hash WHERE ID=?ID",
+                    dbcon))
                 {
-                    dbcon.Open();
+                    cmd.Parameters.AddWithValue("?ID", assetID.ToString());
 
-                    using (MySqlCommand cmd = new MySqlCommand(
-                        "SELECT Name, Description, AccessTime, AssetType, Local, Temporary, AssetFlags, CreatorID, Data FROM XAssetsMeta JOIN XAssetsData ON XAssetsMeta.Hash = XAssetsData.Hash WHERE ID=?ID",
-                        dbcon))
+                    try
                     {
-                        cmd.Parameters.AddWithValue("?ID", assetID.ToString());
-
-                        try
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                            if (dbReader.Read())
                             {
-                                if (dbReader.Read())
+                                asset = new AssetBase(assetID, (string)dbReader["Name"], (sbyte)dbReader["AssetType"], dbReader["CreatorID"].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["AssetFlags"]);
+
+                                if (m_enableCompression)
                                 {
-                                    asset = new AssetBase(assetID, (string)dbReader["Name"], (sbyte)dbReader["AssetType"], dbReader["CreatorID"].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["AssetFlags"]);
-
-                                    if (m_enableCompression)
+                                    using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress))
                                     {
-                                        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);
-                                        }
-                                    }
+                                        MemoryStream outputStream = new MemoryStream();
+                                        WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
+//                                        int compressedLength = asset.Data.Length;
+                                        asset.Data = outputStream.ToArray();
 
-                                    UpdateAccessTime(asset.Metadata, (int)dbReader["AccessTime"]);
+//                                        m_log.DebugFormat(
+//                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
+//                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
+                                    }
                                 }
+
+                                UpdateAccessTime(asset.Metadata, (int)dbReader["AccessTime"]);
                             }
                         }
-                        catch (Exception e)
-                        {
-                            m_log.Error(string.Format("[MYSQL XASSET DATA]: Failure fetching asset {0}", assetID), e);
-                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(string.Format("[MYSQL XASSET DATA]: Failure fetching asset {0}", assetID), e);
                     }
                 }
             }
@@ -201,113 +198,110 @@ namespace OpenSim.Data.MySQL
         {
 //            m_log.DebugFormat("[XASSETS DB]: Storing asset {0} {1}", asset.Name, asset.ID);
 
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+
+                using (MySqlTransaction transaction = dbcon.BeginTransaction())
                 {
-                    dbcon.Open();
-
-                    using (MySqlTransaction transaction = dbcon.BeginTransaction())
+                    string assetName = asset.Name;
+                    if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
                     {
-                        string assetName = asset.Name;
-                        if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
-                        {
-                            assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
-                            m_log.WarnFormat(
-                                "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
-                                asset.Name, asset.ID, asset.Name.Length, assetName.Length);
-                        }
-    
-                        string assetDescription = asset.Description;
-                        if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
-                        {
-                            assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
-                            m_log.WarnFormat(
-                                "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
-                                asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
-                        }
+                        assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
+                        m_log.WarnFormat(
+                            "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                            asset.Name, asset.ID, asset.Name.Length, assetName.Length);
+                    }
 
-                        if (m_enableCompression)
+                    string assetDescription = asset.Description;
+                    if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
+                    {
+                        assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
+                        m_log.WarnFormat(
+                            "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                            asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
+                    }
+
+                    if (m_enableCompression)
+                    {
+                        MemoryStream outputStream = new MemoryStream();
+
+                        using (GZipStream compressionStream = new GZipStream(outputStream, CompressionMode.Compress, false))
                         {
-                            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;
-                            }
+//                            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);
+                    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, AssetType, Local, Temporary, CreateTime, AccessTime, AssetFlags, CreatorID)" +
+                                "VALUES(?ID, ?Hash, ?Name, ?Description, ?AssetType, ?Local, ?Temporary, ?CreateTime, ?AccessTime, ?AssetFlags, ?CreatorID)",
+                                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("?AssetType", asset.Type);
+                            cmd.Parameters.AddWithValue("?Local", asset.Local);
+                            cmd.Parameters.AddWithValue("?Temporary", asset.Temporary);
+                            cmd.Parameters.AddWithValue("?CreateTime", now);
+                            cmd.Parameters.AddWithValue("?AccessTime", now);
+                            cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
+                            cmd.Parameters.AddWithValue("?AssetFlags", (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(
-                                    "replace INTO XAssetsMeta(ID, Hash, Name, Description, AssetType, Local, Temporary, CreateTime, AccessTime, AssetFlags, CreatorID)" +
-                                    "VALUES(?ID, ?Hash, ?Name, ?Description, ?AssetType, ?Local, ?Temporary, ?CreateTime, ?AccessTime, ?AssetFlags, ?CreatorID)",
+                                    "INSERT INTO XAssetsData(Hash, Data) VALUES(?Hash, ?Data)",
                                     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("?AssetType", asset.Type);
-                                cmd.Parameters.AddWithValue("?Local", asset.Local);
-                                cmd.Parameters.AddWithValue("?Temporary", asset.Temporary);
-                                cmd.Parameters.AddWithValue("?CreateTime", now);
-                                cmd.Parameters.AddWithValue("?AccessTime", now);
-                                cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
-                                cmd.Parameters.AddWithValue("?AssetFlags", (int)asset.Flags);
+                                cmd.Parameters.AddWithValue("?Data", asset.Data);
                                 cmd.ExecuteNonQuery();
                             }
                         }
                         catch (Exception e)
                         {
-                            m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset metadata {0} with name \"{1}\". Error: {2}",
+                            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;
                         }
-
-                        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();
                     }
+
+                    transaction.Commit();
                 }
             }
         }
@@ -328,31 +322,28 @@ namespace OpenSim.Data.MySQL
             if ((now - Utils.UnixTimeToDateTime(accessTime)).TotalDays < DaysBetweenAccessTimeUpdates)
                 return;
 
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-                    MySqlCommand cmd =
-                        new MySqlCommand("update XAssetsMeta set AccessTime=?AccessTime where ID=?ID", dbcon);
+                dbcon.Open();
+                MySqlCommand cmd =
+                    new MySqlCommand("update XAssetsMeta set AccessTime=?AccessTime where ID=?ID", dbcon);
 
-                    try
+                try
+                {
+                    using (cmd)
                     {
-                        using (cmd)
-                        {
-                            // create unix epoch time
-                            cmd.Parameters.AddWithValue("?ID", assetMetadata.ID);
-                            cmd.Parameters.AddWithValue("?AccessTime", (int)Utils.DateTimeToUnixTime(now));
-                            cmd.ExecuteNonQuery();
-                        }
-                    }
-                    catch (Exception)
-                    {
-                        m_log.ErrorFormat(
-                            "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}", 
-                            assetMetadata.ID, assetMetadata.Name);
+                        // create unix epoch time
+                        cmd.Parameters.AddWithValue("?ID", assetMetadata.ID);
+                        cmd.Parameters.AddWithValue("?AccessTime", (int)Utils.DateTimeToUnixTime(now));
+                        cmd.ExecuteNonQuery();
                     }
                 }
+                catch (Exception)
+                {
+                    m_log.ErrorFormat(
+                        "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}", 
+                        assetMetadata.ID, assetMetadata.Name);
+                }
             }
         }
 
@@ -411,20 +402,17 @@ namespace OpenSim.Data.MySQL
             string ids = "'" + string.Join("','", uuids) + "'";
             string sql = string.Format("SELECT ID FROM assets WHERE ID IN ({0})", ids);
 
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+                using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
                 {
-                    dbcon.Open();
-                    using (MySqlCommand cmd = new MySqlCommand(sql, dbcon))
+                    using (MySqlDataReader dbReader = cmd.ExecuteReader())
                     {
-                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
+                        while (dbReader.Read())
                         {
-                            while (dbReader.Read())
-                            {
-                                UUID id = DBGuid.FromDB(dbReader["ID"]);
-                                exists.Add(id);
-                            }
+                            UUID id = DBGuid.FromDB(dbReader["ID"]);
+                            exists.Add(id);
                         }
                     }
                 }
@@ -449,43 +437,40 @@ namespace OpenSim.Data.MySQL
         {
             List<AssetMetadata> retList = new List<AssetMetadata>(count);
 
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+                MySqlCommand cmd = new MySqlCommand("SELECT Name, Description, AccessTime, AssetType, Temporary, ID, AssetFlags, CreatorID FROM XAssetsMeta LIMIT ?start, ?count", dbcon);
+                cmd.Parameters.AddWithValue("?start", start);
+                cmd.Parameters.AddWithValue("?count", count);
+
+                try
                 {
-                    dbcon.Open();
-                    MySqlCommand cmd = new MySqlCommand("SELECT Name, Description, AccessTime, AssetType, Temporary, ID, AssetFlags, CreatorID FROM XAssetsMeta LIMIT ?start, ?count", dbcon);
-                    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["AssetFlags"]);
-                                metadata.FullID = DBGuid.FromDB(dbReader["ID"]);
-                                metadata.CreatorID = dbReader["CreatorID"].ToString();
+                            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["AssetFlags"]);
+                            metadata.FullID = DBGuid.FromDB(dbReader["ID"]);
+                            metadata.CreatorID = dbReader["CreatorID"].ToString();
 
-                                // We'll ignore this for now - it appears unused!
+                            // We'll ignore this for now - it appears unused!
 //                                metadata.SHA1 = dbReader["hash"]);
 
-                                UpdateAccessTime(metadata, (int)dbReader["AccessTime"]);
+                            UpdateAccessTime(metadata, (int)dbReader["AccessTime"]);
 
-                                retList.Add(metadata);
-                            }
+                            retList.Add(metadata);
                         }
                     }
-                    catch (Exception e)
-                    {
-                        m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
-                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
                 }
             }
 
@@ -496,21 +481,18 @@ namespace OpenSim.Data.MySQL
         {
 //            m_log.DebugFormat("[XASSETS DB]: Deleting asset {0}", id);
 
-            lock (m_dbLock)
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                dbcon.Open();
+
+                using (MySqlCommand cmd = new MySqlCommand("delete from XAssetsMeta where ID=?ID", dbcon))
                 {
-                    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 (?)
+                    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;

OpenSim/Data/MySQL/Resources/AssetStore.migrations

@@ -75,3 +75,7 @@ ALTER TABLE assets ADD COLUMN asset_flags INTEGER NOT NULL DEFAULT 0;
 
 ALTER TABLE assets ADD COLUMN CreatorID varchar(128) NOT NULL DEFAULT '';
 
+:VERSION 9
+
+BEGIN;
+COMMIT;

OpenSim/Data/MySQL/Resources/UserProfiles.migrations

@@ -90,4 +90,9 @@ CREATE TABLE IF NOT EXISTS `usersettings` (
   `email` varchar(254) NOT NULL,
   PRIMARY KEY (`useruuid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-commit;
+commit;
+
+:VERSION 4         # -------------------------------
+begin;
+ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255);
+commit;

OpenSim/Data/MySQL/Resources/XAssetStore.migrations

@@ -24,4 +24,9 @@ CREATE TABLE `XAssetsData` (
   PRIMARY KEY (`hash`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
 
-COMMIT;
+COMMIT;
+
+:VERSION 2
+
+BEGIN;
+COMMIT;

OpenSim/Data/PGSQL/PGSQLUserAccountData.cs

@@ -298,22 +298,26 @@ namespace OpenSim.Data.PGSQL
                 return new UserAccountData[0];
 
             string sql = "";
+            UUID scope_id;
+            UUID.TryParse(scopeID.ToString(), out scope_id); 
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
                 if (words.Length == 1)
                 {
-                    sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""='00000000-0000-0000-0000-000000000000') and (""FirstName"" ilike :search or ""LastName"" ilike :search)", m_Realm);
-                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                    sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""=:UUIDZero) and (""FirstName"" ilike :search or ""LastName"" ilike :search)", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", (UUID)scope_id));
+                    cmd.Parameters.Add (m_database.CreateParameter("UUIDZero", (UUID)UUID.Zero));
                     cmd.Parameters.Add(m_database.CreateParameter("search", "%" + words[0] + "%"));
                 }
                 else
                 {
-                    sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""='00000000-0000-0000-0000-000000000000') and (""FirstName"" ilike :searchFirst or ""LastName"" ilike :searchLast)", m_Realm);
+                    sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""=:UUIDZero) and (""FirstName"" ilike :searchFirst or ""LastName"" ilike :searchLast)", m_Realm);
                     cmd.Parameters.Add(m_database.CreateParameter("searchFirst", "%" + words[0] + "%"));
                     cmd.Parameters.Add(m_database.CreateParameter("searchLast", "%" + words[1] + "%"));
-                    cmd.Parameters.Add(m_database.CreateParameter("ScopeID", scopeID.ToString()));
+                    cmd.Parameters.Add (m_database.CreateParameter("UUIDZero", (UUID)UUID.Zero));
+                    cmd.Parameters.Add(m_database.CreateParameter("ScopeID", (UUID)scope_id));
                 }
                 cmd.Connection = conn;
                 cmd.CommandText = sql;

OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs

@@ -40,17 +40,14 @@ namespace OpenSim.Data.PGSQL
     public class UserProfilesData: IProfilesData
     {
         static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected PGSQLManager m_database;
         
         #region Properites
         string ConnectionString
         {
             get; set;
         }
-
-        protected object Lock
-        {
-            get; set;
-        }
         
         protected virtual Assembly Assembly
         {
@@ -74,6 +71,7 @@ namespace OpenSim.Data.PGSQL
                 
                 Migration m = new Migration(dbcon, Assembly, "UserProfiles");
                 m.Update();
+                m_database = new PGSQLManager(ConnectionString);
             }
         }
         #endregion Member Functions
@@ -94,11 +92,11 @@ namespace OpenSim.Data.PGSQL
             
             using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
             {
-                string query = @"SELECT ""classifieduuid"", ""name"" FROM classifieds WHERE ""creatoruuid"" = :Id";
+                string query = @"SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = :Id";
                 dbcon.Open();
                 using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                 {
-                    cmd.Parameters.AddWithValue("Id", creatorId);
+                    cmd.Parameters.Add(m_database.CreateParameter("Id", creatorId));
                     using( NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
                     {
                         if(reader.HasRows)
@@ -111,14 +109,14 @@ namespace OpenSim.Data.PGSQL
                                 string Name = null;
                                 try
                                 {
-                                    UUID.TryParse(Convert.ToString( reader["classifieduuid"]), out Id);
+                                    Id = DBGuid.FromDB(reader["classifieduuid"]);
                                     Name = Convert.ToString(reader["name"]);
                                 }
                                 catch (Exception e)
                                 {
-                                    m_log.DebugFormat("[PROFILES_DATA]" +
-                                                     ": UserAccount exception {0}", e.Message);
+                                    m_log.Error("[PROFILES_DATA]: UserAccount exception ", e);
                                 }
+
                                 n.Add("classifieduuid", OSD.FromUUID(Id));
                                 n.Add("name", OSD.FromString(Name));
                                 data.Add(n);
@@ -132,28 +130,25 @@ namespace OpenSim.Data.PGSQL
         
         public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
         {
-            string query = @"INSERT INTO classifieds ( ""classifieduuid"",""creatoruuid"", ""creationdate"", ""expirationdate"", ""category"",
-                                    ""name"", ""description"", ""parceluuid"", ""parentestate"", ""snapshotuuid"", ""simname"",
-                                    ""posglobal"", ""parcelname"", ""classifiedflags"", ""priceforlisting"")
-                              Select :ClassifiedId, :CreatorId, :CreatedDate, :ExpirationDate, :Category,
-                                     :Name, :Description, :ParcelId, :ParentEstate, :SnapshotId, :SimName 
-                                     :GlobalPos, :ParcelName, :Flags, :ListingPrice 
-                                Where not exists( Select ""classifieduuid"" from classifieds where ""classifieduuid"" = :ClassifiedId );
+            string query = string.Empty;
+
+            query = @"WITH upsert AS (
+                        UPDATE classifieds SET
+                            classifieduuid = :ClassifiedId, creatoruuid = :CreatorId, creationdate = :CreatedDate,
+                            expirationdate = :ExpirationDate,category =:Category, name = :Name, description = :Description,
+                            parceluuid = :ParcelId, parentestate = :ParentEstate, snapshotuuid = :SnapshotId,
+                            simname = :SimName, posglobal = :GlobalPos, parcelname = :ParcelName, classifiedflags = :Flags,
+                            priceforlisting = :ListingPrice
+                        RETURNING * )
+                      INSERT INTO classifieds (classifieduuid,creatoruuid,creationdate,expirationdate,category,name,
+                            description,parceluuid,parentestate,snapshotuuid,simname,posglobal,parcelname,classifiedflags,
+                            priceforlisting)
+                      SELECT
+                            :ClassifiedId,:CreatorId,:CreatedDate,:ExpirationDate,:Category,:Name,:Description,
+                            :ParcelId,:ParentEstate,:SnapshotId,:SimName,:GlobalPos,:ParcelName,:Flags,:ListingPrice
+                      WHERE NOT EXISTS (
+                        SELECT * FROM upsert )";
 
-                           update classifieds
-                              set category =:Category, 
-                                  expirationdate = :ExpirationDate, 
-                                  name = :Name, 
-                                  description  = :Description, 
-                                  parentestate = :ParentEstate, 
-                                  posglobal       = :GlobalPos, 
-                                  parcelname      = :ParcelName,
-                                  classifiedflags = :Flags, 
-                                  priceforlisting = :ListingPrice, 
-                                  snapshotuuid    = :SnapshotId
-                            where classifieduuid = :ClassifiedId ;
-                                ";
-            
             if(string.IsNullOrEmpty(ad.ParcelName))
                 ad.ParcelName = "Unknown";
             if(ad.ParcelId == null)
@@ -190,21 +185,21 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ClassifiedId", ad.ClassifiedId.ToString());
-                        cmd.Parameters.AddWithValue("CreatorId", ad.CreatorId.ToString());
-                        cmd.Parameters.AddWithValue("CreatedDate", ad.CreationDate.ToString());
-                        cmd.Parameters.AddWithValue("ExpirationDate", ad.ExpirationDate.ToString());
-                        cmd.Parameters.AddWithValue("Category", ad.Category.ToString());
-                        cmd.Parameters.AddWithValue("Name", ad.Name.ToString());
-                        cmd.Parameters.AddWithValue("Description", ad.Description.ToString());
-                        cmd.Parameters.AddWithValue("ParcelId", ad.ParcelId.ToString());
-                        cmd.Parameters.AddWithValue("ParentEstate", ad.ParentEstate.ToString());
-                        cmd.Parameters.AddWithValue("SnapshotId", ad.SnapshotId.ToString ());
-                        cmd.Parameters.AddWithValue("SimName", ad.SimName.ToString());
-                        cmd.Parameters.AddWithValue("GlobalPos", ad.GlobalPos.ToString());
-                        cmd.Parameters.AddWithValue("ParcelName", ad.ParcelName.ToString());
-                        cmd.Parameters.AddWithValue("Flags", ad.Flags.ToString());
-                        cmd.Parameters.AddWithValue("ListingPrice", ad.Price.ToString ());
+                        cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", ad.ClassifiedId));
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatorId", ad.CreatorId));
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatedDate", (int)ad.CreationDate));
+                        cmd.Parameters.Add(m_database.CreateParameter("ExpirationDate", (int)ad.ExpirationDate));
+                        cmd.Parameters.Add(m_database.CreateParameter("Category", ad.Category.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("Name", ad.Name.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("Description", ad.Description.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParcelId", ad.ParcelId));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParentEstate", (int)ad.ParentEstate));
+                        cmd.Parameters.Add(m_database.CreateParameter("SnapshotId", ad.SnapshotId));
+                        cmd.Parameters.Add(m_database.CreateParameter("SimName", ad.SimName.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("GlobalPos", ad.GlobalPos.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParcelName", ad.ParcelName.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("Flags", (int)Convert.ToInt32(ad.Flags)));
+                        cmd.Parameters.Add(m_database.CreateParameter("ListingPrice", (int)Convert.ToInt32(ad.Price)));
                         
                         cmd.ExecuteNonQuery();
                     }
@@ -212,15 +207,14 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": ClassifiedesUpdate exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: ClassifiedsUpdate exception ", e);
                 result = e.Message;
                 return false;
             }
+
             return true;
         }
-        
-       
+               
         public bool DeleteClassifiedRecord(UUID recordId)
         {
             string query = string.Empty;
@@ -235,21 +229,17 @@ namespace OpenSim.Data.PGSQL
                     
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ClassifiedId", recordId.ToString());
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+                        cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", recordId));
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": DeleteClassifiedRecord exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: DeleteClassifiedRecord exception ", e);
                 return false;
             }
+
             return true;
         }
         
@@ -267,15 +257,15 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("AdId", ad.ClassifiedId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("AdId", ad.ClassifiedId));
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.Read ())
                             {
-                                ad.CreatorId = GetUUID(reader["creatoruuid"]);
-                                ad.ParcelId = GetUUID(reader["parceluuid"]);
-                                ad.SnapshotId = GetUUID(reader["snapshotuuid"]);
+                                ad.CreatorId = DBGuid.FromDB(reader["creatoruuid"]);
+                                ad.ParcelId = DBGuid.FromDB(reader["parceluuid"]);
+                                ad.SnapshotId = DBGuid.FromDB(reader["snapshotuuid"]);
                                 ad.CreationDate = Convert.ToInt32(reader["creationdate"]);
                                 ad.ExpirationDate = Convert.ToInt32(reader["expirationdate"]);
                                 ad.ParentEstate = Convert.ToInt32(reader["parentestate"]);
@@ -287,7 +277,6 @@ namespace OpenSim.Data.PGSQL
                                 ad.SimName = reader["simname"].ToString();
                                 ad.GlobalPos = reader["posglobal"].ToString();
                                 ad.ParcelName = reader["parcelname"].ToString();
-                                
                             }
                         }
                     }
@@ -296,13 +285,14 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": GetPickInfo exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetClassifiedInfo exception ", e);
             }
+
             return true;
         }
 
-        public static UUID GetUUID( object uuidValue ) {
+        public static UUID GetUUID(object uuidValue) 
+        {
 
             UUID ret = UUID.Zero;
 
@@ -311,7 +301,6 @@ namespace OpenSim.Data.PGSQL
             return ret;
         }
 
-
         #endregion Classifieds Queries
 
         #region Picks Queries
@@ -319,7 +308,7 @@ namespace OpenSim.Data.PGSQL
         {
             string query = string.Empty;
             
-            query += "SELECT \"pickuuid\",\"name\" FROM userpicks WHERE ";
+            query += "SELECT pickuuid, name FROM userpicks WHERE ";
             query += "creatoruuid = :Id";
             OSDArray data = new OSDArray();
             
@@ -330,7 +319,7 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader())
                         {
@@ -340,7 +329,7 @@ namespace OpenSim.Data.PGSQL
                                 {
                                     OSDMap record = new OSDMap();
                                     
-                                    record.Add("pickuuid",OSD.FromString((string)reader["pickuuid"]));
+                                    record.Add("pickuuid",OSD.FromUUID(DBGuid.FromDB(reader["pickuuid"])));
                                     record.Add("name",OSD.FromString((string)reader["name"]));
                                     data.Add(record);
                                 }
@@ -351,9 +340,9 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": GetAvatarPicks exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetAvatarPicks exception ", e);
             }
+
             return data;
         }
         
@@ -373,8 +362,8 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("CreatorId", avatarId.ToString());
-                        cmd.Parameters.AddWithValue("PickId", pickId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatorId", avatarId));
+                        cmd.Parameters.Add(m_database.CreateParameter("PickId", pickId));
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader())
                         {
@@ -387,18 +376,18 @@ namespace OpenSim.Data.PGSQL
                                 if (string.IsNullOrEmpty(description))
                                     description = "No description given.";
                                 
-                                UUID.TryParse((string)reader["pickuuid"], out pick.PickId);
-                                UUID.TryParse((string)reader["creatoruuid"], out pick.CreatorId);
-                                UUID.TryParse((string)reader["parceluuid"], out pick.ParcelId);
-                                UUID.TryParse((string)reader["snapshotuuid"], out pick.SnapshotId);
-                                pick.GlobalPos = (string)reader["posglobal"];
-                                bool.TryParse((string)reader["toppick"], out pick.TopPick);
-                                bool.TryParse((string)reader["enabled"], out pick.Enabled);
-                                pick.Name = (string)reader["name"];
-                                pick.Desc = description;
-                                pick.User = (string)reader["user"];
-                                pick.OriginalName = (string)reader["originalname"];
-                                pick.SimName = (string)reader["simname"];
+                                pick.PickId = DBGuid.FromDB(reader["pickuuid"]);
+                                pick.CreatorId = DBGuid.FromDB(reader["creatoruuid"]);
+                                pick.ParcelId = DBGuid.FromDB(reader["parceluuid"]);
+                                pick.SnapshotId = DBGuid.FromDB(reader["snapshotuuid"]);
+                                pick.GlobalPos = (string)reader["posglobal"].ToString();
+                                pick.TopPick = Convert.ToBoolean(reader["toppick"]);
+                                pick.Enabled = Convert.ToBoolean(reader["enabled"]);
+                                pick.Name = reader["name"].ToString ();
+                                pick.Desc = reader["description"].ToString();
+                                pick.User = reader["user"].ToString();
+                                pick.OriginalName = reader["originalname"].ToString();
+                                pick.SimName = reader["simname"].ToString();
                                 pick.SortOrder = (int)reader["sortorder"];
                             }
                         }
@@ -408,9 +397,9 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": GetPickInfo exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetPickInfo exception ", e);
             }
+
             return pick;
         }
         
@@ -418,20 +407,22 @@ namespace OpenSim.Data.PGSQL
         {       
             string query = string.Empty;
 
-            query = @"INSERT INTO userpicks VALUES ( :PickId, :CreatorId, :TopPick, :ParcelId,:Name, :Desc, :SnapshotId,:User,
-                          :Original, :SimName, :GlobalPos, :SortOrder, :Enabled) 
-                      where not exists ( select pickid from userpicks where pickid = :pickid);
 
-                     Update userpicks
-                        set parceluuid = :ParcelId,
-                            name = :Name,
-                            description  = :Desc,
-                            snapshotuuid = :SnapshotId,
-                            pickuuid     = :PickId,
-                            posglobal    = :GlobalPos
-                       where pickid = :PickId;
-                    ";
-            
+            query = @"WITH upsert AS (
+                        UPDATE userpicks SET
+                            pickuuid = :PickId, creatoruuid = :CreatorId, toppick = :TopPick, parceluuid = :ParcelId,
+                            name = :Name, description = :Desc, snapshotuuid = :SnapshotId, ""user"" = :User, 
+                            originalname = :Original, simname = :SimName, posglobal = :GlobalPos, 
+                            sortorder = :SortOrder, enabled = :Enabled 
+                        RETURNING * ) 
+                      INSERT INTO userpicks (pickuuid,creatoruuid,toppick,parceluuid,name,description,
+                            snapshotuuid,""user"",originalname,simname,posglobal,sortorder,enabled) 
+                      SELECT
+                            :PickId,:CreatorId,:TopPick,:ParcelId,:Name,:Desc,:SnapshotId,:User,
+                            :Original,:SimName,:GlobalPos,:SortOrder,:Enabled 
+                      WHERE NOT EXISTS (
+                        SELECT * FROM upsert )";
+                    
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -439,19 +430,19 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("PickId", pick.PickId.ToString());
-                        cmd.Parameters.AddWithValue("CreatorId", pick.CreatorId.ToString());
-                        cmd.Parameters.AddWithValue("TopPick", pick.TopPick.ToString());
-                        cmd.Parameters.AddWithValue("ParcelId", pick.ParcelId.ToString());
-                        cmd.Parameters.AddWithValue("Name", pick.Name.ToString());
-                        cmd.Parameters.AddWithValue("Desc", pick.Desc.ToString());
-                        cmd.Parameters.AddWithValue("SnapshotId", pick.SnapshotId.ToString());
-                        cmd.Parameters.AddWithValue("User", pick.User.ToString());
-                        cmd.Parameters.AddWithValue("Original", pick.OriginalName.ToString());
-                        cmd.Parameters.AddWithValue("SimName",pick.SimName.ToString());
-                        cmd.Parameters.AddWithValue("GlobalPos", pick.GlobalPos);
-                        cmd.Parameters.AddWithValue("SortOrder", pick.SortOrder.ToString ());
-                        cmd.Parameters.AddWithValue("Enabled", pick.Enabled.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("PickId", pick.PickId));
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatorId", pick.CreatorId));
+                        cmd.Parameters.Add(m_database.CreateParameter("TopPick", pick.TopPick));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParcelId", pick.ParcelId));
+                        cmd.Parameters.Add(m_database.CreateParameter("Name", pick.Name));
+                        cmd.Parameters.Add(m_database.CreateParameter("Desc", pick.Desc));
+                        cmd.Parameters.Add(m_database.CreateParameter("SnapshotId", pick.SnapshotId));
+                        cmd.Parameters.Add(m_database.CreateParameter("User", pick.User));
+                        cmd.Parameters.Add(m_database.CreateParameter("Original", pick.OriginalName));
+                        cmd.Parameters.Add(m_database.CreateParameter("SimName",pick.SimName));
+                        cmd.Parameters.Add(m_database.CreateParameter("GlobalPos", pick.GlobalPos));
+                        cmd.Parameters.Add(m_database.CreateParameter("SortOrder", pick.SortOrder));
+                        cmd.Parameters.Add(m_database.CreateParameter("Enabled", pick.Enabled));
                         
                         cmd.ExecuteNonQuery();
                     }
@@ -459,10 +450,10 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": UpdateAvatarNotes exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: UpdateAvatarNotes exception ", e);
                 return false;
             }
+
             return true;
         }
         
@@ -481,7 +472,7 @@ namespace OpenSim.Data.PGSQL
                     
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("PickId", pickId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("PickId", pickId));
                         
                         cmd.ExecuteNonQuery();
                     }
@@ -489,20 +480,22 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": DeleteUserPickRecord exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: DeleteUserPickRecord exception ", e);
                 return false;
             }
+
             return true;
         }
+
         #endregion Picks Queries
         
         #region Avatar Notes Queries
+
         public bool GetAvatarNotes(ref UserProfileNotes notes)
         {  // WIP
             string query = string.Empty;
             
-            query += "SELECT \"notes\" FROM usernotes WHERE ";
+            query += "SELECT notes FROM usernotes WHERE ";
             query += "useruuid = :Id AND ";
             query += "targetuuid = :TargetId";
             OSDArray data = new OSDArray();
@@ -514,8 +507,8 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", notes.UserId.ToString());
-                        cmd.Parameters.AddWithValue("TargetId", notes.TargetId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", notes.UserId));
+                        cmd.Parameters.Add(m_database.CreateParameter("TargetId", notes.TargetId));
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
@@ -530,9 +523,9 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": GetAvatarNotes exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetAvatarNotes exception ", e);
             }
+
             return true;
         }
         
@@ -541,7 +534,7 @@ namespace OpenSim.Data.PGSQL
             string query = string.Empty;
             bool remove;
             
-            if(string.IsNullOrEmpty(note.Notes))
+            if (string.IsNullOrEmpty(note.Notes))
             {
                 remove = true;
                 query += "DELETE FROM usernotes WHERE ";
@@ -551,14 +544,14 @@ namespace OpenSim.Data.PGSQL
             else
             {
                 remove = false;
-                query = @"INSERT INTO usernotes VALUES ( :UserId, :TargetId, :Notes )
-                            where not exists ( Select useruuid from usernotes where useruuid = :UserId and targetuuid = :TargetId );
 
-                           update usernotes
-                              set notes = :Notes
-                            where useruuid = :UserId 
-                              and targetuuid = :TargetId;
-                        ";
+                query = @"WITH upsert AS (
+                          UPDATE usernotes SET notes = :Notes, useruuid = :UserId, targetuuid = :TargetId RETURNING * )
+                          INSERT INTO usernotes (notes,useruuid,targetuuid)
+                          SELECT :Notes,:UserId,:TargetId
+                            WHERE NOT EXISTS (
+                              SELECT * FROM upsert
+                            )";
             }
             
             try
@@ -569,9 +562,10 @@ namespace OpenSim.Data.PGSQL
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
                         if(!remove)
-                            cmd.Parameters.AddWithValue("Notes", note.Notes);
-                        cmd.Parameters.AddWithValue("TargetId", note.TargetId.ToString ());
-                        cmd.Parameters.AddWithValue("UserId", note.UserId.ToString());
+                            cmd.Parameters.Add(m_database.CreateParameter("Notes", note.Notes));
+
+                        cmd.Parameters.Add(m_database.CreateParameter("TargetId", note.TargetId));
+                        cmd.Parameters.Add(m_database.CreateParameter("UserId", note.UserId));
                         
                         cmd.ExecuteNonQuery();
                     }
@@ -579,16 +573,17 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": UpdateAvatarNotes exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: UpdateAvatarNotes exception ", e);
                 return false;
             }
-            return true;
-            
+
+            return true;            
         }
+
         #endregion Avatar Notes Queries
         
         #region Avatar Properties
+
         public bool GetAvatarProperties(ref UserProfileProperties props, ref string result)
         {
             string query = string.Empty;
@@ -603,21 +598,21 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", props.UserId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", props.UserId));
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
                             {
-                                m_log.DebugFormat("[PROFILES_DATA]" +
-                                                  ": Getting data for {0}.", props.UserId);
+                                // m_log.DebugFormat("[PROFILES_DATA]" +
+                                //                  ": Getting data for {0}.", props.UserId);
                                 reader.Read();
-                                props.WebUrl = (string)reader["profileURL"];
-                                UUID.TryParse((string)reader["profileImage"], out props.ImageId);
+                                props.WebUrl = (string)reader["profileURL"].ToString();
+                                props.ImageId = DBGuid.FromDB(reader["profileImage"]);
                                 props.AboutText = (string)reader["profileAboutText"];
-                                UUID.TryParse((string)reader["profileFirstImage"], out props.FirstLifeImageId);
+                                props.FirstLifeImageId = DBGuid.FromDB(reader["profileFirstImage"]);
                                 props.FirstLifeText = (string)reader["profileFirstText"];
-                                UUID.TryParse((string)reader["profilePartner"], out props.PartnerId);
+                                props.PartnerId = DBGuid.FromDB(reader["profilePartner"]);
                                 props.WantToMask = (int)reader["profileWantToMask"];
                                 props.WantToText = (string)reader["profileWantToText"];
                                 props.SkillsMask = (int)reader["profileSkillsMask"];
@@ -626,8 +621,8 @@ namespace OpenSim.Data.PGSQL
                             }
                             else
                             {
-                                m_log.DebugFormat("[PROFILES_DATA]" +
-                                                 ": No data for {0}", props.UserId);
+                                //m_log.DebugFormat("[PROFILES_DATA]" +
+                                //                 ": No data for {0}", props.UserId);
                                
                                 props.WebUrl = string.Empty;
                                 props.ImageId = UUID.Zero;
@@ -645,19 +640,19 @@ namespace OpenSim.Data.PGSQL
 
                                 query = "INSERT INTO userprofile (";
                                 query += "useruuid, ";
-                                query += "profilePartner, ";
-                                query += "profileAllowPublish, ";
-                                query += "profileMaturePublish, ";
-                                query += "profileURL, ";
-                                query += "profileWantToMask, ";
-                                query += "profileWantToText, ";
-                                query += "profileSkillsMask, ";
-                                query += "profileSkillsText, ";
-                                query += "profileLanguages, ";
-                                query += "profileImage, ";
-                                query += "profileAboutText, ";
-                                query += "profileFirstImage, ";
-                                query += "profileFirstText) VALUES (";
+                                query += "\"profilePartner\", ";
+                                query += "\"profileAllowPublish\", ";
+                                query += "\"profileMaturePublish\", ";
+                                query += "\"profileURL\", ";
+                                query += "\"profileWantToMask\", ";
+                                query += "\"profileWantToText\", ";
+                                query += "\"profileSkillsMask\", ";
+                                query += "\"profileSkillsText\", ";
+                                query += "\"profileLanguages\", ";
+                                query += "\"profileImage\", ";
+                                query += "\"profileAboutText\", ";
+                                query += "\"profileFirstImage\", ";
+                                query += "\"profileFirstText\") VALUES (";
                                 query += ":userId, ";
                                 query += ":profilePartner, ";
                                 query += ":profileAllowPublish, ";
@@ -678,20 +673,23 @@ namespace OpenSim.Data.PGSQL
 
                                 using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
                                 {
-                                    put.Parameters.AddWithValue("userId", props.UserId.ToString());
-                                    put.Parameters.AddWithValue("profilePartner", props.PartnerId.ToString());
-                                    put.Parameters.AddWithValue("profileAllowPublish", props.PublishProfile);
-                                    put.Parameters.AddWithValue("profileMaturePublish", props.PublishMature);
-                                    put.Parameters.AddWithValue("profileURL", props.WebUrl);
-                                    put.Parameters.AddWithValue("profileWantToMask", props.WantToMask);
-                                    put.Parameters.AddWithValue("profileWantToText", props.WantToText);
-                                    put.Parameters.AddWithValue("profileSkillsMask", props.SkillsMask);
-                                    put.Parameters.AddWithValue("profileSkillsText", props.SkillsText);
-                                    put.Parameters.AddWithValue("profileLanguages", props.Language);
-                                    put.Parameters.AddWithValue("profileImage", props.ImageId.ToString());
-                                    put.Parameters.AddWithValue("profileAboutText", props.AboutText);
-                                    put.Parameters.AddWithValue("profileFirstImage", props.FirstLifeImageId.ToString());
-                                    put.Parameters.AddWithValue("profileFirstText", props.FirstLifeText);
+                                    //m_log.DebugFormat("[PROFILES_DATA]" +
+                                    //                  ": Adding new data for {0}", props.UserId);
+
+                                    put.Parameters.Add(m_database.CreateParameter("userId", props.UserId));
+                                    put.Parameters.Add(m_database.CreateParameter("profilePartner", props.PartnerId));
+                                    put.Parameters.Add(m_database.CreateParameter("profileAllowPublish", props.PublishProfile));
+                                    put.Parameters.Add(m_database.CreateParameter("profileMaturePublish", props.PublishMature));
+                                    put.Parameters.Add(m_database.CreateParameter("profileURL", props.WebUrl));
+                                    put.Parameters.Add(m_database.CreateParameter("profileWantToMask", props.WantToMask));
+                                    put.Parameters.Add(m_database.CreateParameter("profileWantToText", props.WantToText));
+                                    put.Parameters.Add(m_database.CreateParameter("profileSkillsMask", props.SkillsMask));
+                                    put.Parameters.Add(m_database.CreateParameter("profileSkillsText", props.SkillsText));
+                                    put.Parameters.Add(m_database.CreateParameter("profileLanguages", props.Language));
+                                    put.Parameters.Add(m_database.CreateParameter("profileImage", props.ImageId));
+                                    put.Parameters.Add(m_database.CreateParameter("profileAboutText", props.AboutText));
+                                    put.Parameters.Add(m_database.CreateParameter("profileFirstImage", props.FirstLifeImageId));
+                                    put.Parameters.Add(m_database.CreateParameter("profileFirstText", props.FirstLifeText));
 
                                     put.ExecuteNonQuery();
                                 }
@@ -702,11 +700,11 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": Requst properties exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetAvatarProperties exception ", e);
                 result = e.Message;
                 return false;
             }
+
             return true;
         }
         
@@ -715,12 +713,12 @@ namespace OpenSim.Data.PGSQL
             string query = string.Empty;
             
             query += "UPDATE userprofile SET ";
-            query += "profileURL=:profileURL, ";
-            query += "profileImage=:image, ";
-            query += "profileAboutText=:abouttext,";
-            query += "profileFirstImage=:firstlifeimage,";
-            query += "profileFirstText=:firstlifetext ";
-            query += "WHERE useruuid=:uuid";
+            query += "\"profileURL\"=:profileURL, ";
+            query += "\"profileImage\"=:image, ";
+            query += "\"profileAboutText\"=:abouttext,";
+            query += "\"profileFirstImage\"=:firstlifeimage,";
+            query += "\"profileFirstText\"=:firstlifetext ";
+            query += "WHERE \"useruuid\"=:uuid";
             
             try
             {
@@ -729,12 +727,12 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("profileURL", props.WebUrl);
-                        cmd.Parameters.AddWithValue("image", props.ImageId.ToString());
-                        cmd.Parameters.AddWithValue("abouttext", props.AboutText);
-                        cmd.Parameters.AddWithValue("firstlifeimage", props.FirstLifeImageId.ToString());
-                        cmd.Parameters.AddWithValue("firstlifetext", props.FirstLifeText);
-                        cmd.Parameters.AddWithValue("uuid", props.UserId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("profileURL", props.WebUrl));
+                        cmd.Parameters.Add(m_database.CreateParameter("image", props.ImageId));
+                        cmd.Parameters.Add(m_database.CreateParameter("abouttext", props.AboutText));
+                        cmd.Parameters.Add(m_database.CreateParameter("firstlifeimage", props.FirstLifeImageId));
+                        cmd.Parameters.Add(m_database.CreateParameter("firstlifetext", props.FirstLifeText));
+                        cmd.Parameters.Add(m_database.CreateParameter("uuid", props.UserId));
                         
                         cmd.ExecuteNonQuery();
                     }
@@ -742,27 +740,28 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": AgentPropertiesUpdate exception {0}", e.Message);
-                
+                m_log.Error("[PROFILES_DATA]: AgentPropertiesUpdate exception ", e);                
                 return false;
             }
+
             return true;
         }
+
         #endregion Avatar Properties
         
         #region Avatar Interests
+
         public bool UpdateAvatarInterests(UserProfileProperties up, ref string result)
         {           
             string query = string.Empty;
             
             query += "UPDATE userprofile SET ";
-            query += "profileWantToMask=:WantMask, ";
-            query += "profileWantToText=:WantText,";
-            query += "profileSkillsMask=:SkillsMask,";
-            query += "profileSkillsText=:SkillsText, ";
-            query += "profileLanguages=:Languages ";
-            query += "WHERE useruuid=:uuid";
+            query += "\"profileWantToMask\"=:WantMask, ";
+            query += "\"profileWantToText\"=:WantText,";
+            query += "\"profileSkillsMask\"=:SkillsMask,";
+            query += "\"profileSkillsText\"=:SkillsText, ";
+            query += "\"profileLanguages\"=:Languages ";
+            query += "WHERE \"useruuid\"=:uuid";
             
             try
             {
@@ -771,12 +770,12 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("WantMask", up.WantToMask);
-                        cmd.Parameters.AddWithValue("WantText", up.WantToText);
-                        cmd.Parameters.AddWithValue("SkillsMask", up.SkillsMask);
-                        cmd.Parameters.AddWithValue("SkillsText", up.SkillsText);
-                        cmd.Parameters.AddWithValue("Languages", up.Language);
-                        cmd.Parameters.AddWithValue("uuid", up.UserId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("WantMask", up.WantToMask));
+                        cmd.Parameters.Add(m_database.CreateParameter("WantText", up.WantToText));
+                        cmd.Parameters.Add(m_database.CreateParameter("SkillsMask", up.SkillsMask));
+                        cmd.Parameters.Add(m_database.CreateParameter("SkillsText", up.SkillsText));
+                        cmd.Parameters.Add(m_database.CreateParameter("Languages", up.Language));
+                        cmd.Parameters.Add(m_database.CreateParameter("uuid", up.UserId));
                         
                         cmd.ExecuteNonQuery();
                     }
@@ -784,13 +783,14 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": AgentInterestsUpdate exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: UpdateAvatarInterests exception ", e);
                 result = e.Message;
                 return false;
             }
+
             return true;
         }
+
         #endregion Avatar Interests
 
         public OSDArray GetUserImageAssets(UUID avatarId)
@@ -798,9 +798,6 @@ namespace OpenSim.Data.PGSQL
             OSDArray data = new OSDArray();
             string query = "SELECT \"snapshotuuid\" FROM {0} WHERE \"creatoruuid\" = :Id";
 
-            // Get classified image assets
-            
-            
             try
             {
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
@@ -809,7 +806,7 @@ namespace OpenSim.Data.PGSQL
 
                     using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"classifieds\""), dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
@@ -817,7 +814,7 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["snapshotuuid"].ToString ()));
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
                                 }
                             }
                         }
@@ -828,7 +825,7 @@ namespace OpenSim.Data.PGSQL
 
                     using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
@@ -836,7 +833,7 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["snapshotuuid"].ToString ()));
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
                                 }
                             }
                         }
@@ -849,7 +846,7 @@ namespace OpenSim.Data.PGSQL
 
                     using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
@@ -857,8 +854,8 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["profileImage"].ToString ()));
-                                    data.Add(new OSDString((string)reader["profileFirstImage"].ToString ()));
+                                    data.Add(new OSDString(reader["profileImage"].ToString()));
+                                    data.Add(new OSDString(reader["profileFirstImage"].ToString()));
                                 }
                             }
                         }
@@ -867,13 +864,14 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                  ": GetAvatarNotes exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetUserImageAssets exception ", e);
             }
+
             return data;
         }
         
         #region User Preferences
+
         public bool GetUserPreferences(ref UserPreferences pref, ref string result)
         {
             string query = string.Empty;
@@ -891,7 +889,7 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", pref.UserId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", pref.UserId));
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader())
                         {
@@ -906,13 +904,11 @@ namespace OpenSim.Data.PGSQL
                             {
                                 using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
                                 {
+                                    put.Parameters.Add(m_database.CreateParameter("Id", pref.UserId));
                                     query = "INSERT INTO usersettings VALUES ";
                                     query += "(:Id,'false','false', '')";
-                                    
-                                    lock(Lock)
-                                    {
-                                        put.ExecuteNonQuery();
-                                    }
+
+                                    put.ExecuteNonQuery();
                                 }
                             }
                         }
@@ -921,10 +917,10 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": Get preferences exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetUserPreferences exception ", e);
                 result = e.Message;
             }
+
             return true;
         }
 
@@ -934,7 +930,8 @@ namespace OpenSim.Data.PGSQL
             
             query += "UPDATE usersettings SET ";
             query += "imviaemail=:ImViaEmail, ";
-            query += "visible=:Visible,";
+            query += "visible=:Visible, ";
+            query += "email=:Email ";
             query += "WHERE useruuid=:uuid";
             
             try
@@ -944,29 +941,29 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ImViaEmail", pref.IMViaEmail.ToString().ToLower ());
-                        cmd.Parameters.AddWithValue("Visible", pref.Visible.ToString().ToLower ());
-                        cmd.Parameters.AddWithValue("uuid", pref.UserId.ToString());
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+                        cmd.Parameters.Add(m_database.CreateParameter("ImViaEmail", pref.IMViaEmail));
+                        cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible));
+                        cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower()));
+                        cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId));
+
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": AgentInterestsUpdate exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: UpdateUserPreferences exception ", e);
                 result = e.Message;
                 return false;
             }
+
             return true;
         }
+
         #endregion User Preferences
         
         #region Integration
+
         public bool GetUserAppData(ref UserAppData props, ref string result)
         {
             string query = string.Empty;
@@ -982,8 +979,8 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", props.UserId.ToString());
-                        cmd.Parameters.AddWithValue (":TagId", props.TagId.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", props.UserId));
+                        cmd.Parameters.Add(m_database.CreateParameter("TagId", props.TagId));
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
@@ -1003,15 +1000,12 @@ namespace OpenSim.Data.PGSQL
                                 
                                 using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
                                 {
-                                    put.Parameters.AddWithValue("Id", props.UserId.ToString());
-                                    put.Parameters.AddWithValue("TagId", props.TagId.ToString());
-                                    put.Parameters.AddWithValue("DataKey", props.DataKey.ToString());
-                                    put.Parameters.AddWithValue("DataVal", props.DataVal.ToString());
-                                    
-                                    lock(Lock)
-                                    {
-                                        put.ExecuteNonQuery();
-                                    }
+                                    put.Parameters.Add(m_database.CreateParameter("UserId", props.UserId));
+                                    put.Parameters.Add(m_database.CreateParameter("TagId", props.TagId));
+                                    put.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString()));
+                                    put.Parameters.Add(m_database.CreateParameter("DataVal", props.DataVal.ToString()));
+
+                                    put.ExecuteNonQuery();
                                 }
                             }
                         }
@@ -1020,11 +1014,11 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": Requst application data exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: GetUserAppData exception ", e);
                 result = e.Message;
                 return false;
             }
+
             return true;
         }
 
@@ -1046,27 +1040,24 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("UserId", props.UserId.ToString());
-                        cmd.Parameters.AddWithValue("TagId", props.TagId.ToString ());
-                        cmd.Parameters.AddWithValue("DataKey", props.DataKey.ToString ());
-                        cmd.Parameters.AddWithValue("DataVal", props.DataKey.ToString ());
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+                        cmd.Parameters.Add(m_database.CreateParameter("UserId", props.UserId.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("TagId", props.TagId.ToString ()));
+                        cmd.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString ()));
+                        cmd.Parameters.Add(m_database.CreateParameter("DataVal", props.DataKey.ToString ()));
+
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                 ": SetUserData exception {0}", e.Message);
+                m_log.Error("[PROFILES_DATA]: SetUserData exception ", e);
                 return false;
             }
+
             return true;
         }
+
         #endregion Integration
     }
-}
-
+}

OpenSim/Data/PGSQL/PGSQLXAssetData.cs

@@ -56,6 +56,7 @@ namespace OpenSim.Data.PGSQL
         private const int DaysBetweenAccessTimeUpdates = 30;
 
         private bool m_enableCompression = false;
+        private PGSQLManager m_database;
         private string m_connectionString;
         private object m_dbLock = new object();
 
@@ -92,6 +93,7 @@ namespace OpenSim.Data.PGSQL
             m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
 
             m_connectionString = connect;
+            m_database = new PGSQLManager(m_connectionString);
 
             using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
             {
@@ -138,12 +140,12 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
 
                     using (NpgsqlCommand cmd = new NpgsqlCommand(
-                        @"SELECT ""Name"", ""Description"", ""AccessTime"", ""AssetType"", ""Local"", ""Temporary"", ""AssetFlags"", ""CreatorID"", ""Data""
+                        @"SELECT name, description, access_time, ""AssetType"", local, temporary, asset_flags, creatorid, data
                             FROM XAssetsMeta 
-                            JOIN XAssetsData ON XAssetsMeta.Hash = XAssetsData.Hash WHERE ""ID""=:ID",
+                            JOIN XAssetsData ON XAssetsMeta.hash = XAssetsData.Hash WHERE id=:ID",
                         dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ID", assetID.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("ID", assetID));
 
                         try
                         {
@@ -151,18 +153,23 @@ namespace OpenSim.Data.PGSQL
                             {
                                 if (dbReader.Read())
                                 {
-                                    asset = new AssetBase(assetID, (string)dbReader["Name"], (sbyte)dbReader["AssetType"], dbReader["CreatorID"].ToString());
-                                    asset.Data = (byte[])dbReader["Data"];
-                                    asset.Description = (string)dbReader["Description"];
+                                    asset = new AssetBase(
+                                        assetID,
+                                        (string)dbReader["name"],
+                                        Convert.ToSByte(dbReader["AssetType"]),
+                                        dbReader["creatorid"].ToString());
 
-                                    string local = dbReader["Local"].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["AssetFlags"]);
+                                    asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
+                                    asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
 
                                     if (m_enableCompression)
                                     {
@@ -179,7 +186,7 @@ namespace OpenSim.Data.PGSQL
                                         }
                                     }
 
-                                    UpdateAccessTime(asset.Metadata, (int)dbReader["AccessTime"]);
+                                    UpdateAccessTime(asset.Metadata, (int)dbReader["access_time"]);
                                 }
                             }
                         }
@@ -245,6 +252,9 @@ namespace OpenSim.Data.PGSQL
 
                         byte[] hash = hasher.ComputeHash(asset.Data);
 
+                        UUID asset_id;
+                        UUID.TryParse(asset.ID, out asset_id);
+
 //                        m_log.DebugFormat(
 //                            "[XASSET DB]: Compressed data size for {0} {1}, hash {2} is {3}",
 //                            asset.ID, asset.Name, hash, compressedData.Length);
@@ -253,31 +263,33 @@ namespace OpenSim.Data.PGSQL
                         {
                             using (NpgsqlCommand cmd =
                                 new NpgsqlCommand(
-                                    @"insert INTO XAssetsMeta(""ID"", ""Hash"", ""Name"", ""Description"", ""AssetType"", ""Local"", ""Temporary"", ""CreateTime"", ""AccessTime"", ""AssetFlags"", ""CreatorID"")
+                                    @"insert INTO XAssetsMeta(id, hash, name, description, ""AssetType"", local, temporary, create_time, access_time, asset_flags, creatorid)
                                        Select :ID, :Hash, :Name, :Description, :AssetType, :Local, :Temporary, :CreateTime, :AccessTime, :AssetFlags, :CreatorID
-                                        where not exists( Select ""ID"" from XAssetsMeta where ""ID"" = :ID ;
+                                        where not exists( Select id from XAssetsMeta where id = :ID);
 
                                       update XAssetsMeta
-                                          set ""ID"" = :ID, ""Hash"" = :Hash, ""Name"" = :Name, ""Description"" = :Description, 
-                                              ""AssetType"" = :AssetType, ""Local"" = :Local, ""Temporary"" = :Temporary, ""CreateTime"" = :CreateTime, 
-                                              ""AccessTime"" = :AccessTime, ""AssetFlags"" = :AssetFlags, ""CreatorID"" = :CreatorID
-                                        where ""ID"" = :ID;
+                                          set id = :ID, hash = :Hash, name = :Name, description = :Description, 
+                                              ""AssetType"" = :AssetType, local = :Local, temporary = :Temporary, create_time = :CreateTime, 
+                                              access_time = :AccessTime, asset_flags = :AssetFlags, creatorid = :CreatorID
+                                        where id = :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("AssetType", asset.Type);
-                                cmd.Parameters.AddWithValue("Local", asset.Local);
-                                cmd.Parameters.AddWithValue("Temporary", asset.Temporary);
-                                cmd.Parameters.AddWithValue("CreateTime", now);
-                                cmd.Parameters.AddWithValue("AccessTime", now);
-                                cmd.Parameters.AddWithValue("CreatorID", asset.Metadata.CreatorID);
-                                cmd.Parameters.AddWithValue("AssetFlags", (int)asset.Flags);
+                                cmd.Parameters.Add(m_database.CreateParameter("ID", asset_id));
+                                cmd.Parameters.Add(m_database.CreateParameter("Hash", hash));
+                                cmd.Parameters.Add(m_database.CreateParameter("Name", assetName));
+                                cmd.Parameters.Add(m_database.CreateParameter("Description", assetDescription));
+                                cmd.Parameters.Add(m_database.CreateParameter("AssetType", asset.Type));
+                                cmd.Parameters.Add(m_database.CreateParameter("Local", asset.Local));
+                                cmd.Parameters.Add(m_database.CreateParameter("Temporary", asset.Temporary));
+                                cmd.Parameters.Add(m_database.CreateParameter("CreateTime", now));
+                                cmd.Parameters.Add(m_database.CreateParameter("AccessTime", now));
+                                cmd.Parameters.Add(m_database.CreateParameter("CreatorID", asset.Metadata.CreatorID));
+                                cmd.Parameters.Add(m_database.CreateParameter("AssetFlags", (int)asset.Flags));
+
                                 cmd.ExecuteNonQuery();
                             }
                         }
@@ -297,11 +309,11 @@ namespace OpenSim.Data.PGSQL
                             {
                                 using (NpgsqlCommand cmd =
                                     new NpgsqlCommand(
-                                        @"INSERT INTO XAssetsData(""Hash"", ""Data"") VALUES(:Hash, :Data)",
+                                        @"INSERT INTO XAssetsData(hash, data) VALUES(:Hash, :Data)",
                                         dbcon))
                                 {
-                                    cmd.Parameters.AddWithValue("Hash", hash);
-                                    cmd.Parameters.AddWithValue("Data", asset.Data);
+                                    cmd.Parameters.Add(m_database.CreateParameter("Hash", hash));
+                                    cmd.Parameters.Add(m_database.CreateParameter("Data", asset.Data));
                                     cmd.ExecuteNonQuery();
                                 }
                             }
@@ -344,15 +356,18 @@ namespace OpenSim.Data.PGSQL
                 {
                     dbcon.Open();
                     NpgsqlCommand cmd =
-                        new NpgsqlCommand(@"update XAssetsMeta set ""AccessTime""=:AccessTime where ID=:ID", dbcon);
+                        new NpgsqlCommand(@"update XAssetsMeta set access_time=:AccessTime where id=:ID", dbcon);
 
                     try
                     {
+                        UUID asset_id;
+                        UUID.TryParse(assetMetadata.ID, out asset_id);
+
                         using (cmd)
                         {
                             // create unix epoch time
-                            cmd.Parameters.AddWithValue("ID", assetMetadata.ID);
-                            cmd.Parameters.AddWithValue("AccessTime", (int)Utils.DateTimeToUnixTime(now));
+                            cmd.Parameters.Add(m_database.CreateParameter("id", asset_id));
+                            cmd.Parameters.Add(m_database.CreateParameter("access_time", (int)Utils.DateTimeToUnixTime(now)));
                             cmd.ExecuteNonQuery();
                         }
                     }
@@ -380,9 +395,9 @@ namespace OpenSim.Data.PGSQL
 
             bool exists = false;
 
-            using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT ""Hash"" FROM XAssetsData WHERE ""Hash""=:Hash", dbcon))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT hash FROM XAssetsData WHERE hash=:Hash", dbcon))
             {
-                cmd.Parameters.AddWithValue("Hash", hash);
+                cmd.Parameters.Add(m_database.CreateParameter("Hash", hash));
 
                 try
                 {
@@ -419,7 +434,7 @@ namespace OpenSim.Data.PGSQL
             HashSet<UUID> exist = new HashSet<UUID>();
 
             string ids = "'" + string.Join("','", uuids) + "'";
-            string sql = string.Format(@"SELECT ""ID"" FROM XAssetsMeta WHERE ""ID"" IN ({0})", ids);
+            string sql = string.Format(@"SELECT id FROM XAssetsMeta WHERE id IN ({0})", ids);
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
@@ -459,9 +474,9 @@ namespace OpenSim.Data.PGSQL
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
                 {
                     dbcon.Open();
-                    using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT ""ID"" FROM XAssetsMeta WHERE ""ID""=:ID", dbcon))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT id FROM XAssetsMeta WHERE id=:ID", dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ID", uuid.ToString());
+                        cmd.Parameters.Add(m_database.CreateParameter("id", uuid));
 
                         try
                         {
@@ -503,11 +518,11 @@ namespace OpenSim.Data.PGSQL
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
                 {
                     dbcon.Open();
-                    NpgsqlCommand cmd = new NpgsqlCommand( @"SELECT ""Name"", ""Description"", ""AccessTime"", ""AssetType"", ""Temporary"", ""ID"", ""AssetFlags"", ""CreatorID""
+                    NpgsqlCommand cmd = new NpgsqlCommand( @"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
                                             FROM XAssetsMeta 
                                             LIMIT :start, :count", dbcon);
-                    cmd.Parameters.AddWithValue("start", start);
-                    cmd.Parameters.AddWithValue("count", count);
+                    cmd.Parameters.Add(m_database.CreateParameter("start", start));
+                    cmd.Parameters.Add(m_database.CreateParameter("count", count));
 
                     try
                     {
@@ -516,18 +531,18 @@ namespace OpenSim.Data.PGSQL
                             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["AssetFlags"]);
-                                metadata.FullID = DBGuid.FromDB(dbReader["ID"]);
-                                metadata.CreatorID = dbReader["CreatorID"].ToString();
+                                metadata.Name = (string)dbReader["name"];
+                                metadata.Description = (string)dbReader["description"];
+                                metadata.Type = Convert.ToSByte(dbReader["AssetType"]);
+                                metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]);
+                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
+                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
+                                metadata.CreatorID = dbReader["creatorid"].ToString();
 
                                 // We'll ignore this for now - it appears unused!
 //                                metadata.SHA1 = dbReader["hash"]);
 
-                                UpdateAccessTime(metadata, (int)dbReader["AccessTime"]);
+                                UpdateAccessTime(metadata, (int)dbReader["access_time"]);
 
                                 retList.Add(metadata);
                             }
@@ -553,9 +568,9 @@ namespace OpenSim.Data.PGSQL
                 {
                     dbcon.Open();
 
-                    using (NpgsqlCommand cmd = new NpgsqlCommand(@"delete from XAssetsMeta where ""ID""=:ID", dbcon))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(@"delete from XAssetsMeta where id=:ID", dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ID", id);
+                        cmd.Parameters.Add(m_database.CreateParameter(id, id));
                         cmd.ExecuteNonQuery();
                     }
 

OpenSim/Data/PGSQL/Resources/AssetStore.migrations

@@ -92,3 +92,8 @@ ALTER TABLE assets ADD "asset_flags" INTEGER NOT NULL DEFAULT 0;
 :VERSION 7
 
 alter table assets add "creatorid" varchar(36) not null default '';
+
+:VERSION 8
+
+BEGIN TRANSACTION;
+COMMIT;

OpenSim/Data/PGSQL/Resources/UserProfiles.migrations

@@ -89,4 +89,58 @@ CREATE TABLE usersettings (
     "visible" bytea NOT NULL,
     PRIMARY KEY ("useruuid")
 );
-commit;
+commit;
+
+:VERSION 4
+
+BEGIN;
+
+-- Classifieds
+ALTER TABLE classifieds DROP CONSTRAINT classifiedspk;
+ALTER TABLE classifieds ALTER COLUMN classifieduuid SET DATA TYPE uuid using classifieduuid::uuid;
+ALTER TABLE classifieds ALTER COLUMN creatoruuid SET DATA TYPE uuid using creatoruuid::uuid;
+ALTER TABLE classifieds ALTER COLUMN parceluuid SET DATA TYPE uuid using parceluuid::uuid;
+ALTER TABLE classifieds ALTER COLUMN snapshotuuid SET DATA TYPE uuid using snapshotuuid::uuid;
+ALTER TABLE classifieds ADD CONSTRAINT classifiedspk PRIMARY KEY (classifieduuid);
+
+-- Notes
+ALTER TABLE usernotes DROP CONSTRAINT usernoteuk;
+ALTER TABLE usernotes ALTER COLUMN useruuid SET DATA TYPE uuid USING useruuid::uuid;
+ALTER TABLE usernotes ALTER COLUMN targetuuid SET DATA TYPE uuid USING targetuuid::uuid;
+ALTER TABLE usernotes ADD CONSTRAINT usernoteuk UNIQUE (useruuid,targetuuid);
+
+
+-- Userpicks
+ALTER TABLE userpicks DROP CONSTRAINT userpicks_pkey;
+ALTER TABLE userpicks ALTER COLUMN pickuuid SET DATA TYPE uuid USING pickuuid::uuid;
+ALTER TABLE userpicks ALTER COLUMN creatoruuid SET DATA TYPE uuid USING creatoruuid::uuid;
+ALTER TABLE userpicks ALTER COLUMN parceluuid SET DATA TYPE uuid USING parceluuid::uuid;
+ALTER TABLE userpicks ALTER COLUMN parceluuid SET DATA TYPE uuid USING parceluuid::uuid;
+ALTER TABLE userpicks ADD PRIMARY KEY (pickuuid);
+
+-- Userprofile
+ALTER TABLE userprofile DROP CONSTRAINT userprofile_pkey;
+ALTER TABLE userprofile ALTER COLUMN useruuid SET DATA TYPE uuid USING useruuid::uuid;
+ALTER TABLE userprofile ALTER COLUMN "profilePartner" SET DATA TYPE uuid USING "profilePartner"::uuid;
+-- Force column conversions
+ALTER TABLE userprofile ALTER COLUMN "profileAllowPublish" SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+ALTER TABLE userprofile ALTER COLUMN "profileMaturePublish" SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+ALTER TABLE userprofile ALTER COLUMN "profileImage" SET DATA TYPE uuid USING "profileImage"::uuid;
+ALTER TABLE userprofile ALTER COLUMN "profileFirstImage" SET DATA TYPE uuid USING "profileFirstImage"::uuid;
+ALTER TABLE userprofile ADD PRIMARY KEY (useruuid);
+
+-- Userdata
+ALTER TABLE userdata DROP CONSTRAINT userdata_pkey;
+ALTER TABLE userdata ALTER COLUMN "UserId" SET DATA TYPE uuid USING "UserId"::uuid;
+ALTER TABLE userdata ALTER COLUMN "UserId" SET DATA TYPE uuid USING "UserId"::uuid;
+ALTER TABLE userdata ADD PRIMARY KEY ("UserId","TagId");
+
+
+-- Usersettings
+ALTER TABLE usersettings DROP CONSTRAINT usersettings_pkey;
+ALTER TABLE usersettings ALTER COLUMN useruuid SET DATA TYPE uuid USING useruuid::uuid;
+ALTER TABLE usersettings ALTER COLUMN visible SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+ALTER TABLE usersettings ADD COLUMN email varchar(254) NOT NULL;
+ALTER TABLE usersettings ADD PRIMARY KEY (useruuid);
+
+COMMIT;

OpenSim/Data/PGSQL/Resources/XAssetStore.migrations

@@ -25,3 +25,56 @@ CREATE TABLE XAssetsData (
 );
 
 COMMIT;
+
+
+:VERSION 2
+
+BEGIN;
+
+ALTER TABLE xassetsmeta ALTER COLUMN "Local" SET DATA TYPE boolean USING CASE WHEN '0' THEN FALSE ELSE TRUE END;
+ALTER TABLE xassetsmeta ALTER COLUMN "Temporary" SET DATA TYPE boolean USING CASE WHEN '0' THEN FALSE ELSE TRUE END;
+ALTER TABLE xassetsmeta ALTER COLUMN "Hash" SET DATA TYPE char(66);
+ALTER TABLE xassetsdata ALTER COLUMN "Hash" SET DATA TYPE char(66);
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN;
+
+ALTER TABLE xassetsmeta RENAME COLUMN "ID" TO id;
+ALTER TABLE xassetsmeta RENAME COLUMN "Hash" TO hash;
+ALTER TABLE xassetsmeta RENAME COLUMN "Name" TO name;
+ALTER TABLE xassetsmeta RENAME COLUMN "Description" TO description;
+ALTER TABLE xassetsmeta RENAME COLUMN "Local" to local;
+ALTER TABLE xassetsmeta RENAME COLUMN "Temporary" TO temporary;
+ALTER TABLE xassetsmeta RENAME COLUMN "CreateTime" TO create_time;
+ALTER TABLE xassetsmeta RENAME COLUMN "AccessTime" TO access_time;
+ALTER TABLE xassetsmeta RENAME COLUMN "AssetFlags" TO asset_flags;
+ALTER TABLE xassetsmeta RENAME COLUMN "CreatorID" TO creatorid;
+ALTER TABLE xassetsmeta DROP CONSTRAINT xassetsmeta_pkey;
+ALTER TABLE xassetsmeta ADD PRIMARY KEY (id);
+
+
+ALTER TABLE xassetsdata RENAME COLUMN "Hash" TO hash;
+ALTER TABLE xassetsdata RENAME COLUMN "Data" TO data;
+ALTER TABLE xassetsdata DROP CONSTRAINT xassetsdata_pkey;
+ALTER TABLE xassetsdata ADD PRIMARY KEY (hash);
+
+COMMIT;
+
+
+:VERSION 4
+
+BEGIN;
+
+ALTER TABLE xassetsmeta ALTER COLUMN id SET DATA TYPE uuid USING id::uuid;
+ALTER TABLE xassetsmeta ALTER COLUMN hash SET DATA TYPE bytea USING hash::bytea;
+ALTER TABLE xassetsdata ALTER COLUMN hash SET DATA TYPE bytea USING hash::bytea;
+
+COMMIT;
+
+:VERSION 5
+
+BEGIN;
+COMMIT;

OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations

@@ -92,3 +92,110 @@ BEGIN;
 
 
 COMMIT;
+
+
+
+:VERSION 3
+
+BEGIN;
+
+-- Not a pretty way to do this, but it did not work as-is
+-- and nothing was found about converting between existing data
+-- and the new type.
+-- Since there should be nothing to preserve ...
+
+DROP TABLE IF EXISTS os_groups_groups CASCADE;
+
+CREATE TABLE os_groups_groups (
+  "GroupID" uuid PRIMARY KEY NOT NULL,
+  "Location" varchar(255) NOT NULL DEFAULT '',
+  "Name" varchar(255) NOT NULL DEFAULT '',
+  "Charter" text NOT NULL,
+  "InsigniaID" uuid NOT NULL,
+  "FounderID" uuid NOT NULL,
+  "MembershipFee" integer NOT NULL DEFAULT '0',
+  "OpenEnrollment" varchar(255) NOT NULL DEFAULT '',
+  "ShowInList" integer NOT NULL DEFAULT '0',
+  "AllowPublish" integer NOT NULL DEFAULT '0',
+  "MaturePublish" integer NOT NULL DEFAULT '0',
+  "OwnerRoleID" uuid NOT NULL
+);
+
+
+DROP TABLE IF EXISTS os_groups_membership;
+
+CREATE TABLE os_groups_membership (
+  "GroupID"uuid NOT NULL,
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  "SelectedRoleID" uuid NOT NULL,
+  "Contribution" integer NOT NULL DEFAULT '0',
+  "ListInProfile" integer NOT NULL DEFAULT '1',
+  "AcceptNotices" integer NOT NULL DEFAULT '1',
+  "AccessToken" uuid NOT NULL,
+  constraint os_groupmemberpk PRIMARY KEY ("GroupID", "PrincipalID")
+);
+
+
+
+DROP TABLE IF EXISTS os_groups_roles;
+
+CREATE TABLE os_groups_roles (
+  "GroupID" uuid NOT NULL,
+  "RoleID" uuid NOT NULL,
+  "Name" varchar(255) NOT NULL DEFAULT '',
+  "Description" varchar(255) NOT NULL DEFAULT '',
+  "Title" varchar(255) NOT NULL DEFAULT '',
+  "Powers" varchar(36) NOT NULL DEFAULT '',
+  constraint os_grouprolepk PRIMARY KEY  ("GroupID","RoleID")
+);
+
+
+DROP TABLE IF EXISTS os_groups_rolemembership;
+
+CREATE TABLE os_groups_rolemembership (
+  "GroupID" uuid NOT NULL,
+  "RoleID" uuid NOT NULL,
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  constraint os_grouprolememberpk PRIMARY KEY  ("GroupID","RoleID","PrincipalID")
+);
+
+
+DROP TABLE IF EXISTS os_groups_invites;
+
+CREATE TABLE os_groups_invites (
+  "InviteID" uuid NOT NULL,
+  "GroupID" uuid NOT NULL,
+  "RoleID" uuid NOT NULL,
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  "TMStamp" timestamp NOT NULL DEFAULT now(),
+  constraint os_groupinvitespk PRIMARY KEY  ("InviteID")
+);
+
+
+DROP TABLE IF EXISTS os_groups_notices;
+
+CREATE TABLE os_groups_notices (
+  "GroupID" uuid NOT NULL,
+  "NoticeID" uuid NOT NULL,
+  "TMStamp" integer NOT NULL DEFAULT '0',
+  "FromName" varchar(255) NOT NULL DEFAULT '',
+  "Subject" varchar(255) NOT NULL DEFAULT '',
+  "Message" text NOT NULL,
+  "HasAttachment" integer NOT NULL DEFAULT '0',
+  "AttachmentType" integer NOT NULL DEFAULT '0',
+  "AttachmentName" varchar(128) NOT NULL DEFAULT '',
+  "AttachmentItemID" uuid NOT NULL,
+  "AttachmentOwnerID" varchar(255) NOT NULL DEFAULT '',
+  constraint os_groupsnoticespk PRIMARY KEY  ("NoticeID")
+);
+
+
+DROP TABLE IF EXISTS os_groups_principals;
+
+CREATE TABLE os_groups_principals (
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  "ActiveGroupID" uuid NOT NULL,
+  constraint os_groupprincpk PRIMARY KEY  ("PrincipalID")
+);
+
+COMMIT;

OpenSim/Data/SQLite/SQLiteInventoryStore.cs

@@ -239,7 +239,7 @@ namespace OpenSim.Data.SQLite
                 if (inventoryRow == null)
                 {
                     if (! add)
-                        m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existant inventory folder: {0}", folder.ID);
+                        m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existent inventory folder: {0}", folder.ID);
 
                     inventoryRow = inventoryFolderTable.NewRow();
                     fillFolderRow(inventoryRow, folder);
@@ -298,7 +298,7 @@ namespace OpenSim.Data.SQLite
                 if (inventoryRow == null)
                 {
                     if (!add)
-                        m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existant inventory item: {0}", item.ID);
+                        m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existent inventory item: {0}", item.ID);
 
                     inventoryRow = inventoryItemTable.NewRow();
                     fillItemRow(inventoryRow, item);

OpenSim/Data/SQLite/SQLiteUserProfilesData.cs

@@ -114,7 +114,7 @@ namespace OpenSim.Data.SQLite
                 }
                 catch (Exception e)
                 {
-                    m_log.DebugFormat("[PROFILES_DATA]" +
+                    m_log.ErrorFormat("[PROFILES_DATA]" +
                                       ": UserAccount exception {0}", e.Message);
                 }
                 n.Add("classifieduuid", OSD.FromUUID(Id));
@@ -217,7 +217,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": ClassifiedesUpdate exception {0}", e.Message);
                 result = e.Message;
                 return false;
@@ -243,7 +243,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": DeleteClassifiedRecord exception {0}", e.Message);
                 return false;
             }
@@ -289,7 +289,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": GetPickInfo exception {0}", e.Message);
             }
             return true;
@@ -326,7 +326,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": GetAvatarPicks exception {0}", e.Message);
             }
             return data;
@@ -378,7 +378,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": GetPickInfo exception {0}", e.Message);
             }
             return pick;
@@ -446,7 +446,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": UpdateAvatarNotes exception {0}", e.Message);
                 return false;
             }
@@ -471,7 +471,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": DeleteUserPickRecord exception {0}", e.Message);
                 return false;
             }
@@ -507,7 +507,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": GetAvatarNotes exception {0}", e.Message);
             }
             return true;
@@ -550,7 +550,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": UpdateAvatarNotes exception {0}", e.Message);
                 return false;
             }
@@ -577,7 +577,7 @@ namespace OpenSim.Data.SQLite
                     }
                     catch(Exception e)
                     {
-                        m_log.DebugFormat("[PROFILES_DATA]" +
+                        m_log.ErrorFormat("[PROFILES_DATA]" +
                                           ": GetAvatarProperties exception {0}", e.Message);
                         result = e.Message;
                         return false;
@@ -696,7 +696,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": AgentPropertiesUpdate exception {0}", e.Message);
                 
                 return false;
@@ -733,7 +733,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": AgentInterestsUpdate exception {0}", e.Message);
                 result = e.Message;
                 return false;
@@ -747,7 +747,8 @@ namespace OpenSim.Data.SQLite
             
             query += "UPDATE usersettings SET ";
             query += "imviaemail=:ImViaEmail, ";
-            query += "visible=:Visible ";
+            query += "visible=:Visible, ";
+            query += "email=:EMail ";
             query += "WHERE useruuid=:uuid";
             
             try
@@ -757,6 +758,7 @@ namespace OpenSim.Data.SQLite
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":ImViaEmail", pref.IMViaEmail);
                     cmd.Parameters.AddWithValue(":Visible", pref.Visible);
+                    cmd.Parameters.AddWithValue(":EMail", pref.EMail);
                     cmd.Parameters.AddWithValue(":uuid", pref.UserId.ToString());
                         
                     cmd.ExecuteNonQuery();
@@ -764,7 +766,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": AgentInterestsUpdate exception {0}", e.Message);
                 result = e.Message;
                 return false;
@@ -816,7 +818,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": Get preferences exception {0}", e.Message);
                 result = e.Message;
                 return false;
@@ -871,7 +873,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": Requst application data exception {0}", e.Message);
                 result = e.Message;
                 return false;
@@ -904,7 +906,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": SetUserData exception {0}", e.Message);
                 return false;
             }
@@ -968,7 +970,7 @@ namespace OpenSim.Data.SQLite
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[PROFILES_DATA]" +
+                m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": GetAvatarNotes exception {0}", e.Message);
             }
             return data;

OpenSim/Data/Tests/AssetTests.cs

@@ -40,9 +40,6 @@ using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
 
-using System.Data.SqlClient;
-using OpenSim.Data.MSSQL;
-
 using Mono.Data.Sqlite;
 using OpenSim.Data.SQLite;
 
@@ -58,11 +55,6 @@ namespace OpenSim.Data.Tests
     {
     }
 
-    [TestFixture(Description = "Asset store tests (MS SQL Server)")]
-    public class MSSQLAssetTests : AssetTests<SqlConnection, MSSQLAssetData>
-    {
-    }
-
     public class AssetTests<TConn, TAssetData> : BasicDataServiceTest<TConn, TAssetData>
         where TConn : DbConnection, new()
         where TAssetData : AssetDataBase, new()

OpenSim/Data/Tests/EstateTests.cs

@@ -41,9 +41,6 @@ using System.Data.Common;
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
 
-using System.Data.SqlClient;
-using OpenSim.Data.MSSQL;
-
 using Mono.Data.Sqlite;
 using OpenSim.Data.SQLite;
 
@@ -59,11 +56,6 @@ namespace OpenSim.Data.Tests
     {
     }
 
-    [TestFixture(Description = "Estate store tests (MS SQL Server)")]
-    public class MSSQLEstateTests : EstateTests<SqlConnection, MSSQLEstateStore>
-    {
-    }
-
     public class EstateTests<TConn, TEstateStore> : BasicDataServiceTest<TConn, TEstateStore>
         where TConn : DbConnection, new()
         where TEstateStore : class, IEstateDataStore, new()

OpenSim/Data/Tests/InventoryTests.cs

@@ -39,9 +39,6 @@ using System.Data.Common;
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
 
-using System.Data.SqlClient;
-using OpenSim.Data.MSSQL;
-
 using Mono.Data.Sqlite;
 using OpenSim.Data.SQLite;
 
@@ -57,11 +54,6 @@ namespace OpenSim.Data.Tests
     { 
     }
 
-    [TestFixture(Description = "Inventory store tests (MS SQL Server)")]
-    public class MSSQLInventoryTests : InventoryTests<SqlConnection, MSSQLInventoryData>
-    {
-    }
-
     public class InventoryTests<TConn, TInvStore> : BasicDataServiceTest<TConn, TInvStore>
         where TConn : DbConnection, new()
         where TInvStore : class, IInventoryDataPlugin, new()

OpenSim/Data/Tests/RegionTests.cs

@@ -44,9 +44,6 @@ using System.Data.Common;
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
 
-using System.Data.SqlClient;
-using OpenSim.Data.MSSQL;
-
 using Mono.Data.Sqlite;
 using OpenSim.Data.SQLite;
 
@@ -62,11 +59,6 @@ namespace OpenSim.Data.Tests
     {
     }
 
-    [TestFixture(Description = "Region store tests (MS SQL Server)")]
-    public class MSSQLRegionTests : RegionTests<SqlConnection, MSSQLSimulationData>
-    {
-    }
-
     public class RegionTests<TConn, TRegStore> : BasicDataServiceTest<TConn, TRegStore>
         where TConn : DbConnection, new()
         where TRegStore : class, ISimulationDataStore, new()

OpenSim/Framework/AvatarAppearance.cs

@@ -520,6 +520,12 @@ namespace OpenSim.Framework
                 if (!m_attachments.ContainsKey(attach.AttachPoint))
                     m_attachments[attach.AttachPoint] = new List<AvatarAttachment>();
     
+                foreach (AvatarAttachment prev in m_attachments[attach.AttachPoint])
+                {
+                    if (prev.ItemID == attach.ItemID)
+                        return;
+                }
+
                 m_attachments[attach.AttachPoint].Add(attach);
             }
         }

OpenSim/Framework/ClientInfo.cs

@@ -55,6 +55,11 @@ namespace OpenSim.Framework
         public int textureThrottle;
         public int totalThrottle;
 
+        // Used by adaptive only
+        public int targetThrottle;
+
+        public int maxThrottle;
+
         public Dictionary<string, int> SyncRequests = new Dictionary<string,int>();
         public Dictionary<string, int> AsyncRequests = new Dictionary<string,int>();
         public Dictionary<string, int> GenericRequests = new Dictionary<string,int>();

OpenSim/Framework/Communications/OutboundUrlFilter.cs

@@ -0,0 +1,256 @@
+/*
+ * 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.Net;
+using System.Reflection;
+using log4net;
+using LukeSkywalker.IPNetwork;
+using Nini.Config;
+
+namespace OpenSim.Framework.Communications
+{
+    public class OutboundUrlFilter
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public string Name { get; private set; }
+
+        private List<IPNetwork> m_blacklistNetworks;
+        private List<IPEndPoint> m_blacklistEndPoints;
+
+        private List<IPNetwork> m_blacklistExceptionNetworks;
+        private List<IPEndPoint> m_blacklistExceptionEndPoints;
+
+        public OutboundUrlFilter(
+            string name, 
+            List<IPNetwork> blacklistNetworks, List<IPEndPoint> blacklistEndPoints, 
+            List<IPNetwork> blacklistExceptionNetworks, List<IPEndPoint> blacklistExceptionEndPoints)
+        {
+            Name = name;
+
+            m_blacklistNetworks = blacklistNetworks;
+            m_blacklistEndPoints = blacklistEndPoints;
+            m_blacklistExceptionNetworks = blacklistExceptionNetworks;
+            m_blacklistExceptionEndPoints = blacklistExceptionEndPoints;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenSim.Framework.Communications.OutboundUrlFilter"/> class.
+        /// </summary>
+        /// <param name="name">Name of the filter for logging purposes.</param>
+        /// <param name="config">Filter configuration</param>
+        public OutboundUrlFilter(string name, IConfigSource config)
+        {
+            Name = name;
+
+            string configBlacklist
+                = "0.0.0.0/8|10.0.0.0/8|100.64.0.0/10|127.0.0.0/8|169.254.0.0/16|172.16.0.0/12|192.0.0.0/24|192.0.2.0/24|192.88.99.0/24|192.168.0.0/16|198.18.0.0/15|198.51.100.0/24|203.0.113.0/24|224.0.0.0/4|240.0.0.0/4|255.255.255.255/32";
+            string configBlacklistExceptions = "";
+
+            IConfig networkConfig = config.Configs["Network"];
+
+            if (networkConfig != null)
+            {
+                configBlacklist = networkConfig.GetString("OutboundDisallowForUserScripts", configBlacklist);
+                configBlacklistExceptions 
+                    = networkConfig.GetString("OutboundDisallowForUserScriptsExcept", configBlacklistExceptions);
+            }
+
+            m_log.DebugFormat(
+                "[OUTBOUND URL FILTER]: OutboundDisallowForUserScripts for {0} is [{1}]", Name, configBlacklist);
+            m_log.DebugFormat(
+                "[OUTBOUND URL FILTER]: OutboundDisallowForUserScriptsExcept for {0} is [{1}]", Name, configBlacklistExceptions);
+
+            OutboundUrlFilter.ParseConfigList(
+                configBlacklist, Name, out m_blacklistNetworks, out m_blacklistEndPoints);
+            OutboundUrlFilter.ParseConfigList(
+                configBlacklistExceptions, Name, out m_blacklistExceptionNetworks, out m_blacklistExceptionEndPoints);
+        }
+
+        private static void ParseConfigList(
+            string fullConfigEntry, string filterName, out List<IPNetwork> networks, out List<IPEndPoint> endPoints)
+        {
+            // Parse blacklist
+            string[] configBlacklistEntries 
+                = fullConfigEntry.Split(new char[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
+
+            configBlacklistEntries = configBlacklistEntries.Select(e => e.Trim()).ToArray();
+
+            networks = new List<IPNetwork>();
+            endPoints = new List<IPEndPoint>();
+
+            foreach (string configEntry in configBlacklistEntries)
+            {
+                if (configEntry.Contains("/"))
+                {
+                    IPNetwork network;
+
+                    if (!IPNetwork.TryParse(configEntry, out network))
+                    {
+                        m_log.ErrorFormat(
+                            "[OUTBOUND URL FILTER]: Entry [{0}] is invalid network for {1}", configEntry, filterName);
+
+                        continue;
+                    }
+
+                    networks.Add(network);
+                }
+                else
+                {
+                    Uri configEntryUri;
+
+                    if (!Uri.TryCreate("http://" + configEntry, UriKind.Absolute, out configEntryUri))
+                    {
+                        m_log.ErrorFormat(
+                            "[OUTBOUND URL FILTER]: EndPoint entry [{0}] is invalid endpoint for {1}", 
+                            configEntry, filterName);
+
+                        continue;
+                    }
+
+                    IPAddress[] addresses = Dns.GetHostAddresses(configEntryUri.Host);
+
+                    foreach (IPAddress addr in addresses)
+                    {
+                        if (addr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+                        {
+                            //                        m_log.DebugFormat("[OUTBOUND URL FILTER]: Found address [{0}] in config", addr);
+
+                            IPEndPoint configEntryEp = new IPEndPoint(addr, configEntryUri.Port);
+                            endPoints.Add(configEntryEp);
+
+                            //                        m_log.DebugFormat("[OUTBOUND URL FILTER]: Added blacklist exception [{0}]", configEntryEp);
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines if an url is in a list of networks and endpoints.
+        /// </summary>
+        /// <returns></returns>
+        /// <param name="url">IP address</param>
+        /// <param name="port"></param>
+        /// <param name="networks">Networks.</param>
+        /// <param name="endPoints">End points.</param>
+        /// <param name="filterName">Filter name.</param>
+        private static bool IsInNetwork(
+            IPAddress addr, int port, List<IPNetwork> networks, List<IPEndPoint> endPoints, string filterName)
+        {
+            foreach (IPNetwork ipn in networks)
+            {
+//                                            m_log.DebugFormat(
+//                                                "[OUTBOUND URL FILTER]: Checking [{0}] against network [{1}]", addr, ipn);
+
+                if (IPNetwork.Contains(ipn, addr))
+                {
+//                                                    m_log.DebugFormat(
+//                                                        "[OUTBOUND URL FILTER]: Found [{0}] in network [{1}]", addr, ipn);
+
+                    return true;
+                }
+            }
+
+            //                    m_log.DebugFormat("[OUTBOUND URL FILTER]: Found address [{0}]", addr);
+
+            foreach (IPEndPoint ep in endPoints)
+            {
+//                m_log.DebugFormat(
+//                    "[OUTBOUND URL FILTER]: Checking [{0}:{1}] against endpoint [{2}]", 
+//                    addr, port, ep);
+
+                if (addr.Equals(ep.Address) && port == ep.Port)
+                {
+//                    m_log.DebugFormat(
+//                        "[OUTBOUND URL FILTER]: Found [{0}:{1}] in endpoint [{2}]", addr, port, ep);
+                                        
+                    return true;
+                }
+            }
+
+//            m_log.DebugFormat("[OUTBOUND URL FILTER]: Did not find [{0}:{1}] in list", addr, port);
+
+            return false;
+        }
+
+        /// <summary>
+        /// Checks whether the given url is allowed by the filter.
+        /// </summary>
+        /// <returns></returns>
+        public bool CheckAllowed(Uri url)
+        {
+            bool allowed = true;
+
+            // Check that we are permitted to make calls to this endpoint.
+            bool foundIpv4Address = false;
+
+            IPAddress[] addresses = Dns.GetHostAddresses(url.Host);
+
+            foreach (IPAddress addr in addresses)
+            {
+                if (addr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+                {
+//                    m_log.DebugFormat("[OUTBOUND URL FILTER]: Found address [{0}]", addr);
+
+                    foundIpv4Address = true;
+
+                    // Check blacklist
+                    if (OutboundUrlFilter.IsInNetwork(addr, url.Port, m_blacklistNetworks, m_blacklistEndPoints, Name))
+                    {
+//                        m_log.DebugFormat("[OUTBOUND URL FILTER]: Found [{0}] in blacklist for {1}", url, Name);
+
+                        // Check blacklist exceptions
+                        allowed 
+                            = OutboundUrlFilter.IsInNetwork(
+                                addr, url.Port, m_blacklistExceptionNetworks, m_blacklistExceptionEndPoints, Name);
+
+//                        if (allowed)
+//                            m_log.DebugFormat("[OUTBOUND URL FILTER]: Found [{0}] in whitelist for {1}", url, Name);
+                    }
+                }
+
+                // Found at least one address in a blacklist and not a blacklist exception
+                if (!allowed)
+                    return false;
+//                else
+//                    m_log.DebugFormat("[OUTBOUND URL FILTER]: URL [{0}] not in blacklist for {1}", url, Name);
+            }
+
+            // We do not know how to handle IPv6 securely yet.
+            if (!foundIpv4Address)
+                return false;
+
+//            m_log.DebugFormat("[OUTBOUND URL FILTER]: Allowing request [{0}]", url);
+
+            return allowed;
+        }
+    }
+}

OpenSim/Framework/Communications/RestClient.cs

@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Communications
     /// other threads to execute, while it waits for a response from the web-service. RestClient itself can be
     /// invoked by the caller in either synchronous mode or asynchronous modes.
     /// </remarks>
-    public class RestClient
+    public class RestClient : IDisposable
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -90,7 +90,7 @@ namespace OpenSim.Framework.Communications
         private byte[] _readbuf;
 
         /// <summary>
-        /// MemoryStream representing the resultiong resource
+        /// MemoryStream representing the resulting resource
         /// </summary>
         private Stream _resource;
 
@@ -148,6 +148,33 @@ namespace OpenSim.Framework.Communications
 
         #endregion constructors
 
+
+        #region Dispose
+
+        private bool disposed = false;
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this); 
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposed)
+                return;
+
+            if (disposing)
+            {
+                _resource.Dispose();
+            }
+
+            disposed = true;
+        }
+
+        #endregion Dispose
+
+
         /// <summary>
         /// Add a path element to the query, e.g. assets
         /// </summary>
@@ -320,43 +347,51 @@ namespace OpenSim.Framework.Communications
                 if (auth != null)
                     auth.AddAuthorization(_request.Headers);
 
+                int reqnum = WebUtil.RequestNumber++;
+                if (WebUtil.DebugLevel >= 3)
+                    m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} REST {1} to {2}", reqnum, _request.Method, _request.RequestUri);
+
 //                IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
+
                 try
                 {
-                    _response = (HttpWebResponse) _request.GetResponse();
+                    using (_response = (HttpWebResponse) _request.GetResponse())
+                    {
+                        using (Stream src = _response.GetResponseStream())
+                        {
+                            int length = src.Read(_readbuf, 0, BufferSize);
+                            while (length > 0)
+                            {
+                                _resource.Write(_readbuf, 0, length);
+                                length = src.Read(_readbuf, 0, BufferSize);
+                            }
+
+                            // TODO! Implement timeout, without killing the server
+                            // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
+                            //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
+
+                            //                _allDone.WaitOne();
+                        }
+                    }
                 }
                 catch (WebException e)
                 {
-                    HttpWebResponse errorResponse = e.Response as HttpWebResponse;
-                    if (null != errorResponse && HttpStatusCode.NotFound == errorResponse.StatusCode)
+                    using (HttpWebResponse errorResponse = e.Response as HttpWebResponse)
                     {
-                        // This is often benign. E.g., requesting a missing asset will return 404.
-                        m_log.DebugFormat("[REST CLIENT] Resource not found (404): {0}", _request.Address.ToString());
-                    }
-                    else
-                    {
-                        m_log.Error(string.Format("[REST CLIENT] Error fetching resource from server: {0} ", _request.Address.ToString()), e);
+                        if (null != errorResponse && HttpStatusCode.NotFound == errorResponse.StatusCode)
+                        {
+                            // This is often benign. E.g., requesting a missing asset will return 404.
+                            m_log.DebugFormat("[REST CLIENT] Resource not found (404): {0}", _request.Address.ToString());
+                        }
+                        else
+                        {
+                            m_log.Error(string.Format("[REST CLIENT] Error fetching resource from server: {0} ", _request.Address.ToString()), e);
+                        }
                     }
 
                     return null;
                 }
 
-                Stream src = _response.GetResponseStream();
-                int length = src.Read(_readbuf, 0, BufferSize);
-                while (length > 0)
-                {
-                    _resource.Write(_readbuf, 0, length);
-                    length = src.Read(_readbuf, 0, BufferSize);
-                }
-
-
-                // TODO! Implement timeout, without killing the server
-                // this line implements the timeout, if there is a timeout, the callback fires and the request becomes aborted
-                //ThreadPool.RegisterWaitForSingleObject(responseAsyncResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
-
-//                _allDone.WaitOne();
-                if (_response != null)
-                    _response.Close();
                 if (_asyncException != null)
                     throw _asyncException;
 
@@ -366,6 +401,9 @@ namespace OpenSim.Framework.Communications
                     _resource.Seek(0, SeekOrigin.Begin);
                 }
 
+                if (WebUtil.DebugLevel >= 5)
+                    WebUtil.LogResponseDetail(reqnum, _resource);
+
                 return _resource;
             }
         }
@@ -382,16 +420,18 @@ namespace OpenSim.Framework.Communications
             if (auth != null)
                 auth.AddAuthorization(_request.Headers);
 
-            m_log.InfoFormat("[REST]: Request Length {0}", _request.ContentLength);
-            m_log.InfoFormat("[REST]: Sending Web Request {0}", buildUri());
             src.Seek(0, SeekOrigin.Begin);
-            m_log.Info("[REST]: Seek is ok");
+
+            int reqnum = WebUtil.RequestNumber++;
+            if (WebUtil.DebugLevel >= 3)
+                m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} REST {1} to {2}", reqnum, _request.Method, _request.RequestUri);
+            if (WebUtil.DebugLevel >= 5)
+                WebUtil.LogOutgoingDetail(string.Format("SEND {0}: ", reqnum), src);
+
             Stream dst = _request.GetRequestStream();
-            m_log.Info("[REST]: GetRequestStream is ok");
 
             byte[] buf = new byte[1024];
             int length = src.Read(buf, 0, 1024);
-            m_log.Info("[REST]: First Read is ok");
             while (length > 0)
             {
                 dst.Write(buf, 0, length);
@@ -406,14 +446,29 @@ namespace OpenSim.Framework.Communications
             {
                 m_log.WarnFormat("[REST]: Request {0} {1} failed with status {2} and message {3}",
                                   RequestMethod, _request.RequestUri, e.Status, e.Message);
+                return null;
             }
             catch (Exception e)
             {
                 m_log.WarnFormat(
                     "[REST]: Request {0} {1} failed with exception {2} {3}",
                     RequestMethod, _request.RequestUri, e.Message, e.StackTrace);
+                return null;
             }
-        
+
+            if (WebUtil.DebugLevel >= 5)
+            {
+                using (Stream responseStream = _response.GetResponseStream())
+                {
+                    using (StreamReader reader = new StreamReader(responseStream))
+                    {
+                        string responseStr = reader.ReadToEnd();
+                        WebUtil.LogResponseDetail(reqnum, responseStr);
+                    }
+                }
+            }
+
+            _response.Close();
 
 //            IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
 
@@ -432,7 +487,7 @@ namespace OpenSim.Framework.Communications
             /// In case, we are invoked asynchroneously this object will keep track of the state
             /// </summary>
             AsyncResult<Stream> ar = new AsyncResult<Stream>(callback, state);
-            Util.FireAndForget(RequestHelper, ar);
+            Util.FireAndForget(RequestHelper, ar, "RestClient.BeginRequest");
             return ar;
         }
 
@@ -464,4 +519,4 @@ namespace OpenSim.Framework.Communications
 
         #endregion Async Invocation
     }
-}
+}

OpenSim/Framework/Console/CommandConsole.cs

@@ -424,9 +424,9 @@ namespace OpenSim.Framework.Console
             return new string[] { new List<string>(current.Keys)[0] };
         }
 
-        public string[] Resolve(string[] cmd)
+        private CommandInfo ResolveCommand(string[] cmd, out string[] result)
         {
-            string[] result = cmd;
+            result = cmd;
             int index = -1;
 
             Dictionary<string, object> current = tree;
@@ -458,7 +458,7 @@ namespace OpenSim.Framework.Console
                 }
                 else if (found.Count > 0)
                 {
-                    return new string[0];
+                    return null;
                 }
                 else
                 {
@@ -467,21 +467,37 @@ namespace OpenSim.Framework.Console
             }
 
             if (current.ContainsKey(String.Empty))
+                return (CommandInfo)current[String.Empty];
+
+            return null;
+        }
+                
+        public bool HasCommand(string command)
+        {
+            string[] result;
+            return ResolveCommand(Parser.Parse(command), out result) != null;
+        }
+
+        public string[] Resolve(string[] cmd)
+        {
+            string[] result;
+            CommandInfo ci = ResolveCommand(cmd, out result);
+
+            if (ci == null)
+                return new string[0];
+
+            if (ci.fn.Count == 0)
+                return new string[0];
+
+            foreach (CommandDelegate fn in ci.fn)
             {
-                CommandInfo ci = (CommandInfo)current[String.Empty];
-                if (ci.fn.Count == 0)
+                if (fn != null)
+                    fn(ci.module, result);
+                else
                     return new string[0];
-                foreach (CommandDelegate fn in ci.fn)
-                {
-                    if (fn != null)
-                        fn(ci.module, result);
-                    else
-                        return new string[0];
-                }
-                return result;
             }
-            
-            return new string[0];
+
+            return result;
         }
 
         public XmlElement GetXml(XmlDocument doc)

OpenSim/Framework/Console/ConsoleUtil.cs

@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Console
         }
 
         /// <summary>
-        /// Convert a console integer to an int, automatically complaining if a console is given.
+        /// Convert a console input to a bool, automatically complaining if a console is given.
         /// </summary>
         /// <param name='console'>Can be null if no console is available.</param>
         /// <param name='rawConsoleVector'>/param>
@@ -176,7 +176,7 @@ namespace OpenSim.Framework.Console
         }
 
         /// <summary>
-        /// Convert a console integer to an int, automatically complaining if a console is given.
+        /// Convert a console input to an int, automatically complaining if a console is given.
         /// </summary>
         /// <param name='console'>Can be null if no console is available.</param>
         /// <param name='rawConsoleInt'>/param>
@@ -195,6 +195,46 @@ namespace OpenSim.Framework.Console
             return true;
         }
 
+        /// <summary>
+        /// Convert a console input to a float, automatically complaining if a console is given.
+        /// </summary>
+        /// <param name='console'>Can be null if no console is available.</param>
+        /// <param name='rawConsoleInput'>/param>
+        /// <param name='i'></param>
+        /// <returns></returns>
+        public static bool TryParseConsoleFloat(ICommandConsole console, string rawConsoleInput, out float i)
+        {
+            if (!float.TryParse(rawConsoleInput, out i))
+            {
+                if (console != null)
+                    console.OutputFormat("ERROR: {0} is not a valid float", rawConsoleInput);
+
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Convert a console input to a double, automatically complaining if a console is given.
+        /// </summary>
+        /// <param name='console'>Can be null if no console is available.</param>
+        /// <param name='rawConsoleInput'>/param>
+        /// <param name='i'></param>
+        /// <returns></returns>
+        public static bool TryParseConsoleDouble(ICommandConsole console, string rawConsoleInput, out double i)
+        {
+            if (!double.TryParse(rawConsoleInput, out i))
+            {
+                if (console != null)
+                    console.OutputFormat("ERROR: {0} is not a valid double", rawConsoleInput);
+
+                return false;
+            }
+
+            return true;
+        }
+
         /// <summary>
         /// Convert a console integer to a natural int, automatically complaining if a console is given.
         /// </summary>

OpenSim/Framework/Console/LocalConsole.cs

@@ -32,6 +32,8 @@ using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using System.IO;
+using Nini.Config;
 using log4net;
 
 namespace OpenSim.Framework.Console
@@ -41,7 +43,9 @@ namespace OpenSim.Framework.Console
     /// </summary>
     public class LocalConsole : CommandConsole
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private string m_historyPath;
+        private bool m_historyEnable;
 
         // private readonly object m_syncRoot = new object();
         private const string LOGLEVEL_NONE = "(none)";
@@ -79,8 +83,54 @@ namespace OpenSim.Framework.Console
             return Colors[(Math.Abs(input.ToUpper().GetHashCode()) % Colors.Length)];
         }
 
-        public LocalConsole(string defaultPrompt) : base(defaultPrompt)
+        public LocalConsole(string defaultPrompt, IConfig startupConfig = null) : base(defaultPrompt)
         {
+
+            if (startupConfig == null) return;
+
+            m_historyEnable = startupConfig.GetBoolean("ConsoleHistoryFileEnabled", false);
+            if (!m_historyEnable)
+            {
+                m_log.Info("[LOCAL CONSOLE]: Persistent command line history from file is Disabled");
+                return;
+            }
+
+            string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", "OpenSimConsoleHistory.txt");
+            int m_historySize = startupConfig.GetInt("ConsoleHistoryFileLines", 100);
+            m_historyPath = Path.GetFullPath(Path.Combine(Util.configDir(), m_historyFile));
+            m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1}", m_historySize, m_historyPath);
+
+            if (File.Exists(m_historyPath))
+            {
+                using (StreamReader history_file = new StreamReader(m_historyPath))
+                {
+                    string line;
+                    while ((line = history_file.ReadLine()) != null)
+                    {
+                        m_history.Add(line);
+                    }
+                }
+
+                if (m_history.Count > m_historySize)
+                {
+                    while (m_history.Count > m_historySize)
+                        m_history.RemoveAt(0);
+
+                    using (StreamWriter history_file = new StreamWriter(m_historyPath))
+                    {
+                        foreach (string line in m_history)
+                        {
+                            history_file.WriteLine(line);
+                        }
+                    }
+                }
+                m_log.InfoFormat("[LOCAL CONSOLE]: Read {0} lines of command line history from file {1}", m_history.Count, m_historyPath);
+            }
+            else
+            {
+                m_log.InfoFormat("[LOCAL CONSOLE]: Creating new empty command line history file {0}", m_historyPath);
+                File.Create(m_historyPath).Dispose();
+            }
         }
 
         private void AddToHistory(string text)
@@ -89,6 +139,10 @@ namespace OpenSim.Framework.Console
                 m_history.RemoveAt(0);
 
             m_history.Add(text);
+            if (m_historyEnable)
+            {
+                File.AppendAllText(m_historyPath, text + Environment.NewLine);
+            }
         }
 
         /// <summary>

OpenSim/Framework/Console/MockConsole.cs

@@ -82,6 +82,7 @@ namespace OpenSim.Framework.Console
         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 bool HasCommand(string cmd) { return false; }
         public string[] Resolve(string[] cmd) { return null; }
         public XmlElement GetXml(XmlDocument doc) { return null; }
     }

OpenSim/Framework/ICommandConsole.cs

@@ -67,9 +67,16 @@ namespace OpenSim.Framework
                 string help, string longhelp, string descriptivehelp,
                 CommandDelegate fn);
 
-        string[] FindNextOption(string[] cmd, bool term);
+        /// <summary>
+        /// Has the given command already been registered?
+        /// </summary>
+        /// <returns></returns>
+        /// <param name="command">Command.</param>
+        bool HasCommand(string command);
 
-        string[] Resolve(string[] cmd);
+        string[] FindNextOption(string[] command, bool term);
+
+        string[] Resolve(string[] command);
 
         XmlElement GetXml(XmlDocument doc);
     }

OpenSim/Framework/IPeople.cs

@@ -38,6 +38,8 @@ namespace OpenSim.Framework
         public string LastName { get; set; }
         public string HomeURL { get; set; }
         public Dictionary<string, object> ServerURLs { get; set; }
+        public bool IsUnknownUser { get; set; }
+        public bool HasGridUserTried { get; set; }
     }
 
     public interface IPeople

OpenSim/Framework/ISceneAgent.cs

@@ -65,13 +65,18 @@ namespace OpenSim.Framework
         /// </remarks>
         AvatarAppearance Appearance { get; set; }
 
+        /// <summary>
+        /// Set if initial data about the scene (avatars, objects) has been sent to the client.
+        /// </summary>
+        bool SentInitialDataToClient { get; }
+
         /// <summary>
         /// Send initial scene data to the client controlling this agent
         /// </summary>
         /// <remarks>
         /// This includes scene object data and the appearance data of other avatars.
         /// </remarks>
-        void SendInitialDataToMe();
+        void SendInitialDataToClient();
 
         /// <summary>
         /// Direction in which the scene presence is looking.

OpenSim/Framework/ISceneObject.cs

@@ -32,6 +32,8 @@ namespace OpenSim.Framework
 {
     public interface ISceneObject
     {
+        string Name { get; }
+
         UUID UUID { get; }
 
         /// <summary>

OpenSim/Framework/Monitoring/JobEngine.cs

@@ -0,0 +1,341 @@
+/*
+ * 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.Concurrent;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenSim.Framework;
+
+namespace OpenSim.Framework.Monitoring
+{
+    public class JobEngine
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public int LogLevel { get; set; }
+
+        public string Name { get; private set; }
+
+        public string LoggingName { get; private set; }
+
+        /// <summary>
+        /// Is this engine running?
+        /// </summary>
+        public bool IsRunning { get; private set; } 
+
+        /// <summary>
+        /// The current job that the engine is running.
+        /// </summary>
+        /// <remarks>
+        /// Will be null if no job is currently running.
+        /// </remarks>
+        public Job CurrentJob { get; private set; }
+
+        /// <summary>
+        /// Number of jobs waiting to be processed.
+        /// </summary>
+        public int JobsWaiting { get { return m_jobQueue.Count; } }
+
+        /// <summary>
+        /// The timeout in milliseconds to wait for at least one event to be written when the recorder is stopping.
+        /// </summary>
+        public int RequestProcessTimeoutOnStop { get; set; }
+
+        /// <summary>
+        /// Controls whether we need to warn in the log about exceeding the max queue size.
+        /// </summary>
+        /// <remarks>
+        /// This is flipped to false once queue max has been exceeded and back to true when it falls below max, in 
+        /// order to avoid spamming the log with lots of warnings.
+        /// </remarks>
+        private bool m_warnOverMaxQueue = true;
+
+        private BlockingCollection<Job> m_jobQueue;
+
+        private CancellationTokenSource m_cancelSource;
+
+        /// <summary>
+        /// Used to signal that we are ready to complete stop.
+        /// </summary>
+        private ManualResetEvent m_finishedProcessingAfterStop = new ManualResetEvent(false);
+
+        public JobEngine(string name, string loggingName)
+        {
+            Name = name;
+            LoggingName = loggingName;
+
+            RequestProcessTimeoutOnStop = 5000;
+        }
+
+        public void Start()
+        {
+            lock (this)
+            {
+                if (IsRunning)
+                    return;
+
+                IsRunning = true;
+
+                m_finishedProcessingAfterStop.Reset();
+
+                m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
+                m_cancelSource = new CancellationTokenSource();
+
+                WorkManager.StartThread(
+                    ProcessRequests,
+                    Name,
+                    ThreadPriority.Normal,
+                    false,
+                    true,
+                    null,
+                    int.MaxValue);
+            }
+        }
+
+        public void Stop()
+        {   
+            lock (this)
+            {
+                try
+                {
+                    if (!IsRunning)
+                        return;
+
+                    IsRunning = false;
+
+                    int requestsLeft = m_jobQueue.Count;
+
+                    if (requestsLeft <= 0)
+                    {
+                        m_cancelSource.Cancel();
+                    }
+                    else 
+                    {
+                        m_log.InfoFormat("[{0}]: Waiting to write {1} events after stop.", LoggingName, requestsLeft);
+
+                        while (requestsLeft > 0)
+                        {
+                            if (!m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop))
+                            {
+                                // After timeout no events have been written
+                                if (requestsLeft == m_jobQueue.Count)
+                                {
+                                    m_log.WarnFormat(
+                                        "[{0}]: No requests processed after {1} ms wait.  Discarding remaining {2} requests", 
+                                        LoggingName, RequestProcessTimeoutOnStop, requestsLeft);
+
+                                    break;
+                                }
+                            }
+
+                            requestsLeft = m_jobQueue.Count;
+                        }
+                    }
+                }
+                finally
+                {
+                    m_cancelSource.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Make a job.
+        /// </summary>
+        /// <remarks>
+        /// We provide this method to replace the constructor so that we can later pool job objects if necessary to 
+        /// reduce memory churn.  Normally one would directly call QueueJob() with parameters anyway.
+        /// </remarks>
+        /// <returns></returns>
+        /// <param name="name">Name.</param>
+        /// <param name="action">Action.</param>
+        /// <param name="commonId">Common identifier.</param>
+        public static Job MakeJob(string name, Action action, string commonId = null)
+        {
+            return Job.MakeJob(name, action, commonId);
+        }
+
+        /// <summary>
+        /// Remove the next job queued for processing.
+        /// </summary>
+        /// <remarks>
+        /// Returns null if there is no next job.
+        /// Will not remove a job currently being performed.
+        /// </remarks>
+        public Job RemoveNextJob()
+        {
+            Job nextJob;
+            m_jobQueue.TryTake(out nextJob);
+
+            return nextJob;
+        }
+
+        /// <summary>
+        /// Queue the job for processing.
+        /// </summary>
+        /// <returns><c>true</c>, if job was queued, <c>false</c> otherwise.</returns>
+        /// <param name="name">Name of job.  This appears on the console and in logging.</param>
+        /// <param name="action">Action to perform.</param>
+        /// <param name="commonId">
+        /// Common identifier for a set of jobs.  This is allows a set of jobs to be removed
+        /// if required (e.g. all jobs for a given agent.  Optional.
+        /// </param>
+        public bool QueueJob(string name, Action action, string commonId = null)
+        {
+            return QueueJob(MakeJob(name, action, commonId));
+        }
+
+        /// <summary>
+        /// Queue the job for processing.
+        /// </summary>
+        /// <returns><c>true</c>, if job was queued, <c>false</c> otherwise.</returns>
+        /// <param name="job">The job</param>
+        /// </param>
+        public bool QueueJob(Job job)
+        {
+            if (m_jobQueue.Count < m_jobQueue.BoundedCapacity)
+            {
+                m_jobQueue.Add(job);
+
+                if (!m_warnOverMaxQueue)
+                    m_warnOverMaxQueue = true;
+
+                return true;
+            }
+            else
+            {
+                if (m_warnOverMaxQueue)
+                {
+                    m_log.WarnFormat(
+                        "[{0}]: Job queue at maximum capacity, not recording job from {1} in {2}",
+                        LoggingName, job.Name, Name);
+
+                    m_warnOverMaxQueue = false;
+                }
+
+                return false;
+            }
+        }
+
+        private void ProcessRequests()
+        {
+            try
+            {
+                while (IsRunning || m_jobQueue.Count > 0)
+                {
+                    try
+                    {
+                        CurrentJob = m_jobQueue.Take(m_cancelSource.Token);
+                    }
+                    catch (ObjectDisposedException e)
+                    {
+                        // If we see this whilst not running then it may be due to a race where this thread checks
+                        // IsRunning after the stopping thread sets it to false and disposes of the cancellation source.
+                        if (IsRunning)
+                            throw e;
+                        else
+                            break;
+                    }
+
+                    if (LogLevel >= 1)
+                        m_log.DebugFormat("[{0}]: Processing job {1}", LoggingName, CurrentJob.Name);
+
+                    try
+                    {
+                        CurrentJob.Action();
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(
+                            string.Format(
+                            "[{0}]: Job {1} failed, continuing.  Exception  ", LoggingName, CurrentJob.Name), e);
+                    }
+
+                    if (LogLevel >= 1)
+                        m_log.DebugFormat("[{0}]: Processed job {1}", LoggingName, CurrentJob.Name);
+
+                    CurrentJob = null;
+                }
+            }
+            catch (OperationCanceledException)
+            {
+            }
+
+            m_finishedProcessingAfterStop.Set();
+        }
+
+        public class Job
+        {
+            /// <summary>
+            /// Name of the job.
+            /// </summary>
+            /// <remarks>
+            /// This appears on console and debug output.
+            /// </remarks>
+            public string Name { get; private set; }
+
+            /// <summary>
+            /// Common ID for this job.
+            /// </summary>
+            /// <remarks>
+            /// This allows all jobs with a certain common ID (e.g. a client UUID) to be removed en-masse if required.
+            /// Can be null if this is not required.
+            /// </remarks>
+            public string CommonId { get; private set; }
+
+            /// <summary>
+            /// Action to perform when this job is processed.
+            /// </summary>
+            public Action Action { get; private set; }
+
+            private Job(string name, string commonId, Action action)
+            {
+                Name = name;
+                CommonId = commonId;
+                Action = action;
+            }
+                        
+            /// <summary>
+            /// Make a job.  It needs to be separately queued.
+            /// </summary>
+            /// <remarks>
+            /// We provide this method to replace the constructor so that we can pool job objects if necessary to
+            /// to reduce memory churn.  Normally one would directly call JobEngine.QueueJob() with parameters anyway.
+            /// </remarks>
+            /// <returns></returns>
+            /// <param name="name">Name.</param>
+            /// <param name="action">Action.</param>
+            /// <param name="commonId">Common identifier.</param>
+            public static Job MakeJob(string name, Action action, string commonId = null)
+            {
+                return new Job(name, commonId, action);
+            }
+        }
+    }
+}

OpenSim/Framework/Monitoring/ServerStatsCollector.cs

@@ -82,6 +82,9 @@ namespace OpenSim.Framework.Monitoring
         // IRegionModuleBase.Initialize
         public void Initialise(IConfigSource source)
         {
+            if (source == null)
+                return;
+
             IConfig cfg = source.Configs["Monitoring"];
 
             if (cfg != null)
@@ -141,19 +144,19 @@ namespace OpenSim.Framework.Monitoring
                 processorPercentPerfCounter = new PerfCounterControl(tempPC);
                 // A long time bug in mono is that CPU percent is reported as CPU percent idle. Windows reports CPU percent busy.
                 tempStat = new Stat(tempName, tempName, "", "percent", CategoryServer, ContainerProcessor,
-                                StatType.Pull, (s) => { GetNextValue(s, processorPercentPerfCounter, Util.IsWindows() ? 1 : -1); },
+                                StatType.Pull, (s) => { GetNextValue(s, processorPercentPerfCounter); },
                                 StatVerbosity.Info);
                 StatsManager.RegisterStat(tempStat);
                 RegisteredStats.Add(tempName, tempStat);
 
                 MakeStat("TotalProcessorTime", null, "sec", ContainerProcessor,
-                                    (s) => { s.Value = Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds; });
+                                    (s) => { s.Value = Math.Round(Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds, 3); });
 
                 MakeStat("UserProcessorTime", null, "sec", ContainerProcessor,
-                                    (s) => { s.Value = Process.GetCurrentProcess().UserProcessorTime.TotalSeconds; });
+                                    (s) => { s.Value = Math.Round(Process.GetCurrentProcess().UserProcessorTime.TotalSeconds, 3); });
 
                 MakeStat("PrivilegedProcessorTime", null, "sec", ContainerProcessor,
-                                    (s) => { s.Value = Process.GetCurrentProcess().PrivilegedProcessorTime.TotalSeconds; });
+                                    (s) => { s.Value = Math.Round(Process.GetCurrentProcess().PrivilegedProcessorTime.TotalSeconds, 3); });
 
                 MakeStat("Threads", null, "threads", ContainerProcessor,
                                     (s) => { s.Value = Process.GetCurrentProcess().Threads.Count; });
@@ -253,11 +256,8 @@ namespace OpenSim.Framework.Monitoring
         //  "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
         //  "Mono Performance Counters": http://www.mono-project.com/Mono_Performance_Counters
         private delegate double PerfCounterNextValue();
+
         private void GetNextValue(Stat stat, PerfCounterControl perfControl)
-        {
-            GetNextValue(stat, perfControl, 1.0);
-        }
-        private void GetNextValue(Stat stat, PerfCounterControl perfControl, double factor)
         {
             if (Util.EnvironmentTickCountSubtract(perfControl.lastFetch) > performanceCounterSampleInterval)
             {
@@ -265,16 +265,13 @@ namespace OpenSim.Framework.Monitoring
                 {
                     try
                     {
-                        // Kludge for factor to run double duty. If -1, subtract the value from one
-                        if (factor == -1)
-                            stat.Value = 1 - perfControl.perfCounter.NextValue();
-                        else
-                            stat.Value = perfControl.perfCounter.NextValue() / factor;
+                        stat.Value = Math.Round(perfControl.perfCounter.NextValue(), 3);
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat("{0} Exception on NextValue fetching {1}: {2}", LogHeader, stat.Name, e);
                     }
+
                     perfControl.lastFetch = Util.EnvironmentTickCount();
                 }
             }

OpenSim/Framework/Monitoring/Stats/Stat.cs

@@ -171,7 +171,8 @@ namespace OpenSim.Framework.Monitoring
             foreach (char c in DisallowedShortNameCharacters)
             {
                 if (shortName.IndexOf(c) != -1)
-                    throw new Exception(string.Format("Stat name {0} cannot contain character {1}", shortName, c));
+                    shortName = shortName.Replace(c, '#');
+//                    throw new Exception(string.Format("Stat name {0} cannot contain character {1}", shortName, c));
             }
 
             ShortName = shortName;

OpenSim/Framework/Monitoring/StatsLogger.cs

@@ -70,18 +70,18 @@ namespace OpenSim.Framework.Monitoring
         {
             ICommandConsole con = MainConsole.Instance;
 
-            if (cmd.Length != 4)
+            if (cmd.Length != 3)
             {
-                con.Output("Usage: debug stats record start|stop");
+                con.Output("Usage: stats record start|stop");
                 return;
             }
 
-            if (cmd[3] == "start")
+            if (cmd[2] == "start")
             {
                 Start();
                 con.OutputFormat("Now recording all stats to file every {0}ms", m_statsLogIntervalMs);
             }
-            else if (cmd[3] == "stop")
+            else if (cmd[2] == "stop")
             {
                 Stop();
                 con.Output("Stopped recording stats to file.");

OpenSim/Framework/Monitoring/StatsManager.cs

@@ -307,7 +307,7 @@ namespace OpenSim.Framework.Monitoring
 
             if (request.ContainsKey("cat")) pCategoryName = request["cat"].ToString();
             if (request.ContainsKey("cont")) pContainerName = request["cat"].ToString();
-            if (request.ContainsKey("stat")) pStatName = request["cat"].ToString();
+            if (request.ContainsKey("stat")) pStatName = request["stat"].ToString();
 
             string strOut = StatsManager.GetStatsAsOSDMap(pCategoryName, pContainerName, pStatName).ToString();
 

OpenSim/Framework/Monitoring/Watchdog.cs

@@ -38,6 +38,8 @@ namespace OpenSim.Framework.Monitoring
     /// </summary>
     public static class Watchdog
     {
+        private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>Timer interval in milliseconds for the watchdog timer</summary>
         public const double WATCHDOG_INTERVAL_MS = 2500.0d;
 
@@ -87,7 +89,7 @@ namespace OpenSim.Framework.Monitoring
             /// </summary>
             public Stat Stat { get; set; }
 
-            public ThreadWatchdogInfo(Thread thread, int timeout)
+            public ThreadWatchdogInfo(Thread thread, int timeout, string name)
             {
                 Thread = thread;
                 Timeout = timeout;
@@ -96,8 +98,8 @@ namespace OpenSim.Framework.Monitoring
 
                 Stat 
                     = new Stat(
-                        thread.Name,
-                        string.Format("Last update of thread {0}", thread.Name),
+                        name,
+                        string.Format("Last update of thread {0}", name),
                         "",
                         "ms",
                         "server",
@@ -141,7 +143,7 @@ namespace OpenSim.Framework.Monitoring
             get { return m_enabled; }
             set
             {
-//                m_log.DebugFormat("[MEMORY WATCHDOG]: Setting MemoryWatchdog.Enabled to {0}", value);
+                //                m_log.DebugFormat("[MEMORY WATCHDOG]: Setting MemoryWatchdog.Enabled to {0}", value);
 
                 if (value == m_enabled)
                     return;
@@ -157,9 +159,8 @@ namespace OpenSim.Framework.Monitoring
                 m_watchdogTimer.Enabled = m_enabled;
             }
         }
-        private static bool m_enabled;
 
-        private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static bool m_enabled;
         private static Dictionary<int, ThreadWatchdogInfo> m_threads;
         private static System.Timers.Timer m_watchdogTimer;
 
@@ -180,57 +181,19 @@ namespace OpenSim.Framework.Monitoring
         }
 
         /// <summary>
-        /// Start a new thread that is tracked by the watchdog timer.
+        /// Add a thread to the watchdog tracker.
         /// </summary>
-        /// <param name="start">The method that will be executed in a new thread</param>
-        /// <param name="name">A name to give to the new thread</param>
-        /// <param name="priority">Priority to run the thread at</param>
-        /// <param name="isBackground">True to run this thread as a background thread, otherwise false</param>
-        /// <param name="alarmIfTimeout">Trigger an alarm function is we have timed out</param>
-        /// <returns>The newly created Thread object</returns>
-        public static Thread StartThread(
-            ThreadStart start, string name, ThreadPriority priority, bool isBackground, bool alarmIfTimeout)
+        /// <param name="info">Information about the thread.</info>
+        /// <param name="info">Name of the thread.</info>
+        /// <param name="log">If true then creation of thread is logged.</param>
+        public static void AddThread(ThreadWatchdogInfo info, string name, bool log = true)
         {
-            return StartThread(start, name, priority, isBackground, alarmIfTimeout, null, DEFAULT_WATCHDOG_TIMEOUT_MS);
-        }
-
-        /// <summary>
-        /// Start a new thread that is tracked by the watchdog timer
-        /// </summary>
-        /// <param name="start">The method that will be executed in a new thread</param>
-        /// <param name="name">A name to give to the new thread</param>
-        /// <param name="priority">Priority to run the thread at</param>
-        /// <param name="isBackground">True to run this thread as a background
-        /// thread, otherwise false</param>
-        /// <param name="alarmIfTimeout">Trigger an alarm function is we have timed out</param>
-        /// <param name="alarmMethod">
-        /// Alarm method to call if alarmIfTimeout is true and there is a timeout.
-        /// Normally, this will just return some useful debugging information.
-        /// </param>
-        /// <param name="timeout">Number of milliseconds to wait until we issue a warning about timeout.</param>
-        /// <returns>The newly created Thread object</returns>
-        public static Thread StartThread(
-            ThreadStart start, string name, ThreadPriority priority, bool isBackground,
-            bool alarmIfTimeout, Func<string> alarmMethod, int timeout)
-        {
-            Thread thread = new Thread(start);
-            thread.Name = name;
-            thread.Priority = priority;
-            thread.IsBackground = isBackground;
-            
-            ThreadWatchdogInfo twi
-                = new ThreadWatchdogInfo(thread, timeout)
-                    { AlarmIfTimeout = alarmIfTimeout, AlarmMethod = alarmMethod };
-
-            m_log.DebugFormat(
-                "[WATCHDOG]: Started tracking thread {0}, ID {1}", twi.Thread.Name, twi.Thread.ManagedThreadId);
+            if (log)
+                m_log.DebugFormat(
+                    "[WATCHDOG]: Started tracking thread {0}, ID {1}", name, info.Thread.ManagedThreadId);
 
             lock (m_threads)
-                m_threads.Add(twi.Thread.ManagedThreadId, twi);
-
-            thread.Start();
-
-            return thread;
+                m_threads.Add(info.Thread.ManagedThreadId, info);
         }
 
         /// <summary>
@@ -244,24 +207,26 @@ namespace OpenSim.Framework.Monitoring
         /// <summary>
         /// Stops watchdog tracking on the current thread
         /// </summary>
+        /// <param name="log">If true then normal events in thread removal are not logged.</param>
         /// <returns>
         /// True if the thread was removed from the list of tracked
         /// threads, otherwise false
         /// </returns>
-        public static bool RemoveThread()
+        public static bool RemoveThread(bool log = true)
         {
-            return RemoveThread(Thread.CurrentThread.ManagedThreadId);
+            return RemoveThread(Thread.CurrentThread.ManagedThreadId, log);
         }
 
-        private static bool RemoveThread(int threadID)
+        private static bool RemoveThread(int threadID, bool log = true)
         {
             lock (m_threads)
             {
                 ThreadWatchdogInfo twi;
                 if (m_threads.TryGetValue(threadID, out twi))
                 {
-                    m_log.DebugFormat(
-                        "[WATCHDOG]: Removing thread {0}, ID {1}", twi.Thread.Name, twi.Thread.ManagedThreadId);
+                    if (log)
+                        m_log.DebugFormat(
+                            "[WATCHDOG]: Removing thread {0}, ID {1}", twi.Thread.Name, twi.Thread.ManagedThreadId);
 
                     twi.Cleanup();
                     m_threads.Remove(threadID);
@@ -319,7 +284,7 @@ namespace OpenSim.Framework.Monitoring
             }
             catch { }
         }
-        
+
         /// <summary>
         /// Get currently watched threads for diagnostic purposes
         /// </summary>