.gitignore

@@ -31,7 +31,6 @@
 */*/*/*/*/bin
 */*/*/*/*/*/bin
 */*/*/*/*/*/*/bin
-.vs/
 addon-modules/
 bin/Debug/*.dll
 bin/*.dll.mdb
@@ -94,6 +93,7 @@ TAGS
 Makefile.local
 bin/.version
 compile.bat
+addon-modules
 OpenSim/Data/Tests/test-results/
 OpenSim/Framework/Serialization/Tests/test-results/
 OpenSim/Framework/Servers/Tests/test-results/

.nant/local.include

@@ -113,12 +113,10 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 
 
-<!--
   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.optionalmodules.tests">
     <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" />
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> 
--->
 
   <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.framework.tests">
     <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
@@ -145,11 +143,6 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
 
-  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.permissions">
-    <arg value="./bin/OpenSim.Tests.Permissions.dll" />
-  </exec>
-  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
-  
   <delete dir="%temp%"/>
 </target>
 
@@ -233,12 +226,10 @@
     <arg value="-xml=test-results/OpenSim.Region.CoreModules.Tests.dll-Results.xml" />
   </exec>
 
-<!--
  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.optionalmodules.tests">
     <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" />
     <arg value="-xml=test-results/OpenSim.Region.OptionalModules.Tests.dll-Results.xml" />
   </exec>
--->
 
  <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.framework.tests">
     <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
@@ -265,23 +256,17 @@
     <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" />
   </exec>
 
- <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests.permissions">
-    <arg value="./bin/OpenSim.Tests.Permissions.dll" />
-    <arg value="-xml=test-results/OpenSim.Tests.Permissions.dll-Results.xml" />
-  </exec>
-  
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" />
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 
-<!--  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> -->
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.optionalmodules.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
- <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
 </target>
 
 <target name="doxygen">

BUILDING.md

@@ -1,35 +1,38 @@
 # Building on Windows
 
 Steps:
-
  * runprebuild.bat
  * Load OpenSim.sln into Visual Studio .NET and build the solution.
  * chdir bin 
  * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include
  * run OpenSim.exe
 
-# Building on Linux / Mac
+# Building on Linux
 
 Prereqs:
-
- *	Mono > 5.0
+*	Mono >= 2.4.3
+*	Nant >= 0.85
 *	On some Linux distributions you may need to install additional packages.
- *	msbuild or xbuild if still supported by the mono version
- *   See http://opensimulator.org/wiki/Dependencies for more information.
+	See http://opensimulator.org/wiki/Dependencies for more information.
+*	May also use xbuild (included in mono distributions)
+*	May use Monodevelop, a cross-platform IDE
 
 From the distribution type:
-
  * ./runprebuild.sh
- * type msbuild or xbuild
+ * nant (or !* xbuild)
  * cd bin 
  * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include
- * review and change those ini files according to your needs
- * windows: execute opensim.exe or opensim32.exe for small regions
- * linux: run ./opensim.sh
- * msbuild (xbuild) option switches
-   *  clean:  msbuild /target:clean
-   *  debug: (default) msbuild /property:Configuration=Debug
-   *  release: msbuild /property:Configuration=Release
+ * run mono OpenSim.exe
+ !* xbuild option switches
+ !*          clean:  xbuild /target:clean
+ !*          debug: (default) xbuild /property:Configuration=Debug
+ !*          release: xbuild /property:Configuration=Release
+
+# Using Monodevelop
+
+From the distribution type:
+ * ./runprebuild.sh
+ * type monodevelop OpenSim.sln
 
 # References
  

CONTRIBUTORS.txt

@@ -4,9 +4,14 @@ The following people have contributed to OpenSim (Thank you for your effort!)
 These folks represent the current core team for OpenSim, and are the
 people that make the day to day of OpenSim happen.
 
+* justincc (OSVW Consulting, justincc.org) 
 * Melanie Thielker
 * Diva (Crista Lopes, University of California, Irvine)
+* BlueWall (James Hughes)
+* Nebadon Izumi (Michael Cerquoni, OSgrid)
+* Snoopy Pfeffer
 * Robert Adams (MisterBlue)
+* Oren Hurvitz (Kitely)
 * Kevin Cozens
 * Leal Duarte (Ubit Umarov)
 
@@ -15,8 +20,11 @@ Core developers who have temporarily (we hope) gone chasing the white rabbit.
 They are in all similar to the active core developers, except that they haven't
 been that active lately, so their voting rights are awaiting their come back. 
 
-* Nebadon Izumi (Michael Cerquoni, OSgrid)
-* Alicia Raven
+* Teravus (w3z)
+* Arthur Rodrigo S Valadares (IBM)
+* Dan Lake 
+* Marck
+* Mic Bowman
 
 = Past Open Sim Developers =
 These folks are alumns of the OpenSim core group, but are now
@@ -49,15 +57,7 @@ where we are today.
 * John Hurliman
 * chi11ken (Genkii)
 * dahlia
-* justincc (OSVW Consulting, justincc.org)
-* Arthur Rodrigo S Valadares (IBM)
-* BlueWall (James Hughes)
-* Dan Lake 
-* Marck
-* Mic Bowman
-* Oren Hurvitz (Kitely)
-* Snoopy Pfeffer
-* Teravus (w3z)
+
 
 = Additional OpenSim Contributors =
 These folks have contributed code patches or content to OpenSimulator to help make it
@@ -69,9 +69,9 @@ what it is today.
 * alex_carnell
 * Alan Webb (IBM)
 * Aleric
+* Alicia Raven
 * Allen Kerensky
 * BigFootAg
-* Bill Blight
 * BlueWall Slade
 * bobshaffer2
 * brianw/Sir_Ahzz
@@ -89,7 +89,6 @@ what it is today.
 * dmiles (Daxtron Labs)
 * Dong Jun Lan (IBM)
 * DoranZemlja
-* Drake Arconis
 * dr0b3rts
 * dslake
 * eeyore
@@ -108,7 +107,6 @@ what it is today.
 * Flyte Xevious
 * Freaky Tech
 * Garmin Kawaguichi
-* Geir Noklebye
 * Glenn Martin (MOSES)
 * Gryc Ueusp
 * H-H-H (ginge264)
@@ -117,7 +115,6 @@ what it is today.
 * Imaze Rhiano
 * Intimidated
 * Jak Daniels
-* Jeff Kelly
 * Jeremy Bongio (IBM)
 * jhurliman
 * John R Sohn (XenReborn)
@@ -131,7 +128,6 @@ what it is today.
 * KittyLiu
 * Kurt Taylor (IBM)
 * Lani Global
-* lickx
 * lillith_xue
 * lkalif
 * LuciusSirnah
@@ -140,10 +136,8 @@ what it is today.
 * Magnuz Binder
 * maimedleech
 * Mana Janus
-* Mandarinka Tasty
 * MarcelEdward
 * Matt Lehmann
-* mewtwo0641
 * Mic Bowman
 * Michelle Argus
 * Michael Cortez (The Flotsam Project, http://osflotsam.org/)
@@ -151,7 +145,6 @@ what it is today.
 * Micheil Merlin
 * Mike Osias (IBM)
 * Mike Pitman (IBM)
-* Mike Rieker (Dreamnation)
 * mikemig
 * mikkopa/_someone - RealXtend
 * Misterblue
@@ -165,7 +158,6 @@ what it is today.
 * openlifegrid.com
 * otakup0pe
 * Pixel Tomsen
-* Quill Littlefeather
 * ralphos
 * RemedyTomm
 * Revolution
@@ -185,20 +177,14 @@ what it is today.
 * SpotOn3D
 * Stefan_Boom / stoehr
 * Steven Zielinski (MOSES)
-* Stolen Ruby 
 * Strawberry Fride
 * Talun
 * TechplexEngineer (Blake Bourque)
 * TBG Renfold
-* Terry Ford
 * tglion
 * tlaukkan/Tommil (Tommi S. E. Laukkanen, Bubble Cloud)
-* TomDataWorks
-* TomTheDragon (muckwaddle)
 * tyre
-* uriesk
 * Vegaslon <vegaslon@gmail.com>
-* Vincent Sylvester
 * VikingErik
 * Vytek
 * webmage (IBM)

OpenSim/Addons/Groups/GroupsMessagingModule.cs

@@ -252,7 +252,7 @@ namespace OpenSim.Groups
 
             m_debugEnabled = verbose;
 
-            MainConsole.Instance.Output("{0} verbose logging set to {1}", Name, m_debugEnabled);
+            MainConsole.Instance.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled);
         }
 
         /// <summary>
@@ -599,16 +599,13 @@ namespace OpenSim.Groups
                 {
                     if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Sending chatterbox invite instant message");
 
-                    UUID fromAgent = new UUID(msg.fromAgentID);
                     // Force? open the group session dialog???
                     // and simultanously deliver the message, so we don't need to do a seperate client.SendInstantMessage(msg);
                     IEventQueue eq = activeClient.Scene.RequestModuleInterface<IEventQueue>();
-                    if (eq != null)
-                    {
                     eq.ChatterboxInvitation(
                         GroupID
                         , groupInfo.GroupName
-                            , fromAgent
+                        , new UUID(msg.fromAgentID)
                         , msg.message
                         , AgentID
                         , msg.fromAgentName
@@ -623,10 +620,14 @@ namespace OpenSim.Groups
                         , OpenMetaverse.Utils.StringToBytes(groupInfo.GroupName)
                         );
 
-                        var update = new GroupChatListAgentUpdateData(AgentID);
-                        var updates = new List<GroupChatListAgentUpdateData> { update };
-                        eq.ChatterBoxSessionAgentListUpdates(GroupID, new UUID(msg.toAgentID), updates);
-                    }
+                    eq.ChatterBoxSessionAgentListUpdates(
+                        new UUID(GroupID)
+                        , AgentID
+                        , new UUID(msg.toAgentID)
+                        , false //canVoiceChat
+                        , false //isModerator
+                        , false //text mute
+                        );
                 }
             }
         }
@@ -661,12 +662,14 @@ namespace OpenSim.Groups
                     ChatterBoxSessionStartReplyViaCaps(remoteClient, groupInfo.GroupName, GroupID);
 
                     IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
-                    if (queue != null)
-                    {
-                        var update = new GroupChatListAgentUpdateData(AgentID);
-                        var updates = new List<GroupChatListAgentUpdateData> { update };
-                        queue.ChatterBoxSessionAgentListUpdates(GroupID, remoteClient.AgentId, updates);
-                    }
+                    queue.ChatterBoxSessionAgentListUpdates(
+                        GroupID
+                        , AgentID
+                        , new UUID(im.toAgentID)
+                        , false //canVoiceChat
+                        , false //isModerator
+                        , false //text mute
+                        );
                 }
             }
 
@@ -708,7 +711,11 @@ namespace OpenSim.Groups
             bodyMap.Add("session_info", sessionMap);
 
             IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
-            queue?.Enqueue(queue.BuildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId);
+
+            if (queue != null)
+            {
+                queue.Enqueue(queue.BuildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId);
+            }
         }
 
         private void DebugGridInstantMessage(GridInstantMessage im)

OpenSim/Addons/Groups/GroupsModule.cs

@@ -38,7 +38,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
-using PermissionMask = OpenSim.Framework.PermissionMask;
+using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags;
 
 namespace OpenSim.Groups
 {
@@ -127,7 +127,7 @@ namespace OpenSim.Groups
 
             m_debugEnabled = verbose;
 
-            MainConsole.Instance.Output("{0} verbose logging set to {1}", Name, m_debugEnabled);
+            MainConsole.Instance.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled);
         }
 
         public void RegionLoaded(Scene scene)
@@ -179,7 +179,9 @@ namespace OpenSim.Groups
             scene.EventManager.OnMakeRootAgent += OnMakeRoot;
             scene.EventManager.OnMakeChildAgent += OnMakeChild;
             scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
-            scene.EventManager.OnClientClosed += OnClientClosed;
+            // The InstantMessageModule itself doesn't do this, 
+            // so lets see if things explode if we don't do it
+            // scene.EventManager.OnClientClosed += OnClientClosed;
 
         }
 
@@ -194,7 +196,6 @@ namespace OpenSim.Groups
             scene.EventManager.OnMakeRootAgent -= OnMakeRoot;
             scene.EventManager.OnMakeChildAgent -= OnMakeChild;
             scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
-            scene.EventManager.OnClientClosed -= OnClientClosed;
 
             lock (m_sceneList)
             {
@@ -233,7 +234,7 @@ namespace OpenSim.Groups
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest;
-            //client.OnRequestAvatarProperties += OnRequestAvatarProperties;
+            client.OnRequestAvatarProperties += OnRequestAvatarProperties;
         }
 
 
@@ -245,12 +246,9 @@ namespace OpenSim.Groups
             // Used for Notices and Group Invites/Accept/Reject
             sp.ControllingClient.OnInstantMessage += OnInstantMessage;
 
-            // Send out group data update for compatibility.
-            // There might be some problem with the thread we're generating this on but not
-            //   doing the update at this time causes problems (Mantis #7920 and #7915)
-            // TODO: move sending this update to a later time in the rootification of the client.
-            if(!sp.m_haveGroupInformation)
-                SendAgentGroupDataUpdate(sp.ControllingClient, false);
+            // we should send a DataUpdate here for compatibility,
+            // but this is a bad place and a bad thread to do it
+            // also current viewers do ignore it and ask later on a much nicer thread 
         }
 
         private void OnMakeChild(ScenePresence sp)
@@ -261,7 +259,7 @@ namespace OpenSim.Groups
             // Used for Notices and Group Invites/Accept/Reject
             sp.ControllingClient.OnInstantMessage -= OnInstantMessage;
         }
-        /*
+
         private void OnRequestAvatarProperties(IClientAPI remoteClient, UUID avatarID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
@@ -269,7 +267,7 @@ namespace OpenSim.Groups
             GroupMembershipData[] avatarGroups = GetProfileListedGroupMemberships(remoteClient, avatarID);
             remoteClient.SendAvatarGroupsReply(avatarID, avatarGroups);
         }
-        */
+
         private void OnClientClosed(UUID AgentId, Scene scene)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
@@ -281,7 +279,7 @@ namespace OpenSim.Groups
             if (client != null)
             {
                 client.OnAgentDataUpdateRequest -= OnAgentDataUpdateRequest;
-                //client.OnRequestAvatarProperties -= OnRequestAvatarProperties;
+                client.OnRequestAvatarProperties -= OnRequestAvatarProperties;
                 // make child possible not called?
                 client.OnUUIDGroupNameRequest -= HandleUUIDGroupNameRequest;
                 client.OnInstantMessage -= OnInstantMessage;
@@ -317,8 +315,6 @@ namespace OpenSim.Groups
                 return;
 
             SendAgentGroupDataUpdate(remoteClient, false);
-
-            // also current viewers do ignore it and ask later on a much nicer thread
             // its a info request not a change, so nothing is sent to others
             // they do get the group title with the avatar object update on arrivel to a region
         }
@@ -344,24 +340,14 @@ namespace OpenSim.Groups
 
         private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im)
         {
-            if (m_debugEnabled)
-                m_log.DebugFormat("[Groups]: OnInstantMessage called");
-
-            if(remoteClient == null || !remoteClient.IsActive || remoteClient.AgentId == UUID.Zero)
-                return;
-
-            Scene scene = (Scene)remoteClient.Scene;
-            if (scene == null)
-                return;
-
-            string remoteAgentIDstr = remoteClient.AgentId.ToString();
+            if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
             //m_log.DebugFormat("[Groups]: IM From {0} to {1} msg {2} type {3}", im.fromAgentID, im.toAgentID, im.message, (InstantMessageDialog)im.dialog);
             // Group invitations
             if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline))
             {
                 UUID inviteID = new UUID(im.imSessionID);
-                GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(remoteAgentIDstr, inviteID);
+                GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(GetRequestingAgentIDStr(remoteClient), inviteID);
 
                 if (inviteInfo == null)
                 {
@@ -384,7 +370,7 @@ namespace OpenSim.Groups
 
                         // and the sessionid is the role
                         string reason = string.Empty;
-                        if (!m_groupData.AddAgentToGroup(remoteAgentIDstr, invitee.ToString(), inviteInfo.GroupID, inviteInfo.RoleID, string.Empty, out reason))
+                        if (!m_groupData.AddAgentToGroup(GetRequestingAgentIDStr(remoteClient), invitee.ToString(), inviteInfo.GroupID, inviteInfo.RoleID, string.Empty, out reason))
                             remoteClient.SendAgentAlertMessage("Unable to add you to the group: " + reason, false);
                         else
                         {
@@ -404,162 +390,111 @@ namespace OpenSim.Groups
                             msg.binaryBucket = new byte[0];
 
                             OutgoingInstantMessage(msg, invitee);
-                            IClientAPI inviteeClient = GetActiveRootClient(invitee);
-                            if(inviteeClient !=null)
-                            {
-                                SendAgentGroupDataUpdate(inviteeClient,true);
-                            }
+
+                            IClientAPI client = GetActiveClient(invitee);
+                            if (client != null)
+                                SendDataUpdate(remoteClient, true);
                         }
 
-                        m_groupData.RemoveAgentToGroupInvite(remoteAgentIDstr, inviteID);
+                        m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentIDStr(remoteClient), inviteID);
                     }
 
                     // Reject
                     if (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)
                     {
-                        if (m_debugEnabled)
-                            m_log.DebugFormat("[Groups]: Received a reject invite notice.");
+                        if (m_debugEnabled) m_log.DebugFormat("[Groups]: Received a reject invite notice.");
+                        m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentIDStr(remoteClient), inviteID);
 
-                        m_groupData.RemoveAgentToGroupInvite(remoteAgentIDstr, inviteID);
-                        m_groupData.RemoveAgentFromGroup(remoteAgentIDstr, inviteInfo.AgentID, inviteInfo.GroupID);
+                        m_groupData.RemoveAgentFromGroup(GetRequestingAgentIDStr(remoteClient), inviteInfo.AgentID, inviteInfo.GroupID);
                     }
                 }
             }
 
             // Group notices
-            else if ((im.dialog == (byte)InstantMessageDialog.GroupNotice))
+            if ((im.dialog == (byte)InstantMessageDialog.GroupNotice))
             {
                 if (!m_groupNoticesEnabled)
+                {
                     return;
+                }
 
                 UUID GroupID = new UUID(im.toAgentID);
-                GroupMembershipData grpMemberData = m_groupData.GetAgentGroupMembership(remoteAgentIDstr, remoteAgentIDstr, GroupID);
-                if (grpMemberData == null)
+                if (m_groupData.GetGroupRecord(GetRequestingAgentIDStr(remoteClient), GroupID, null) != null)
                 {
-                    remoteClient.SendAgentAlertMessage("Group membership not found", false);
-                    return;
-                }
-
-                if ((grpMemberData.GroupPowers & (ulong)GroupPowers.SendNotices) == 0)
-                {
-                    remoteClient.SendAgentAlertMessage("No permission to send notice to group", false);
-                    return;
-                }
-
-                int index = im.message.IndexOf('|');
-                if (index < 0)
-                    return;
-
-                string Subject = im.message.Substring(0, index);
-                string Message = im.message.Substring(index + 1);
-
                     UUID NoticeID = UUID.Random();
+                    string Subject = im.message.Substring(0, im.message.IndexOf('|'));
+                    string Message = im.message.Substring(Subject.Length + 1);
 
                     InventoryItemBase item = null;
                     bool hasAttachment = false;
 
                     if (im.binaryBucket.Length >= 1 && im.binaryBucket[0] > 0)
                     {
-                    UUID itemID = UUID.Zero;
-                    UUID ownerID = UUID.Zero;
-                    try
-                    {
-                        string binBucket = Utils.BytesToString(im.binaryBucket);
-                        binBucket = binBucket.Substring(15); // remove extra LLSD pre header
-
-                        OSDMap binBucketMAP = (OSDMap)OSDParser.DeserializeLLSDXml(binBucket);
-                        itemID = binBucketMAP["item_id"].AsUUID();
-                        ownerID = binBucketMAP["owner_id"].AsUUID();
-                    }
-                    catch
-                    {
-                        m_log.DebugFormat("[GROUPS]: failed to decode group notice bucket");
-                        return;
-                    }
-
-                    if (itemID != UUID.Zero && ownerID != UUID.Zero)
-                    {
-                        item = scene.InventoryService.GetItem(ownerID, itemID);
-                        if(item != null)
-                        {
-                            if ((item.CurrentPermissions & (uint)(PermissionMask.Transfer | PermissionMask.Copy)) !=
-                                    (uint)(PermissionMask.Transfer | PermissionMask.Copy))
-                            {
-                                remoteClient.SendAgentAlertMessage("Item must be have Copy and Transfer rights to attach to group notice", false);
-                                return;
-                            }
-                        }
                         hasAttachment = true;
+                        string binBucket = OpenMetaverse.Utils.BytesToString(im.binaryBucket);
+                        binBucket = binBucket.Remove(0, 14).Trim();
+
+                        OSD binBucketOSD = OSDParser.DeserializeLLSDXml(binBucket);
+                        if (binBucketOSD is OSDMap)
+                        {
+                            OSDMap binBucketMap = (OSDMap)binBucketOSD;
+
+                            UUID itemID = binBucketMap["item_id"].AsUUID();
+                            UUID ownerID = binBucketMap["owner_id"].AsUUID();
+                            item = new InventoryItemBase(itemID, ownerID);
+                            item = m_sceneList[0].InventoryService.GetItem(item);
                         }
+                        else
+                            m_log.DebugFormat("[Groups]: Received OSD with unexpected type: {0}", binBucketOSD.GetType());
                     }
 
-                if (m_groupData.AddGroupNotice(remoteAgentIDstr, GroupID, NoticeID, im.fromAgentName, Subject, Message,
+                    if (m_groupData.AddGroupNotice(GetRequestingAgentIDStr(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message,
                         hasAttachment, 
                         (byte)(item == null ? 0 : item.AssetType),
                         item == null ? null : item.Name, 
                         item == null ? UUID.Zero : item.ID,
                         item == null ? UUID.Zero.ToString() : item.Owner.ToString()))
                     {
-                    OnNewGroupNotice?.Invoke(GroupID, NoticeID);
+                        if (OnNewGroupNotice != null)
+                        {
+                            OnNewGroupNotice(GroupID, NoticeID);
+                        }
                        
                         // Send notice out to everyone that wants notices
-                    foreach (GroupMembersData member in m_groupData.GetGroupMembers(remoteAgentIDstr, GroupID))
+                        foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentIDStr(remoteClient), GroupID))
                         {
-                        GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)InstantMessageDialog.GroupNotice);
                             if (member.AcceptNotices)
                             {
                                 // Build notice IIM, one of reach, because the sending may be async
+                                GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice);
                                 msg.toAgentID = member.AgentID.Guid;
                                 OutgoingInstantMessage(msg, member.AgentID);
                             }
                         }
                     }
                 }
+            }
 
             if (im.dialog == (byte)InstantMessageDialog.GroupNoticeInventoryAccepted)
             {
-                if (!m_groupNoticesEnabled)
+                if (im.binaryBucket.Length < 16) // Invalid
                     return;
 
+                //// 16 bytes are the UUID. Maybe.
+//                UUID folderID = new UUID(im.binaryBucket, 0);
                 UUID noticeID = new UUID(im.imSessionID);
 
-                if (m_debugEnabled)
-                    m_log.DebugFormat("[xmlGROUPS]: Accepted notice {0} for {1}", noticeID, remoteClient.AgentId);
-
-                if (noticeID == UUID.Zero)
-                    return;
-
-                UUID folderID = UUID.Zero;
-                try
+                GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteClient.AgentId.ToString(), noticeID);
+                if (notice != null)
                 {
-                    if (im.binaryBucket != null && im.binaryBucket.Length >= 16)
-                        folderID = new UUID(im.binaryBucket, 0);
-                }
-                catch
-                {
-                    m_log.DebugFormat("[xmlGROUPS]: GroupNoticeInventoryAccepted failed to decode target folder");
-                    return;
-                }
-
-                GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteAgentIDstr, noticeID);
-                if (notice == null)
-                {
-                    if (m_debugEnabled)
-                        m_log.DebugFormat(
-                            "[GROUPS]: Could not find notice {0} for {1} on GroupNoticeInventoryAccepted.",
-                            noticeID, remoteClient.AgentId);
-                    return;
-                }
-
-                string tmp;
                     UUID giver = new UUID(im.toAgentID);
+                    string tmp = string.Empty;
                     Util.ParseUniversalUserIdentifier(notice.noticeData.AttachmentOwnerID, out giver, out tmp, out tmp, out tmp, out tmp);
 
                     m_log.DebugFormat("[Groups]: Giving inventory from {0} to {1}", giver, remoteClient.AgentId);
-
-                string message = "Could not find group notice attached item";
-                InventoryItemBase itemCopy = scene.GiveInventoryItem(remoteClient.AgentId,
-                    giver, notice.noticeData.AttachmentItemID, folderID, out message);
+                    string message;
+                    InventoryItemBase itemCopy = ((Scene)(remoteClient.Scene)).GiveInventoryItem(remoteClient.AgentId, 
+                        giver, notice.noticeData.AttachmentItemID, out message);
 
                     if (itemCopy == null)
                     {
@@ -569,79 +504,14 @@ namespace OpenSim.Groups
 
                     remoteClient.SendInventoryItemCreateUpdate(itemCopy, 0);
                 }
-
-            else if (im.dialog == (byte)InstantMessageDialog.GroupNoticeInventoryDeclined)
-            {
-                if (!m_groupNoticesEnabled)
-                    return;
-
-                UUID noticeID = new UUID(im.imSessionID);
-
-                if (m_debugEnabled)
-                    m_log.DebugFormat("[GROUPS]: Accepted notice {0} for {1}", noticeID, remoteAgentIDstr);
-
-                if (noticeID == UUID.Zero)
-                    return;
-
-                UUID remoteAgentID = remoteClient.AgentId;
-
-                GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteAgentIDstr, noticeID);
-                if (notice == null)
-                {
-                    if (m_debugEnabled)
-                        m_log.DebugFormat(
-                            "[GROUPS]: Could not find notice {0} for {1} on GroupNoticeInventoryAccepted.",
-                            noticeID, remoteClient.AgentId);
-                    return;
             }
-                string giver = notice.noticeData.AttachmentOwnerID;
-                UUID attachmentUUID = notice.noticeData.AttachmentItemID;
-
-                if (attachmentUUID == null ||
-                        attachmentUUID == UUID.Zero ||
-                        giver == null ||
-                        giver == UUID.Zero.ToString()
-                        )
-                    return;
-
-                if (m_debugEnabled)
-                    m_log.DebugFormat("[xmlGroups]: Deny inventory from {0} to {1}", giver, remoteAgentIDstr);
-
-                string message = String.Empty;
-
-                InventoryItemBase itemCopy = scene.InventoryService.GetItem(remoteAgentID, attachmentUUID);
-                if (itemCopy == null)
-                    return;
-
-                InventoryFolderBase trash = scene.InventoryService.GetFolderForType(remoteAgentID, FolderType.Trash);
-                if (trash == null)
-                {
-                    m_log.DebugFormat("[GROUPS]: failed to find trash folder for {0} ", remoteAgentID);
-                    return;
-                }
-
-                if (itemCopy.Folder == trash.ID || remoteAgentIDstr == notice.noticeData.AttachmentOwnerID)
-                    return;
-
-                itemCopy.Folder = trash.ID;
-                scene.InventoryService.MoveItems(itemCopy.Owner, new List<InventoryItemBase>() { itemCopy });
-
-                if (itemCopy == null)
-                {
-                    remoteClient.SendAgentAlertMessage(message, false);
-                    return;
-                }
-
-                remoteClient.SendInventoryItemCreateUpdate(itemCopy, 0);
-            }
-
           
             // Interop, received special 210 code for ejecting a group member
             // this only works within the comms servers domain, and won't work hypergrid
             // TODO:FIXME: Use a presense server of some kind to find out where the 
             // client actually is, and try contacting that region directly to notify them,
             // or provide the notification via xmlrpc update queue
-            else if ((im.dialog == 210))
+            if ((im.dialog == 210))
             {
                 // This is sent from the region that the ejectee was ejected from
                 // if it's being delivered here, then the ejectee is here
@@ -649,16 +519,14 @@ namespace OpenSim.Groups
 
                 UUID ejecteeID = new UUID(im.toAgentID);
 
-                im.imSessionID = UUID.Zero.Guid;
                 im.dialog = (byte)InstantMessageDialog.MessageFromAgent;
                 OutgoingInstantMessage(im, ejecteeID);
 
-                IClientAPI ejectee = GetActiveRootClient(ejecteeID);
+                IClientAPI ejectee = GetActiveClient(ejecteeID);
                 if (ejectee != null)
                 {
                     UUID groupID = new UUID(im.imSessionID);
                     ejectee.SendAgentDropGroup(groupID);
-                    SendAgentGroupDataUpdate(ejectee,true);
                 }
             }
         }
@@ -678,7 +546,7 @@ namespace OpenSim.Groups
                     case (byte)InstantMessageDialog.GroupInvitation:
                     case (byte)InstantMessageDialog.GroupNotice:
                         UUID toAgentID = new UUID(msg.toAgentID);
-                        IClientAPI localClient = GetActiveRootClient(toAgentID);
+                        IClientAPI localClient = GetActiveClient(toAgentID);
                         if (localClient != null)
                         {
                             localClient.SendInstantMessage(msg);
@@ -710,10 +578,6 @@ namespace OpenSim.Groups
 
             m_groupData.SetAgentActiveGroup(GetRequestingAgentIDStr(remoteClient), GetRequestingAgentIDStr(remoteClient), groupID);
 
-            // Changing active group changes title, active powers, all kinds of things
-            // anyone who is in any region that can see this client, should probably be
-            // updated with new group info.  At a minimum, they should get ScenePresence
-            // updated with new title.
             SendAgentGroupDataUpdate(remoteClient, true);
         }
 
@@ -840,12 +704,6 @@ namespace OpenSim.Groups
             return m_groupData.GetAgentGroupMembership(UUID.Zero.ToString(), agentID.ToString(), groupID);
         }
 
-        public GroupMembershipData GetActiveMembershipData(UUID agentID)
-        {
-            string agentIDstr = agentID.ToString();
-            return m_groupData.GetAgentActiveMembership(agentIDstr, agentIDstr);
-        }
-
         public void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish)
         {
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
@@ -882,7 +740,7 @@ namespace OpenSim.Groups
 
             if (avatar != null)
             {
-                if (avatar.GodController.UserLevel < m_levelGroupCreate)
+                if (avatar.UserLevel < m_levelGroupCreate)
                 {
                     remoteClient.SendCreateGroupReply(UUID.Zero, false, String.Format("Insufficient permissions to create a group. Requires level {0}", m_levelGroupCreate));
                     return UUID.Zero;
@@ -890,7 +748,7 @@ namespace OpenSim.Groups
             }
 
             // check funds
-            // is there a money module present ?
+            // is there is a money module present ?
             IMoneyModule money = scene.RequestModuleInterface<IMoneyModule>();
             if (money != null)
             {
@@ -907,13 +765,13 @@ namespace OpenSim.Groups
 
             if (groupID != UUID.Zero)
             {
-                if (money != null && money.GroupCreationCharge > 0)
-                    money.ApplyCharge(remoteClient.AgentId, money.GroupCreationCharge, MoneyTransactionType.GroupCreate, name);
+                if (money != null)
+                    money.ApplyCharge(remoteClient.AgentId, money.GroupCreationCharge, MoneyTransactionType.GroupCreate);
 
-                remoteClient.SendCreateGroupReply(groupID, true, "Group created successfully");
+                remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly");
 
                 // Update the founder with new group information.
-                SendAgentGroupDataUpdate(remoteClient, true);
+                SendAgentGroupDataUpdate(remoteClient, false);
             }
             else
                 remoteClient.SendCreateGroupReply(groupID, false, reason);
@@ -1075,7 +933,6 @@ namespace OpenSim.Groups
                     bucket = new byte[19 + name.Length];
                     bucket[0] = 1; // has attachment?
                     bucket[1] = info.noticeData.AttachmentType; // attachment type
-                    info.GroupID.ToBytes(bucket, 2);
                     name.CopyTo(bucket, 18);
                 }
                 else
@@ -1086,6 +943,7 @@ namespace OpenSim.Groups
                     bucket[18] = 0; // null terminated
                 }
 
+                info.GroupID.ToBytes(bucket, 2);
                 msg.binaryBucket = bucket;
             }
             else
@@ -1105,28 +963,10 @@ namespace OpenSim.Groups
         {
             if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            GroupRecord groupRecord = GetGroupRecord(groupID);
-            IMoneyModule money = remoteClient.Scene.RequestModuleInterface<IMoneyModule>();
-
-            // Should check to see if there's an outstanding invitation
-
-            if (money != null && groupRecord.MembershipFee > 0)
-            {
-                // Does the agent have the funds to cover the group join fee?
-                if (!money.AmountCovered(remoteClient.AgentId, groupRecord.MembershipFee))
-                {
-                    remoteClient.SendAlertMessage("Insufficient funds to join the group.");
-                    remoteClient.SendJoinGroupReply(groupID, false);
-                    return;
-                }
-            }
-
             string reason = string.Empty;
-
+            // Should check to see if OpenEnrollment, or if there's an outstanding invitation
             if (m_groupData.AddAgentToGroup(GetRequestingAgentIDStr(remoteClient), GetRequestingAgentIDStr(remoteClient), groupID, UUID.Zero, string.Empty, out reason))
             {
-                if (money != null && groupRecord.MembershipFee > 0)
-                    money.ApplyCharge(remoteClient.AgentId, groupRecord.MembershipFee, MoneyTransactionType.GroupJoin, groupRecord.GroupName);
 
                 remoteClient.SendJoinGroupReply(groupID, true);
 
@@ -1212,31 +1052,10 @@ namespace OpenSim.Groups
                 return;
             }
 
-            IClientAPI ejecteeClient = GetActiveRootClient(ejecteeID);
-
             // Send Message to Ejectee
             GridInstantMessage msg = new GridInstantMessage();
             
-            // if local send a normal message
-            if(ejecteeClient != null)
-            {
             msg.imSessionID = UUID.Zero.Guid;
-                msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.MessageFromAgent;
-                // also execute and send update
-                ejecteeClient.SendAgentDropGroup(groupID);
-                SendAgentGroupDataUpdate(ejecteeClient,true);
-            }
-            else // send
-            {
-                // Interop, received special 210 code for ejecting a group member
-                // this only works within the comms servers domain, and won't work hypergrid
-                // TODO:FIXME: Use a presence server of some kind to find out where the
-                // client actually is, and try contacting that region directly to notify them,
-                // or provide the notification via xmlrpc update queue
-
-                msg.imSessionID = groupInfo.GroupID.Guid;
-                msg.dialog = (byte)210; //interop
-            }
             msg.fromAgentID = agentID.Guid;
             // msg.fromAgentID = info.GroupID;
             msg.toAgentID = ejecteeID.Guid;
@@ -1244,7 +1063,7 @@ namespace OpenSim.Groups
             msg.timestamp = 0;
             msg.fromAgentName = agentName;
             msg.message = string.Format("You have been ejected from '{1}' by {0}.", agentName, groupInfo.GroupName);
-
+            msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.MessageFromAgent;
             msg.fromGroup = false;
             msg.offline = (byte)0;
             msg.ParentEstateID = 0;
@@ -1254,7 +1073,11 @@ namespace OpenSim.Groups
             OutgoingInstantMessage(msg, ejecteeID);
 
             // Message to ejector
-
+            // Interop, received special 210 code for ejecting a group member
+            // this only works within the comms servers domain, and won't work hypergrid
+            // TODO:FIXME: Use a presense server of some kind to find out where the 
+            // client actually is, and try contacting that region directly to notify them,
+            // or provide the notification via xmlrpc update queue
 
             msg = new GridInstantMessage();
             msg.imSessionID = UUID.Zero.Guid;
@@ -1270,7 +1093,7 @@ namespace OpenSim.Groups
             {
                 msg.message = string.Format("{2} has been ejected from '{1}' by {0}.", agentName, groupInfo.GroupName, "Unknown member");
             }
-            msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.MessageFromAgent;
+            msg.dialog = (byte)210; //interop
             msg.fromGroup = false;
             msg.offline = (byte)0;
             msg.ParentEstateID = 0;
@@ -1278,6 +1101,11 @@ namespace OpenSim.Groups
             msg.RegionID = regionInfo.RegionID.Guid;
             msg.binaryBucket = new byte[0];
             OutgoingInstantMessage(msg, agentID);
+
+
+            // SL sends out messages to everyone in the group
+            // Who all should receive updates and what should they be updated with?
+            SendAgentGroupDataUpdate(remoteClient, false);
         }
 
         public void InviteGroupRequest(IClientAPI remoteClient, UUID groupID, UUID invitedAgentID, UUID roleID)
@@ -1334,24 +1162,12 @@ namespace OpenSim.Groups
 
         public List<DirGroupsReplyData> FindGroups(IClientAPI remoteClient, string query)
         {
-            return m_groupData.FindGroups(remoteClient.AgentId.ToString(), query);
+            return m_groupData.FindGroups(GetRequestingAgentIDStr(remoteClient), query);
         }
 
         #endregion
 
         #region Client/Update Tools
-        private IClientAPI GetActiveRootClient(UUID agentID)
-        {
-            foreach (Scene scene in m_sceneList)
-            {
-                ScenePresence sp = scene.GetScenePresence(agentID);
-                if (sp != null && !sp.IsChildAgent && !sp.IsDeleted)
-                {
-                        return sp.ControllingClient;
-                }
-            }
-            return null;
-         }
 
         /// <summary>
         /// Try to find an active IClientAPI reference for agentID giving preference to root connections
@@ -1364,7 +1180,7 @@ namespace OpenSim.Groups
             foreach (Scene scene in m_sceneList)
             {
                 ScenePresence sp = scene.GetScenePresence(agentID);
-                if (sp != null&& !sp.IsDeleted)
+                if (sp != null)
                 {
                     if (!sp.IsChildAgent)
                     {
@@ -1415,11 +1231,6 @@ namespace OpenSim.Groups
         {
             if (m_debugEnabled) m_log.InfoFormat("[Groups]: {0} called for {1}", System.Reflection.MethodBase.GetCurrentMethod().Name, remoteClient.Name);
 
-            // NPCs currently don't have a CAPs structure or event queues.  There is a strong argument for conveying this information
-            // to them anyway since it makes writing server-side bots a lot easier, but for now we don't do anything.
-            if (remoteClient.SceneAgent.PresenceType == PresenceType.Npc)
-                return;
-
             // TODO: All the client update functions need to be reexamined because most do too much and send too much stuff
 
             UUID agentID = GetRequestingAgentID(remoteClient);
@@ -1427,9 +1238,9 @@ namespace OpenSim.Groups
             SendDataUpdate(remoteClient,  tellOthers);
 
             GroupMembershipData[] membershipArray = GetProfileListedGroupMemberships(remoteClient, agentID);
-
-            remoteClient.UpdateGroupMembership(membershipArray);
             remoteClient.SendAgentGroupDataUpdate(agentID, membershipArray);
+
+           remoteClient.RefreshGroupMembership();
         }
 
         /// <summary>
@@ -1534,7 +1345,7 @@ namespace OpenSim.Groups
         {
             if (m_debugEnabled) m_log.InfoFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            IClientAPI localClient = GetActiveRootClient(msgTo);
+            IClientAPI localClient = GetActiveClient(msgTo);
             if (localClient != null)
             {
                 if (m_debugEnabled) m_log.InfoFormat("[Groups]: MsgTo ({0}) is local, delivering directly", localClient.Name);

OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs

@@ -246,9 +246,9 @@ namespace OpenSim.Groups
             return null;
         }
 
-        public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string search)
+        public List<DirGroupsReplyData> FindGroups(string RequestingAgentID, string search)
         {
-            return m_LocalGroupsConnector.FindGroups(RequestingAgentIDstr, search);
+            return m_LocalGroupsConnector.FindGroups(AgentUUI(RequestingAgentID), search);
         }
 
         public List<GroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID)
@@ -605,8 +605,14 @@ namespace OpenSim.Groups
         private string AgentUUI(string AgentIDStr)
         {
             UUID AgentID = UUID.Zero;
-            if (!UUID.TryParse(AgentIDStr, out AgentID) || AgentID == UUID.Zero)
-                return UUID.Zero.ToString();
+            try
+            {
+                AgentID = new UUID(AgentIDStr);
+            }
+            catch (FormatException)
+            {
+                return AgentID.ToString();
+            }
 
             if (m_UserManagement.IsLocalGridUser(AgentID))
                 return AgentID.ToString();
@@ -630,8 +636,14 @@ namespace OpenSim.Groups
         private string AgentUUIForOutside(string AgentIDStr)
         {
             UUID AgentID = UUID.Zero;
-            if (!UUID.TryParse(AgentIDStr, out AgentID) || AgentID == UUID.Zero)
-                return UUID.Zero.ToString();
+            try
+            {
+                AgentID = new UUID(AgentIDStr);
+            }
+            catch (FormatException)
+            {
+                return AgentID.ToString();
+            }
 
             AgentCircuitData agent = null;
             foreach (Scene scene in m_Scenes)

OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs

@@ -115,10 +115,9 @@ namespace OpenSim.Groups
         protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            string body;
-            using(StreamReader sr = new StreamReader(requestData))
-                body = sr.ReadToEnd();
-
+            StreamReader sr = new StreamReader(requestData);
+            string body = sr.ReadToEnd();
+            sr.Close();
             body = body.Trim();
 
             //m_log.DebugFormat("[XXX]: query String: {0}", body);

OpenSim/Addons/Groups/IGroupsServicesConnector.cs

@@ -39,7 +39,7 @@ namespace OpenSim.Groups
         bool UpdateGroup(string RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, 
             bool openEnrollment, bool allowPublish, bool maturePublish, out string reason);
         ExtendedGroupRecord GetGroupRecord(string RequestingAgentID, UUID GroupID, string GroupName);
-        List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string search);
+        List<DirGroupsReplyData> FindGroups(string RequestingAgentID, string search);
         List<GroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID);
 
         bool AddGroupRole(string RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers, out string reason);

OpenSim/Addons/Groups/Local/GroupsServiceLocalConnectorModule.cs

@@ -173,9 +173,9 @@ namespace OpenSim.Groups
             return null;
         }
 
-        public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string search)
+        public List<DirGroupsReplyData> FindGroups(string RequestingAgentID, string search)
         {
-            return m_GroupsService.FindGroups(RequestingAgentIDstr, search);
+            return m_GroupsService.FindGroups(RequestingAgentID, search);
         }
 
         public List<GroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID)

OpenSim/Addons/Groups/Properties/AssemblyInfo.cs

@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
+[assembly: AssemblyVersion("0.8.3.*")]
 
 [assembly: Addin("OpenSim.Groups", OpenSim.VersionInfo.VersionNumber)]
 [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]

OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs

@@ -153,7 +153,7 @@ namespace OpenSim.Groups
             return GroupsDataUtils.GroupRecord((Dictionary<string, object>)ret["RESULT"]);
         }
 
-        public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string query)
+        public List<DirGroupsReplyData> FindGroups(string RequestingAgentID, string query)
         {
             List<DirGroupsReplyData> hits = new List<DirGroupsReplyData>();
             if (string.IsNullOrEmpty(query))
@@ -161,7 +161,7 @@ namespace OpenSim.Groups
 
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["Query"] = query;
-            sendData["RequestingAgentID"] = RequestingAgentIDstr;
+            sendData["RequestingAgentID"] = RequestingAgentID;
 
             Dictionary<string, object> ret = MakeRequest("FINDGROUPS", sendData);
 

OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs

@@ -192,10 +192,10 @@ namespace OpenSim.Groups
             });
         }
 
-        public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string search)
+        public List<DirGroupsReplyData> FindGroups(string RequestingAgentID, string search)
         {
             // TODO!
-            return m_GroupsService.FindGroups(RequestingAgentIDstr, search);
+            return m_GroupsService.FindGroups(RequestingAgentID, search);
         }
 
         public bool AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID, string token, out string reason)

OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs

@@ -91,10 +91,9 @@ namespace OpenSim.Groups
         protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            string body;
-            using(StreamReader sr = new StreamReader(requestData))
-                body = sr.ReadToEnd();
-
+            StreamReader sr = new StreamReader(requestData);
+            string body = sr.ReadToEnd();
+            sr.Close();
             body = body.Trim();
 
             //m_log.DebugFormat("[XXX]: query String: {0}", body);
@@ -287,7 +286,7 @@ namespace OpenSim.Groups
                 string requestingAgentID = request["RequestingAgentID"].ToString();
 
                 if (!m_GroupsService.RemoveAgentFromGroup(requestingAgentID, agentID, groupID))
-                    NullResult(result, string.Format("Insufficient permissions. {0}", agentID));
+                    NullResult(result, string.Format("Insufficient permissions.", agentID));
                 else
                     result["RESULT"] = "true";
             }

OpenSim/Addons/Groups/Service/GroupsService.cs

@@ -43,8 +43,7 @@ namespace OpenSim.Groups
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public const GroupPowers DefaultEveryonePowers =
-            GroupPowers.AllowSetHome |
+        public const GroupPowers DefaultEveryonePowers = GroupPowers.AllowSetHome |
                                                          GroupPowers.Accountable |
                                                          GroupPowers.JoinChat |
                                                          GroupPowers.AllowVoiceChat |
@@ -52,23 +51,31 @@ namespace OpenSim.Groups
                                                          GroupPowers.StartProposal |
                                                          GroupPowers.VoteOnProposal;
 
-        public const GroupPowers OfficersPowers = DefaultEveryonePowers |
+        public const GroupPowers OwnerPowers = GroupPowers.Accountable |
+                                                GroupPowers.AllowEditLand |
                                                 GroupPowers.AllowFly |
                                                 GroupPowers.AllowLandmark |
                                                 GroupPowers.AllowRez |
+                                                GroupPowers.AllowSetHome |
+                                                GroupPowers.AllowVoiceChat |
+                                                GroupPowers.AssignMember |
                                                 GroupPowers.AssignMemberLimited |
+                                                GroupPowers.ChangeActions |
                                                 GroupPowers.ChangeIdentity |
                                                 GroupPowers.ChangeMedia |
                                                 GroupPowers.ChangeOptions |
+                                                GroupPowers.CreateRole |
                                                 GroupPowers.DeedObject |
+                                                GroupPowers.DeleteRole |
                                                 GroupPowers.Eject |
                                                 GroupPowers.FindPlaces |
+                                                GroupPowers.HostEvent |
                                                 GroupPowers.Invite |
+                                                GroupPowers.JoinChat |
                                                 GroupPowers.LandChangeIdentity |
                                                 GroupPowers.LandDeed |
                                                 GroupPowers.LandDivideJoin |
                                                 GroupPowers.LandEdit |
-            GroupPowers.AllowEnvironment |
                                                 GroupPowers.LandEjectAndFreeze |
                                                 GroupPowers.LandGardening |
                                                 GroupPowers.LandManageAllowed |
@@ -77,29 +84,19 @@ namespace OpenSim.Groups
                                                 GroupPowers.LandOptions |
                                                 GroupPowers.LandRelease |
                                                 GroupPowers.LandSetSale |
-            GroupPowers.MemberVisible |
                                                 GroupPowers.ModerateChat |
                                                 GroupPowers.ObjectManipulate |
                                                 GroupPowers.ObjectSetForSale |
+                                                GroupPowers.ReceiveNotices |
+                                                GroupPowers.RemoveMember |
                                                 GroupPowers.ReturnGroupOwned |
                                                 GroupPowers.ReturnGroupSet |
                                                 GroupPowers.ReturnNonGroup |
                                                 GroupPowers.RoleProperties |
                                                 GroupPowers.SendNotices |
-            GroupPowers.SetLandingPoint;
-
-        public const GroupPowers OwnerPowers = OfficersPowers | 
-            GroupPowers.Accountable |
-            GroupPowers.AllowEditLand |
-            GroupPowers.AssignMember |
-            GroupPowers.ChangeActions |
-            GroupPowers.CreateRole |
-            GroupPowers.DeleteRole |
-            GroupPowers.ExperienceAdmin |
-            GroupPowers.ExperienceCreator |
-            GroupPowers.GroupBanAccess |
-            GroupPowers.HostEvent |
-            GroupPowers.RemoveMember;
+                                                GroupPowers.SetLandingPoint |
+                                                GroupPowers.StartProposal |
+                                                GroupPowers.VoteOnProposal;
 
         #region Daily Cleanup
 
@@ -154,25 +151,20 @@ namespace OpenSim.Groups
             data.Data["ShowInList"] = showInList ? "1" : "0";
             data.Data["AllowPublish"] = allowPublish ? "1" : "0";
             data.Data["MaturePublish"] = maturePublish ? "1" : "0";
-            UUID ownerRoleID = UUID.Random();
-            data.Data["OwnerRoleID"] = ownerRoleID.ToString();
+            UUID roleID = UUID.Random();
+            data.Data["OwnerRoleID"] = roleID.ToString();
 
             if (!m_Database.StoreGroup(data))
                 return UUID.Zero;
 
             // Create Everyone role
-            _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, UUID.Zero, "Everyone", "Everyone in the group is in the everyone role.", "Member of " + name, (ulong)DefaultEveryonePowers, true);
-
-            // Create Officers role
-            UUID officersRoleID = UUID.Random();
-            _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, officersRoleID, "Officers", "The officers of the group, with more powers than regular members.", "Officer of " + name, (ulong)OfficersPowers, true);
+            _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, UUID.Zero, "Everyone", "Everyone in the group", "Member of " + name, (ulong)DefaultEveryonePowers, true);
 
             // Create Owner role
-            _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, ownerRoleID, "Owners", "Owners of the group", "Owner of " + name, (ulong)OwnerPowers, true);
+            _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, roleID, "Owners", "Owners of the group", "Owner of " + name, (ulong)OwnerPowers, true);
 
             // Add founder to group
-            _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, ownerRoleID);
-            _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, officersRoleID);
+            _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, roleID);
 
             return data.GroupID;
         }
@@ -231,22 +223,15 @@ namespace OpenSim.Groups
                     if (d.Data.ContainsKey("Location") && d.Data["Location"] != string.Empty)
                         continue;
 
-                    int nmembers = m_Database.MemberCount(d.GroupID);
-                    if(nmembers == 0)
-                        continue;
-
                     DirGroupsReplyData g = new DirGroupsReplyData();
+                    g.groupID = d.GroupID;
 
                     if (d.Data.ContainsKey("Name"))
                         g.groupName = d.Data["Name"];
                     else
-                    {
                         m_log.DebugFormat("[Groups]: Key Name not found");
-                        continue;
-                    }
 
-                    g.groupID = d.GroupID;
-                    g.members = nmembers;
+                    g.members = m_Database.MemberCount(d.GroupID);
 
                     groups.Add(g);
                 }
@@ -500,8 +485,8 @@ namespace OpenSim.Groups
 
             // check permissions
             bool limited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMemberLimited);
-            bool unlimited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMember) || IsOwner(RequestingAgentID, GroupID);
-            if (!limited && !unlimited)
+            bool unlimited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMember) | IsOwner(RequestingAgentID, GroupID);
+            if (!limited || !unlimited)
             {
                 m_log.DebugFormat("[Groups]: ({0}) Attempt at assigning {1} to role {2} denied because of lack of permission", RequestingAgentID, AgentID, RoleID);
                 return false;
@@ -511,7 +496,7 @@ namespace OpenSim.Groups
             if (!unlimited && limited)
             {
                 // check whether person's has this role
-                RoleMembershipData rolemembership = m_Database.RetrieveRoleMember(GroupID, RoleID, RequestingAgentID);
+                RoleMembershipData rolemembership = m_Database.RetrieveRoleMember(GroupID, RoleID, AgentID);
                 if (rolemembership == null)
                 {
                     m_log.DebugFormat("[Groups]: ({0}) Attempt at assigning {1} to role {2} denied because of limited permission", RequestingAgentID, AgentID, RoleID);
@@ -531,26 +516,13 @@ namespace OpenSim.Groups
                 return false;
 
             // check permissions
-            bool limited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMemberLimited);
             bool unlimited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMember) || IsOwner(RequestingAgentID, GroupID);
-            if (!limited && !unlimited)
+            if (!unlimited)
             {
                 m_log.DebugFormat("[Groups]: ({0}) Attempt at removing {1} from role {2} denied because of lack of permission", RequestingAgentID, AgentID, RoleID);
                 return false;
             }
 
-            // AssignMemberLimited means that the person can assign another person to the same roles that she has in the group
-            if (!unlimited && limited)
-            {
-                // check whether person's has this role
-                RoleMembershipData rolemembership = m_Database.RetrieveRoleMember(GroupID, RoleID, RequestingAgentID);
-                if (rolemembership == null)
-                {
-                    m_log.DebugFormat("[Groups]: ({0}) Attempt at removing {1} from role {2} denied because of limited permission", RequestingAgentID, AgentID, RoleID);
-                    return false;
-                }
-            }
-
             RoleMembershipData rolemember = m_Database.RetrieveRoleMember(GroupID, RoleID, AgentID);
 
             if (rolemember == null)
@@ -840,7 +812,7 @@ namespace OpenSim.Groups
             if (RoleID != UUID.Zero)
                 _AddAgentToGroupRole(RequestingAgentID, AgentID, GroupID, RoleID);
 
-            // Make this the active group
+            // Make thit this active group
             PrincipalData pdata = new PrincipalData();
             pdata.PrincipalID = AgentID;
             pdata.ActiveGroupID = GroupID;
@@ -858,7 +830,7 @@ namespace OpenSim.Groups
                 return false;
             }
 
-            if (!add && data == null) // it doesn't exist, can't update
+            if (!add && data == null) // it deosn't exist, can't update
             {
                 m_log.DebugFormat("[Groups]: Group {0} doesn't exist. Can't update it", groupID);
                 return false;

OpenSim/Addons/OfflineIM/OfflineIMRegionModule.cs

@@ -114,6 +114,7 @@ namespace OpenSim.OfflineIM
             scene.ForEachClient(delegate(IClientAPI client)
             {
                 client.OnRetrieveInstantMessages -= RetrieveInstantMessages;
+                client.OnMuteListRequest -= OnMuteListRequest;
             });
         }
 
@@ -161,6 +162,7 @@ namespace OpenSim.OfflineIM
         private void OnNewClient(IClientAPI client)
         {
             client.OnRetrieveInstantMessages += RetrieveInstantMessages;
+            client.OnMuteListRequest += OnMuteListRequest;
         }
 
         private void RetrieveInstantMessages(IClientAPI client)
@@ -192,6 +194,20 @@ namespace OpenSim.OfflineIM
             }
         }
 
+        // Apparently this is needed in order for the viewer to request the IMs.
+        private void OnMuteListRequest(IClientAPI client, uint crc)
+        {
+            m_log.DebugFormat("[OfflineIM.V2] Got mute list request for crc {0}", crc);
+            string filename = "mutes" + client.AgentId.ToString();
+
+            IXfer xfer = client.Scene.RequestModuleInterface<IXfer>();
+            if (xfer != null)
+            {
+                xfer.AddNewFile(filename, new Byte[0]);
+                client.SendMuteListUpdate(filename);
+            }
+        }
+
         private void UndeliveredMessage(GridInstantMessage im)
         {
             if (im.dialog != (byte)InstantMessageDialog.MessageFromObject &&

OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs

@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
+[assembly: AssemblyVersion("0.8.3.*")]
 
 [assembly: Addin("OpenSim.OfflineIM", OpenSim.VersionInfo.VersionNumber)]
 [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]

OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs

@@ -110,8 +110,9 @@ namespace OpenSim.OfflineIM
                 {
                     m_serializer.Serialize(writer, im);
                     writer.Flush();
-                    imXml = Util.UTF8NoBomEncoding.GetString(mstream.ToArray());
                 }
+
+                imXml = Util.UTF8NoBomEncoding.GetString(mstream.ToArray());
             }
 
             OfflineIMData data = new OfflineIMData();

OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs

@@ -61,8 +61,9 @@ using Mono.Addins;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
+// [assembly: AssemblyVersion("0.7.6.*")]
 
-[assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
+[assembly : AssemblyVersion("0.8.2.*")]
 
 [assembly: Addin("OpenSim.ApplicationPlugins.LoadRegions", OpenSim.VersionInfo.VersionNumber)]
 [assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]

OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs

@@ -122,7 +122,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                                 throw ex;
                         }
 
-                        if (regionCount > 0 || allowRegionless)
+                        if (regionCount > 0 | allowRegionless)
                             return regionInfos;
 
                         m_log.Debug("[WEBLOADER]: Request yielded no regions.");

OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs

@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
+[assembly: AssemblyVersion("0.8.3.*")]
 
 [assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", OpenSim.VersionInfo.VersionNumber)]
 [assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]

OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs

@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
+[assembly: AssemblyVersion("0.8.3.*")]
 
 [assembly: Addin("OpenSim.ApplicationPlugins.RemoteController", OpenSim.VersionInfo.VersionNumber)]
 [assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -359,42 +359,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     notice = false;
                 }
 
-                if (startupConfig.GetBoolean("SkipDelayOnEmptyRegion", false))
-                {
-                    m_log.Info("[RADMIN]: Counting affected avatars");
-                    int agents = 0;
-
-                    if (restartAll)
-                    {
-                        foreach (Scene s in m_application.SceneManager.Scenes)
-                        {
-                            foreach (ScenePresence sp in s.GetScenePresences())
-                            {
-                                if (!sp.IsChildAgent && !sp.IsNPC)
-                                    agents++;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        foreach (ScenePresence sp in rebootedScene.GetScenePresences())
-                        {
-                            if (!sp.IsChildAgent && !sp.IsNPC)
-                                agents++;
-                        }
-                    }
-
-                    m_log.InfoFormat("[RADMIN]: Avatars in region: {0}", agents);
-
-                    if (agents == 0)
-                    {
-                        m_log.Info("[RADMIN]: No avatars detected, shutting down without delay");
-
-                        times.Clear();
-                        times.Add(0);
-                    }
-                }
-
                 List<Scene> restartList;
 
                 if (restartAll)
@@ -412,10 +376,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[RADMIN]: Restart region: failed: {0} {1}", e.Message, e.StackTrace);
+//                m_log.ErrorFormat("[RADMIN]: Restart region: failed: {0} {1}", e.Message, e.StackTrace);
                 responseData["rebooting"] = false;
 
-                throw;
+                throw e;
             }
 
             m_log.Info("[RADMIN]: Restart Region request complete");
@@ -1934,7 +1898,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 GetSceneFromRegionParams(requestData, responseData, out scene);
                 health = scene.GetHealth(out flags, out text);
             }
-            catch
+            catch (Exception e)
             {
                 responseData["error"] = null;
             }
@@ -2872,7 +2836,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (wearable[0].ItemID != UUID.Zero)
                 {
                     // Get inventory item and copy it
-                    InventoryItemBase item = inventoryService.GetItem(source, wearable[0].ItemID);
+                    InventoryItemBase item = new InventoryItemBase(wearable[0].ItemID, source);
+                    item = inventoryService.GetItem(item);
 
                     if (item != null)
                     {
@@ -2925,7 +2890,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (itemID != UUID.Zero)
                 {
                     // Get inventory item and copy it
-                    InventoryItemBase item = inventoryService.GetItem(source, itemID);
+                    InventoryItemBase item = new InventoryItemBase(itemID, source);
+                    item = inventoryService.GetItem(item);
 
                     if (item != null)
                     {
@@ -3087,7 +3053,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// </summary>
         private void ApplyNextOwnerPermissions(InventoryItemBase item)
         {
-            if (item.InvType == (int)InventoryType.Object)
+            if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
             {
                 uint perms = item.CurrentPermissions;
                 PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref perms);

OpenSim/Capabilities/Caps.cs

@@ -28,7 +28,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Concurrent;
 using System.IO;
 using System.Reflection;
 using System.Threading;
@@ -50,9 +49,9 @@ namespace OpenSim.Framework.Capabilities
     /// </summary>
     public delegate IClientAPI GetClientDelegate(UUID agentID);
 
-    public class Caps : IDisposable
+    public class Caps
     {
-        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_httpListenerHostName;
         private uint m_httpListenPort;
@@ -65,8 +64,8 @@ namespace OpenSim.Framework.Capabilities
 
         private CapsHandlers m_capsHandlers;
 
-        private ConcurrentDictionary<string, PollServiceEventArgs> m_pollServiceHandlers
-            = new ConcurrentDictionary<string, PollServiceEventArgs>();
+        private Dictionary<string, PollServiceEventArgs> m_pollServiceHandlers 
+            = new Dictionary<string, PollServiceEventArgs>();
 
         private Dictionary<string, string> m_externalCapsHandlers = new Dictionary<string, string>();
 
@@ -120,19 +119,6 @@ namespace OpenSim.Framework.Capabilities
             get { return m_externalCapsHandlers; }
         }
 
-        [Flags]
-        public enum CapsFlags:uint
-        {
-            None =          0,
-            SentSeeds =     1,
-
-            ObjectAnim =    0x100,
-            WLEnv =         0x200,
-            AdvEnv =        0x400
-        }
-
-        public CapsFlags Flags { get; set;}
-
         public Caps(IHttpServer httpServer, string httpListen, uint httpPort, string capsPath,
                     UUID agent, string regionName)
         {
@@ -150,39 +136,11 @@ namespace OpenSim.Framework.Capabilities
             }
 
             m_agentID = agent;
-            m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort);
+            m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL);
             m_regionName = regionName;
-            Flags = CapsFlags.None;
             m_capsActive.Reset();
         }
 
-        ~Caps()
-        {
-            Flags = CapsFlags.None;
-            if (m_capsActive!= null)
-            {
-                m_capsActive.Dispose();
-                m_capsActive = null;
-            }
-        }
-        
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public void Dispose(bool disposing)
-        {
-            Flags = CapsFlags.None;
-            if (m_capsActive != null)
-            {
-                DeregisterHandlers();
-                m_capsActive.Dispose();
-                m_capsActive = null;
-            }
-        }
-
         /// <summary>
         /// Register a handler.  This allows modules to register handlers.
         /// </summary>
@@ -194,27 +152,15 @@ namespace OpenSim.Framework.Capabilities
             m_capsHandlers[capName] = handler;
         }
 
-        public void RegisterSimpleHandler(string capName, ISimpleStreamHandler handler, bool addToListener = true)
-        {
-            //m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path);
-            m_capsHandlers.AddSimpleHandler(capName, handler, addToListener);
-        }
-
         public void RegisterPollHandler(string capName, PollServiceEventArgs pollServiceHandler)
         {
 //            m_log.DebugFormat(
 //                "[CAPS]: Registering handler with name {0}, url {1} for {2}", 
 //                capName, pollServiceHandler.Url, m_agentID, m_regionName);
 
-            if(!m_pollServiceHandlers.TryAdd(capName, pollServiceHandler))
-            {
-                m_log.ErrorFormat(
-                    "[CAPS]: Handler with name {0} already registered (ulr {1}, agent {2}, region {3}",
-                    capName, pollServiceHandler.Url, m_agentID, m_regionName);
-                return;
-            }
+            m_pollServiceHandlers.Add(capName, pollServiceHandler);
 
-            m_httpListener.AddPollServiceHTTPHandler(pollServiceHandler);
+            m_httpListener.AddPollServiceHTTPHandler(pollServiceHandler.Url, pollServiceHandler);
 
 //            uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
 //            string protocol = "http";
@@ -254,9 +200,8 @@ namespace OpenSim.Framework.Capabilities
 
             foreach (PollServiceEventArgs handler in m_pollServiceHandlers.Values)
             {
-                m_httpListener.RemovePollServiceHTTPHandler(handler.Url);
+                m_httpListener.RemovePollServiceHTTPHandler("", handler.Url);
             }
-            m_pollServiceHandlers.Clear();
         }
 
         public bool TryGetPollHandler(string name, out PollServiceEventArgs pollHandler)
@@ -295,6 +240,9 @@ namespace OpenSim.Framework.Capabilities
                             port = MainServer.Instance.SSLPort;
                             protocol = "https";
                         }
+    //
+    //            caps.RegisterHandler("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
+
                         caps[kvp.Key] = string.Format("{0}://{1}:{2}{3}", protocol, hostName, port, kvp.Value.Url);
                 }
             }
@@ -308,7 +256,6 @@ namespace OpenSim.Framework.Capabilities
                 caps[kvp.Key] = kvp.Value;
             }
 
-
             return caps;
         }
 

OpenSim/Capabilities/CapsHandlers.cs

@@ -27,7 +27,6 @@
 
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Concurrent;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 
@@ -41,7 +40,6 @@ namespace OpenSim.Framework.Capabilities
     public class CapsHandlers
     {
         private Dictionary<string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>();
-        private ConcurrentDictionary<string, ISimpleStreamHandler> m_capsSimpleHandlers = new ConcurrentDictionary<string, ISimpleStreamHandler>();
         private IHttpServer m_httpListener;
         private string m_httpListenerHostName;
         private uint m_httpListenerPort;
@@ -55,15 +53,31 @@ namespace OpenSim.Framework.Capabilities
         /// <param name="httpListener">base HTTP server</param>
         /// <param name="httpListenerHostname">host name of the HTTP server</param>
         /// <param name="httpListenerPort">HTTP port</param>
-        public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort)
+        public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort)
+            : this(httpListener,httpListenerHostname,httpListenerPort, false)
+        {
+        }
+
+        /// <summary></summary>
+        /// CapsHandlers is a cap handler container but also takes
+        /// care of adding and removing cap handlers to and from the
+        /// supplied BaseHttpServer.
+        /// </summary>
+        /// <param name="httpListener">base HTTP server</param>
+        /// <param name="httpListenerHostname">host name of the HTTP
+        /// server</param>
+        /// <param name="httpListenerPort">HTTP port</param>
+        public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https)
         {
             m_httpListener = httpListener;
             m_httpListenerHostName = httpListenerHostname;
             m_httpListenerPort = httpListenerPort;
-            if (httpListener != null && httpListener.UseSSL)
-                m_useSSL = true;
-            else
-                m_useSSL = false;
+            m_useSSL = https;
+            if (httpListener != null && m_useSSL)
+            {
+                m_httpListenerHostName = httpListener.SSLCommonName;
+                m_httpListenerPort = httpListener.SSLPort;
+            }
         }
 
         /// <summary>
@@ -74,36 +88,18 @@ namespace OpenSim.Framework.Capabilities
         public void Remove(string capsName)
         {
             lock (m_capsHandlers)
-            {
-                if(m_capsHandlers.ContainsKey(capsName))
             {
                 m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[capsName].Path);
                 m_httpListener.RemoveStreamHandler("PUT", m_capsHandlers[capsName].Path);
                 m_httpListener.RemoveStreamHandler("GET", m_capsHandlers[capsName].Path);
-                    m_httpListener.RemoveStreamHandler("DELETE", m_capsHandlers[capsName].Path);
                 m_capsHandlers.Remove(capsName);
             }
         }
-            if(m_capsSimpleHandlers.TryRemove(capsName, out ISimpleStreamHandler hdr))
-            {
-                m_httpListener.RemoveSimpleStreamHandler(hdr.Path);
-            }
-        }
-
-        public void AddSimpleHandler(string capName, ISimpleStreamHandler handler, bool addToListener = true)
-        {
-            if(ContainsCap(capName))
-                Remove(capName);
-            if(m_capsSimpleHandlers.TryAdd(capName, handler) && addToListener)
-                m_httpListener.AddSimpleStreamHandler(handler);
-        }
 
         public bool ContainsCap(string cap)
         {
             lock (m_capsHandlers)
-                if (m_capsHandlers.ContainsKey(cap))
-                    return true;
-            return m_capsSimpleHandlers.ContainsKey(cap);
+                return m_capsHandlers.ContainsKey(cap);
         }
 
         /// <summary>
@@ -130,9 +126,6 @@ namespace OpenSim.Framework.Capabilities
                     if (m_capsHandlers.ContainsKey(idx))
                     {
                         m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[idx].Path);
-                        m_httpListener.RemoveStreamHandler("PUT", m_capsHandlers[idx].Path);
-                        m_httpListener.RemoveStreamHandler("GET", m_capsHandlers[idx].Path);
-                        m_httpListener.RemoveStreamHandler("DELETE", m_capsHandlers[idx].Path);
                         m_capsHandlers.Remove(idx);
                     }
     
@@ -154,9 +147,8 @@ namespace OpenSim.Framework.Capabilities
             {
                 lock (m_capsHandlers)
                 {
-                    string[] __keys = new string[m_capsHandlers.Keys.Count + m_capsSimpleHandlers.Keys.Count];
+                    string[] __keys = new string[m_capsHandlers.Keys.Count];
                     m_capsHandlers.Keys.CopyTo(__keys, 0);
-                    m_capsSimpleHandlers.Keys.CopyTo(__keys, m_capsHandlers.Keys.Count);
                     return __keys;
                 }
             }
@@ -170,39 +162,24 @@ namespace OpenSim.Framework.Capabilities
         public Hashtable GetCapsDetails(bool excludeSeed, List<string> requestedCaps)
         {
             Hashtable caps = new Hashtable();
+            string protocol = "http://";
+            
+            if (m_useSSL)
+                protocol = "https://";
 
-            string protocol = m_useSSL ? "https://" : "http://";
             string baseUrl = protocol + m_httpListenerHostName + ":" + m_httpListenerPort.ToString();
 
-            if (requestedCaps == null)
-            {
             lock (m_capsHandlers)
             {
-                    foreach (KeyValuePair<string, ISimpleStreamHandler> kvp in m_capsSimpleHandlers)
-                        caps[kvp.Key] = baseUrl + kvp.Value.Path;
-                    foreach (KeyValuePair<string, IRequestHandler> kvp in m_capsHandlers)
-                        caps[kvp.Key] = baseUrl + kvp.Value.Path;
-                }
-                return caps;
-            }
-
-            lock (m_capsHandlers)
+                foreach (string capsName in m_capsHandlers.Keys)
                 {
-                for(int i = 0; i < requestedCaps.Count; ++i)
-                {
-                    string capsName = requestedCaps[i];
                     if (excludeSeed && "SEED" == capsName)
                         continue;
 
-                    if (m_capsSimpleHandlers.TryGetValue(capsName, out ISimpleStreamHandler shdr))
-                    {
-                        caps[capsName] = baseUrl + shdr.Path;
+                    if (requestedCaps != null && !requestedCaps.Contains(capsName))
                         continue;
-                    }
-                    if (m_capsHandlers.TryGetValue(capsName, out IRequestHandler chdr))
-                    {
-                        caps[capsName] = baseUrl + chdr.Path;
-                    }
+
+                    caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;
                 }
             }
 

OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs

@@ -0,0 +1,116 @@
+/*
+ * 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.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Web;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+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;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class AvatarPickerSearchHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IPeople m_PeopleService;
+
+        public AvatarPickerSearchHandler(string path, IPeople peopleService, string name, string description)
+            : base("GET", path, name, description)
+        {
+            m_PeopleService = peopleService;
+        }
+
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            // Try to parse the texture ID from the request URL
+            NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
+            string names = query.GetOne("names");
+            string psize = query.GetOne("page_size");
+            string pnumber = query.GetOne("page");
+
+            if (m_PeopleService == null)
+                return FailureResponse(names, (int)System.Net.HttpStatusCode.InternalServerError, httpResponse);
+
+            if (string.IsNullOrEmpty(names) || names.Length < 3)
+                return FailureResponse(names, (int)System.Net.HttpStatusCode.BadRequest, httpResponse);
+
+            m_log.DebugFormat("[AVATAR PICKER SEARCH]: search for {0}", names);
+
+            int page_size = (string.IsNullOrEmpty(psize) ? 500 : Int32.Parse(psize));
+            int page_number = (string.IsNullOrEmpty(pnumber) ? 1 : Int32.Parse(pnumber));
+            
+            // Full content request
+            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK;
+            //httpResponse.ContentLength = ??;
+            httpResponse.ContentType = "application/llsd+xml";
+
+            List<UserData> users = m_PeopleService.GetUserData(names, page_size, page_number);
+
+            LLSDAvatarPicker osdReply = new LLSDAvatarPicker();
+            osdReply.next_page_url = httpRequest.RawUrl;
+            foreach (UserData u in users)
+                osdReply.agents.Array.Add(ConvertUserData(u));
+
+            string reply = LLSDHelpers.SerialiseLLSDReply(osdReply);
+            return System.Text.Encoding.UTF8.GetBytes(reply);
+        }
+
+        private LLSDPerson ConvertUserData(UserData user)
+        {
+            LLSDPerson p = new LLSDPerson();
+            p.legacy_first_name = user.FirstName;
+            p.legacy_last_name = user.LastName;
+            p.display_name = user.FirstName + " " + user.LastName;
+            if (user.LastName.StartsWith("@"))
+                p.username = user.FirstName.ToLower() + user.LastName.ToLower();
+            else
+                p.username = user.FirstName.ToLower() + "." + user.LastName.ToLower();
+            p.id = user.Id;
+            p.is_display_name_default = false;
+            return p;
+        }
+
+        private byte[] FailureResponse(string names, int statuscode, IOSHttpResponse httpResponse)
+        {
+            m_log.Error("[AVATAR PICKER SEARCH]: Error searching for " + names);
+            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+            return System.Text.Encoding.UTF8.GetBytes(string.Empty);
+        }
+    }
+}

OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescServerConnector.cs

@@ -29,12 +29,9 @@ using System;
 using Nini.Config;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
-using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
 using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-
 
 namespace OpenSim.Capabilities.Handlers
 {
@@ -70,16 +67,16 @@ namespace OpenSim.Capabilities.Handlers
             m_LibraryService =
                     ServerUtils.LoadPlugin<ILibraryService>(libService, args);
 
-            ExpiringKey<UUID> m_badRequests = new ExpiringKey<UUID>(30000);
-
             FetchInvDescHandler webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService, null);
-            ISimpleStreamHandler reqHandler
-                = new SimpleStreamHandler("/CAPS/WebFetchInvDesc/", delegate(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                { 
-                    webFetchHandler.FetchInventoryDescendentsRequest(httpRequest, httpResponse, m_badRequests);
-                });
+            IRequestHandler reqHandler
+                = new RestStreamHandler(
+                    "POST",
+                    "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
+                    webFetchHandler.FetchInventoryDescendentsRequest,
+                    "FetchInvDescendents",
+                    null);
+            server.AddStreamHandler(reqHandler);
+        }
 
-            server.AddSimpleStreamHandler(reqHandler);
-        }
     }
 }

OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs

@@ -25,12 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Net;
 using System.Reflection;
-using System.Text;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Services.Interfaces;
 using OSDArray = OpenMetaverse.StructuredData.OSDArray;
@@ -60,6 +59,9 @@ namespace OpenSim.Capabilities.Handlers
             OSDMap requestmap = (OSDMap)OSDParser.DeserializeLLSDXml(Utils.StringToBytes(request));
             OSDArray itemsRequested = (OSDArray)requestmap["items"];
 
+            string reply;
+            LLSDFetchInventory llsdReply = new LLSDFetchInventory();
+
             UUID[] itemIDs = new UUID[itemsRequested.Count];
             int i = 0;
 
@@ -73,94 +75,81 @@ namespace OpenSim.Capabilities.Handlers
             if (m_agentID != UUID.Zero)
             {
                 items = m_inventoryService.GetMultipleItems(m_agentID, itemIDs);
+
+                if (items == null)
+                {
+                    // OMG!!! One by one!!! This is fallback code, in case the backend isn't updated
+                    m_log.WarnFormat("[FETCH INVENTORY HANDLER]: GetMultipleItems failed. Falling back to fetching inventory items one by one.");
+                    items = new InventoryItemBase[itemsRequested.Count];                   
+                    InventoryItemBase item = new InventoryItemBase();
+                    item.Owner = m_agentID;
+                    foreach (UUID id in itemIDs)
+                    {
+                        item.ID = id;
+                        items[i++] = m_inventoryService.GetItem(item);
+                    }
+                }
             }
             else
             {
                 items = new InventoryItemBase[itemsRequested.Count];
+                InventoryItemBase item = new InventoryItemBase();
                 foreach (UUID id in itemIDs)
-                    items[i++] = m_inventoryService.GetItem(UUID.Zero, id);
+                {
+                    item.ID = id;
+                    items[i++] = m_inventoryService.GetItem(item);
+                }
             }
 
-            StringBuilder lsl = LLSDxmlEncode.Start(4096);
-            LLSDxmlEncode.AddMap(lsl);
-
-            if(m_agentID == UUID.Zero && items.Length > 0)
-                LLSDxmlEncode.AddElem("agent_id", items[0].Owner, lsl);
-            else
-                LLSDxmlEncode.AddElem("agent_id", m_agentID, lsl);
-
-            if(items == null || items.Length == 0)
-            {
-                LLSDxmlEncode.AddEmptyArray("items", lsl);
-            }
-            else
-            {
-                LLSDxmlEncode.AddArray("items", lsl);
             foreach (InventoryItemBase item in items)
             {
                 if (item != null)
-                        item.ToLLSDxml(lsl, 0xff);
-                }
-                LLSDxmlEncode.AddEndArray(lsl);
-            }            
-
-            LLSDxmlEncode.AddEndMap(lsl);
-            return LLSDxmlEncode.End(lsl);
-        }
-
-        public void FetchInventorySimpleRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, OSDMap requestmap, ExpiringKey<UUID> BadRequests)
                 {
-            //m_log.DebugFormat("[FETCH INVENTORY HANDLER]: Received FetchInventory capability request {0}", request);
+                    // We don't know the agent that this request belongs to so we'll use the agent id of the item
+                    // which will be the same for all items.
+                    llsdReply.agent_id = item.Owner;
+                    llsdReply.items.Array.Add(ConvertInventoryItem(item));
+                }
+            }
 
-            if(BadRequests == null)
+            reply = LLSDHelpers.SerialiseLLSDReply(llsdReply);
+
+            return reply;
+        }
+
+        /// <summary>
+        /// Convert an internal inventory item object into an LLSD object.
+        /// </summary>
+        /// <param name="invItem"></param>
+        /// <returns></returns>
+        private LLSDInventoryItem ConvertInventoryItem(InventoryItemBase invItem)
         {
-                httpResponse.StatusCode = (int)HttpStatusCode.NotFound;
-                return;
-            }
+            LLSDInventoryItem llsdItem = new LLSDInventoryItem();
+            llsdItem.asset_id = invItem.AssetID;
+            llsdItem.created_at = invItem.CreationDate;
+            llsdItem.desc = invItem.Description;
+            llsdItem.flags = ((int)invItem.Flags) & 0xff;
+            llsdItem.item_id = invItem.ID;
+            llsdItem.name = invItem.Name;
+            llsdItem.parent_id = invItem.Folder;
+            llsdItem.type = invItem.AssetType;
+            llsdItem.inv_type = invItem.InvType;
 
-            OSDArray itemsRequested = (OSDArray)requestmap["items"];
+            llsdItem.permissions = new LLSDPermissions();
+            llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid;
+            llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions;
+            llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions;
+            llsdItem.permissions.group_id = invItem.GroupID;
+            llsdItem.permissions.group_mask = (int)invItem.GroupPermissions;
+            llsdItem.permissions.is_owner_group = invItem.GroupOwned;
+            llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions;
+            llsdItem.permissions.owner_id = invItem.Owner;
+            llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions;
+            llsdItem.sale_info = new LLSDSaleInfo();
+            llsdItem.sale_info.sale_price = invItem.SalePrice;
+            llsdItem.sale_info.sale_type = invItem.SaleType;
 
-            UUID[] itemIDs = new UUID[itemsRequested.Count];
-            int i = 0;
-            foreach (OSDMap osdItemId in itemsRequested)
-            {
-                UUID id = osdItemId["item_id"].AsUUID();
-                if(!BadRequests.ContainsKey(id))
-                    itemIDs[i++] = id;
-            }
-
-            InventoryItemBase[] items = null;
-            try
-            {
-                // badrequests still not filled
-                items = m_inventoryService.GetMultipleItems(m_agentID, itemIDs);
-            }
-            catch{ }
-
-            StringBuilder lsl = LLSDxmlEncode.Start(4096);
-            LLSDxmlEncode.AddMap(lsl);
-
-            LLSDxmlEncode.AddElem("agent_id", m_agentID, lsl);
-
-            if (items == null || items.Length == 0)
-            {
-                LLSDxmlEncode.AddEmptyArray("items", lsl);
-            }
-            else
-            {
-                LLSDxmlEncode.AddArray("items", lsl);
-                foreach (InventoryItemBase item in items)
-                {
-                    if (item != null)
-                        item.ToLLSDxml(lsl, 0xff);
-                }
-                LLSDxmlEncode.AddEndArray(lsl);
-            }
-
-            LLSDxmlEncode.AddEndMap(lsl);
-            httpResponse.RawBuffer = Util.UTF8.GetBytes(LLSDxmlEncode.End(lsl));
-            httpResponse.StatusCode = (int)HttpStatusCode.OK;
+            return llsdItem;
         }
     }
 }
-

OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventoryDescendents2HandlerTests.cs

@@ -28,7 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.IO;
+using System.Net;
 using System.Text.RegularExpressions;
 using log4net;
 using log4net.Config;
@@ -46,7 +46,7 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
     [TestFixture]
     public class FetchInventoryDescendents2HandlerTests : OpenSimTestCase
     {
-        private UUID m_userID = new UUID("00000000-0000-0000-0000-000000000001");
+        private UUID m_userID = UUID.Zero;
         private Scene m_scene;
         private UUID m_rootFolderID;
         private int m_rootDescendents;
@@ -103,7 +103,6 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
 
             // Add a folder
             InventoryFolderBase folder = new InventoryFolderBase(new UUID("f0000000-0000-0000-0000-00000000000f"), "Test Folder", m_userID, m_rootFolderID);
-            folder.Type = (short)FolderType.None;
             m_scene.InventoryService.AddFolder(folder);
 
             // Add a link to notecard 2 in Test Folder
@@ -127,19 +126,6 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
             Console.WriteLine("Number of descendents: " + m_rootDescendents);
         }
 
-        private string dorequest(FetchInvDescHandler handler, string request)
-        {
-            TestOSHttpRequest req = new TestOSHttpRequest();
-            TestOSHttpResponse resp = new TestOSHttpResponse();
-            using(ExpiringKey<UUID> bad = new ExpiringKey<UUID>(5000)) // bad but this is test
-            using (MemoryStream ms = new MemoryStream(Utils.StringToBytes(request), false))
-            {
-                req.InputStream = ms;
-                handler.FetchInventoryDescendentsRequest(req, resp, bad);
-            }
-            return Util.UTF8.GetString(resp.RawBuffer);
-        }
-
         [Test]
         public void Test_001_SimpleFolder()
         {
@@ -148,18 +134,18 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
             Init();
 
             FetchInvDescHandler handler = new FetchInvDescHandler(m_scene.InventoryService, null, m_scene);
+            TestOSHttpRequest req = new TestOSHttpRequest();
+            TestOSHttpResponse resp = new TestOSHttpResponse();
 
             string request = "<llsd><map><key>folders</key><array><map><key>fetch_folders</key><integer>1</integer><key>fetch_items</key><boolean>1</boolean><key>folder_id</key><uuid>";
             request += m_rootFolderID;
-            request += "</uuid><key>owner_id</key><uuid>";
-            request += m_userID.ToString();
-            request += "</uuid><key>sort_order</key><integer>1</integer></map></array></map></llsd>";
+            request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000000</uuid><key>sort_order</key><integer>1</integer></map></array></map></llsd>";
             
-            string llsdresponse = dorequest(handler, request);
+            string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
 
             Assert.That(llsdresponse != null, Is.True, "Incorrect null response");
             Assert.That(llsdresponse != string.Empty, Is.True, "Incorrect empty response");
-            Assert.That(llsdresponse.Contains(m_userID.ToString()), Is.True, "Response should contain userID");
+            Assert.That(llsdresponse.Contains("00000000-0000-0000-0000-000000000000"), Is.True, "Response should contain userID");
 
             string descendents = "descendents</key><integer>" + m_rootDescendents + "</integer>";
             Assert.That(llsdresponse.Contains(descendents), Is.True, "Incorrect number of descendents");
@@ -172,17 +158,19 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
             TestHelpers.InMethod();
 
             FetchInvDescHandler handler = new FetchInvDescHandler(m_scene.InventoryService, null, m_scene);
+            TestOSHttpRequest req = new TestOSHttpRequest();
+            TestOSHttpResponse resp = new TestOSHttpResponse();
 
             string request = "<llsd><map><key>folders</key><array>";
             request += "<map><key>fetch_folders</key><integer>1</integer><key>fetch_items</key><boolean>1</boolean><key>folder_id</key><uuid>";
             request += m_rootFolderID;
-            request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000001</uuid><key>sort_order</key><integer>1</integer></map>";
+            request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000000</uuid><key>sort_order</key><integer>1</integer></map>";
             request += "<map><key>fetch_folders</key><integer>1</integer><key>fetch_items</key><boolean>1</boolean><key>folder_id</key><uuid>";
             request += m_notecardsFolder;
-            request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000001</uuid><key>sort_order</key><integer>1</integer></map>";
+            request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000000</uuid><key>sort_order</key><integer>1</integer></map>";
             request += "</array></map></llsd>";
 
-            string llsdresponse = dorequest(handler, request);
+            string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
             Console.WriteLine(llsdresponse);
 
             string descendents = "descendents</key><integer>" + m_rootDescendents + "</integer>";
@@ -200,12 +188,14 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
             TestHelpers.InMethod();
 
             FetchInvDescHandler handler = new FetchInvDescHandler(m_scene.InventoryService, null, m_scene);
+            TestOSHttpRequest req = new TestOSHttpRequest();
+            TestOSHttpResponse resp = new TestOSHttpResponse();
 
             string request = "<llsd><map><key>folders</key><array><map><key>fetch_folders</key><integer>1</integer><key>fetch_items</key><boolean>1</boolean><key>folder_id</key><uuid>";
             request += "f0000000-0000-0000-0000-00000000000f";
-            request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000001</uuid><key>sort_order</key><integer>1</integer></map></array></map></llsd>";
+            request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000000</uuid><key>sort_order</key><integer>1</integer></map></array></map></llsd>";
 
-            string llsdresponse = dorequest(handler, request);
+            string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
             Console.WriteLine(llsdresponse);
 
             string descendents = "descendents</key><integer>2</integer>";
@@ -225,11 +215,10 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
             // Make sure the folder link is included
             Assert.That(llsdresponse.Contains("Link to Objects folder"), Is.True, "Link to Objects folder is missing");
 
-/* contents of link folder are not supposed to be listed
             // Make sure the objects inside the Objects folder are included
             // Note: I'm not entirely sure this is needed, but that's what I found in the implementation
             Assert.That(llsdresponse.Contains("Some Object"), Is.True, "Some Object item (contents of the source) is missing");
-*/
+
             // Make sure that the source item is before the link item
             pos1 = llsdresponse.IndexOf("Some Object");
             pos2 = llsdresponse.IndexOf("Link to Objects folder");
@@ -242,6 +231,8 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
             TestHelpers.InMethod();
 
             FetchInvDescHandler handler = new FetchInvDescHandler(m_scene.InventoryService, null, m_scene);
+            TestOSHttpRequest req = new TestOSHttpRequest();
+            TestOSHttpResponse resp = new TestOSHttpResponse();
 
             string request = "<llsd><map><key>folders</key><array>";
             request += "<map><key>fetch_folders</key><integer>1</integer><key>fetch_items</key><boolean>1</boolean><key>folder_id</key><uuid>";
@@ -258,7 +249,7 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
             request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000000</uuid><key>sort_order</key><integer>1</integer></map>";
             request += "</array></map></llsd>";
 
-            string llsdresponse = dorequest(handler, request);
+            string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
             Console.WriteLine(llsdresponse);
 
             string root_folder = "<key>folder_id</key><uuid>" + m_rootFolderID + "</uuid>";
@@ -275,26 +266,27 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
         [Test]
         public void Test_005_FolderZero()
         {
-
             TestHelpers.InMethod();
 
             Init();
 
             FetchInvDescHandler handler = new FetchInvDescHandler(m_scene.InventoryService, null, m_scene);
+            TestOSHttpRequest req = new TestOSHttpRequest();
+            TestOSHttpResponse resp = new TestOSHttpResponse();
 
             string request = "<llsd><map><key>folders</key><array><map><key>fetch_folders</key><integer>1</integer><key>fetch_items</key><boolean>1</boolean><key>folder_id</key><uuid>";
             request += UUID.Zero;
             request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000000</uuid><key>sort_order</key><integer>1</integer></map></array></map></llsd>";
 
-            string llsdresponse = dorequest(handler, request);
+            string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
 
             Assert.That(llsdresponse != null, Is.True, "Incorrect null response");
             Assert.That(llsdresponse != string.Empty, Is.True, "Incorrect empty response");
-            // we do return a answer now
-            //Assert.That(llsdresponse.Contains("bad_folders</key><array><uuid>00000000-0000-0000-0000-000000000000"), Is.True, "Folder Zero should be a bad folder");
+            Assert.That(llsdresponse.Contains("bad_folders</key><array><uuid>00000000-0000-0000-0000-000000000000"), Is.True, "Folder Zero should be a bad folder");
 
             Console.WriteLine(llsdresponse);
         }
+
     }
 
 }

OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs

@@ -1,190 +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.Net;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Services.Interfaces;
-using Caps = OpenSim.Framework.Capabilities.Caps;
-
-namespace OpenSim.Capabilities.Handlers
-{
-    public class GetAssetsHandler
-    {
-        private static readonly ILog m_log =
-                   LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private static readonly Dictionary<string, AssetType> queryTypes = new Dictionary<string, AssetType>()
-        {
-            {"texture_id", AssetType.Texture},
-            {"sound_id", AssetType.Sound},
-            {"callcard_id", AssetType.CallingCard},
-            {"landmark_id", AssetType.Landmark},
-            {"script_id", AssetType.LSLText},
-            {"clothing_id", AssetType.Clothing},
-            {"object_id", AssetType.Object},
-            {"notecard_id", AssetType.Notecard},
-            {"lsltext_id", AssetType.LSLText},
-            {"lslbyte_id", AssetType.LSLBytecode},
-            {"txtr_tga_id", AssetType.TextureTGA},
-            {"bodypart_id", AssetType.Bodypart},
-            {"snd_wav_id", AssetType.SoundWAV},
-            {"img_tga_id", AssetType.ImageTGA},
-            {"jpeg_id", AssetType.ImageJPEG},
-            {"animatn_id", AssetType.Animation},
-            {"gesture_id", AssetType.Gesture},
-            {"mesh_id", AssetType.Mesh},
-            {"settings_id", AssetType.Settings}
-        };
-
-        private IAssetService m_assetService;
-
-        public GetAssetsHandler(IAssetService assService)
-        {
-            m_assetService = assService;
-        }
-
-        public void Handle(OSHttpRequest req, OSHttpResponse response)
-        {
-            response.ContentType = "text/plain";
-
-            if (m_assetService == null)
-            {
-                response.StatusCode = (int)HttpStatusCode.ServiceUnavailable;
-                response.KeepAlive = false;
-                return;
-            }
-
-            response.StatusCode = (int)HttpStatusCode.BadRequest;
-
-            var queries = req.QueryAsDictionary;
-            if(queries.Count == 0)
-                return;
-
-            AssetType type = AssetType.Unknown;
-            string assetStr = string.Empty;
-            foreach (KeyValuePair<string,string> kvp in queries)
-            {
-                if (queryTypes.ContainsKey(kvp.Key))
-                {
-                    type = queryTypes[kvp.Key];
-                    assetStr = kvp.Value;
-                    break;
-                }
-            }
-
-            if(type == AssetType.Unknown)
-            {
-                //m_log.Warn("[GETASSET]: Unknown type: " + query);
-                m_log.Warn("[GETASSET]: Unknown type");
-                response.StatusCode = (int)HttpStatusCode.NotFound;
-                return;
-            }
-
-            if (String.IsNullOrEmpty(assetStr))
-                return;
-
-            UUID assetID = UUID.Zero;
-            if(!UUID.TryParse(assetStr, out assetID))
-                return;
-
-            AssetBase asset = m_assetService.Get(assetID.ToString());
-            if(asset == null)
-            {
-                // m_log.Warn("[GETASSET]: not found: " + query + " " + assetStr);
-                response.StatusCode = (int)HttpStatusCode.NotFound;
-                return;
-            }
-
-            if (asset.Type != (sbyte)type)
-                return;
-
-            int len = asset.Data.Length;
-
-            string range = null;
-            if (req.Headers["Range"] != null)
-                range = req.Headers["Range"];
-            else if (req.Headers["range"] != null)
-                range = req.Headers["range"];
-
-            // range request
-            int start, end;
-            if (Util.TryParseHttpRange(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 >= asset.Data.Length)
-                {
-                    response.StatusCode = (int)HttpStatusCode.RequestedRangeNotSatisfiable;
-                    return;
-                }
-
-                if (end == -1)
-                    end = asset.Data.Length - 1;
-                else
-                    end = Utils.Clamp(end, 0, asset.Data.Length - 1);
-
-                start = Utils.Clamp(start, 0, end);
-                len = end - start + 1;
-
-                //m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
-                response.AddHeader("Content-Range", String.Format("bytes {0}-{1}/{2}", start, end, asset.Data.Length));
-                response.StatusCode = (int)HttpStatusCode.PartialContent;
-                response.RawBufferStart = start;
-            }
-            else
-                response.StatusCode = (int)HttpStatusCode.OK;
-
-            response.ContentType = asset.Metadata.ContentType;
-            response.RawBuffer = asset.Data;
-            response.RawBufferLen = len;
-            if (type == AssetType.Mesh || type == AssetType.Texture)
-            {
-                if(len > 8196)
-                {
-                    //if(type == AssetType.Texture && ((asset.Flags & AssetFlags.AvatarBake)!= 0))
-                    //    responsedata["prio"] = 1;
-                    //else
-                    response.Priority = 2;
-                }
-                else
-                    response.Priority = 1;
-            }
-            else
-                response.Priority = -1;
-        }
-    }
-}

OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs

@@ -0,0 +1,123 @@
+/*
+ * 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();
+                        // a date that is valid
+//                        osdname["display_name_next_update"] = OSD.FromDate(new DateTime(1970,1,1));
+                        // but send one that blocks edition, since we actually don't suport this
+                        osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8));        
+                        osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.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

@@ -29,35 +29,43 @@ using System;
 using Nini.Config;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
-using OpenSim.Framework.ServiceAuth;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
+using OpenMetaverse;
 
-namespace OpenSim.Server.Handlers.GridUser
+namespace OpenSim.Capabilities.Handlers
 {
-    public class MuteListServiceConnector : ServiceConnector
+    public class GetDisplayNamesServerConnector : ServiceConnector
     {
-        private IMuteListService m_MuteListService;
-        private string m_ConfigName = "MuteListService";
+        private IUserManagement m_UserManagement;
+        private string m_ConfigName = "CapsService";
 
-        public MuteListServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+        public GetDisplayNamesServerConnector(IConfigSource config, IHttpServer server, string configName) :
                 base(config, server, configName)
         {
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
             IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
-            string service = serverConfig.GetString("LocalServiceModule", String.Empty);
+            string umService = serverConfig.GetString("AssetService", String.Empty);
 
-            if (service == String.Empty)
-                throw new Exception("LocalServiceModule not present in MuteListService config file MuteListService section");
+            if (umService == String.Empty)
+                throw new Exception("No AssetService in config file");
 
             Object[] args = new Object[] { config };
-            m_MuteListService = ServerUtils.LoadPlugin<IMuteListService>(service, args);
+            m_UserManagement =
+                    ServerUtils.LoadPlugin<IUserManagement>(umService, args);
 
-            IServiceAuth auth = ServiceAuth.Create(config, m_ConfigName);
+            if (m_UserManagement == null)
+                throw new Exception(String.Format("Failed to load UserManagement from {0}; config is {1}", umService, m_ConfigName));
 
-            server.AddStreamHandler(new MuteListServerPostHandler(m_MuteListService, auth));
+            string rurl = serverConfig.GetString("GetTextureRedirectURL");
+            
+            server.AddStreamHandler(
+                new GetDisplayNamesHandler("/CAPS/agents/", m_UserManagement, "GetDisplayNames", null));
         }
     }
 }

OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs

@@ -41,6 +41,9 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Services.Interfaces;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 
+
+
+
 namespace OpenSim.Capabilities.Handlers
 {
     public class GetMeshHandler
@@ -58,98 +61,211 @@ namespace OpenSim.Capabilities.Handlers
         }
         public Hashtable Handle(Hashtable request)
         {
-            return ProcessGetMesh(request, UUID.Zero, null); ;
+            Hashtable ret = new Hashtable();
+            ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound;
+            ret["content_type"] = "text/plain";
+            ret["keepalive"] = false;
+            ret["reusecontext"] = false;
+            ret["int_bytes"] = 0;
+            ret["int_lod"] = 0;
+            string MeshStr = (string)request["mesh_id"];
+
+
+            //m_log.DebugFormat("[GETMESH]: called {0}", MeshStr);
+
+            if (m_assetService == null)
+            {
+                m_log.Error("[GETMESH]: Cannot fetch mesh " + MeshStr + " without an asset service");
             }
 
+            UUID meshID;
+            if (!String.IsNullOrEmpty(MeshStr) && UUID.TryParse(MeshStr, out meshID))
+            {
+                //                m_log.DebugFormat("[GETMESH]: Received request for mesh id {0}", meshID);
+
+
+                ret = ProcessGetMesh(request, UUID.Zero, null);
+
+
+            }
+            else
+            {
+                m_log.Warn("[GETMESH]: Failed to parse a mesh_id from GetMesh request: " + (string)request["uri"]);
+            }
+
+
+            return ret;
+        }
         public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap)
         {
             Hashtable responsedata = new Hashtable();
-            if (m_assetService == null)
-            {
-                responsedata["int_response_code"] = (int)System.Net.HttpStatusCode.ServiceUnavailable;
-                responsedata["str_response_string"] = "The asset service is unavailable";
-                responsedata["keepalive"] = false;
-                return responsedata;
-            }
-
-            responsedata["int_response_code"] = (int)System.Net.HttpStatusCode.BadRequest;
+            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";
+            responsedata["reusecontext"] = false;
+            responsedata["int_lod"] = 0;
             responsedata["int_bytes"] = 0;
 
             string meshStr = string.Empty;
+
             if (request.ContainsKey("mesh_id"))
                 meshStr = request["mesh_id"].ToString();
 
-            if (String.IsNullOrEmpty(meshStr))
-                return responsedata;
-
             UUID meshID = UUID.Zero;
-            if(!UUID.TryParse(meshStr, out meshID))
+            if (!String.IsNullOrEmpty(meshStr) && UUID.TryParse(meshStr, out meshID))
+            {
+                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.";
+                    responsedata["reusecontext"] = false;
                     return responsedata;
+                }
 
                 AssetBase mesh = m_assetService.Get(meshID.ToString());
-            if(mesh == null)
-            {
-                responsedata["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound;
-                responsedata["str_response_string"] = "Mesh not found.";
-                return responsedata;
-            }
 
-            if (mesh.Type != (SByte)AssetType.Mesh)
+                if (mesh != null)
                 {
-                responsedata["str_response_string"] = "Asset isn't a mesh.";
-                return responsedata;
-            }
+                    if (mesh.Type == (SByte)AssetType.Mesh)
+                    {
+
+                        Hashtable headers = new Hashtable();
+                        responsedata["headers"] = headers;
 
                         string range = String.Empty;
 
                         if (((Hashtable)request["headers"])["range"] != null)
                             range = (string)((Hashtable)request["headers"])["range"];
+
                         else if (((Hashtable)request["headers"])["Range"] != null)
                             range = (string)((Hashtable)request["headers"])["Range"];
 
-            responsedata["content_type"] = "application/vnd.ll.mesh";
-            if (String.IsNullOrEmpty(range))
+                        if (!String.IsNullOrEmpty(range)) // Mesh Asset LOD // Physics
                         {
-                // full mesh
-                responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
-                responsedata["int_response_code"] = (int)System.Net.HttpStatusCode.OK;
-                return responsedata;
-            }
-
-            // range request
+                            // Range request
                             int start, end;
-            if (Util.TryParseHttpRange(range, out start, out 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 >= mesh.Data.Length)
                                 {
+                                    responsedata["int_response_code"] = 404; //501; //410; //404;
+                                    responsedata["content_type"] = "text/plain";
+                                    responsedata["keepalive"] = false;
                                     responsedata["str_response_string"] = "This range doesnt exist.";
+                                    responsedata["reusecontext"] = false;
+                                    responsedata["int_lod"] = 3;
                                     return responsedata;
                                 }
-
+                                else
+                                {
                                     end = Utils.Clamp(end, 0, mesh.Data.Length - 1);
                                     start = Utils.Clamp(start, 0, end);
                                     int len = end - start + 1;
 
                                     //m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
-                Hashtable headers = new Hashtable();
-                headers["Content-Range"] = String.Format("bytes {0}-{1}/{2}", start, end, mesh.Data.Length);
-                responsedata["headers"] = headers;
-                responsedata["int_response_code"] = (int)System.Net.HttpStatusCode.PartialContent;
+
+                                    if (start > 20000)
+                                    {
+                                        responsedata["int_lod"] = 3;
+                                    }
+                                    else if (start < 4097)
+                                    {
+                                        responsedata["int_lod"] = 1;
+                                    }
+                                    else
+                                    {
+                                        responsedata["int_lod"] = 2;
+                                    }
+
+
+                                    if (start == 0 && len == mesh.Data.Length) // well redudante maybe
+                                    {
+                                        responsedata["int_response_code"] = (int)System.Net.HttpStatusCode.OK;
+                                        responsedata["bin_response_data"] = mesh.Data;
+                                        responsedata["int_bytes"] = mesh.Data.Length;
+                                        responsedata["reusecontext"] = false;
+                                        responsedata["int_lod"] = 3;
+
+                                    }
+                                    else
+                                    {
+                                        responsedata["int_response_code"] =
+                                            (int)System.Net.HttpStatusCode.PartialContent;
+                                        headers["Content-Range"] = String.Format("bytes {0}-{1}/{2}", start, end,
+                                                                                 mesh.Data.Length);
 
                                         byte[] d = new byte[len];
                                         Array.Copy(mesh.Data, start, d, 0, len);
                                         responsedata["bin_response_data"] = d;
                                         responsedata["int_bytes"] = len;
-                return responsedata;
+                                        responsedata["reusecontext"] = false;
                                     }
-
+                                }
+                            }
+                            else
+                            {
                                 m_log.Warn("[GETMESH]: Failed to parse a range from GetMesh request, sending full asset: " + (string)request["uri"]);
                                 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
-            responsedata["int_response_code"] = (int)System.Net.HttpStatusCode.OK;
+                                responsedata["content_type"] = "application/vnd.ll.mesh";
+                                responsedata["int_response_code"] = 200;
+                                responsedata["reusecontext"] = false;
+                                responsedata["int_lod"] = 3;
+                            }
+                        }
+                        else
+                        {
+                            responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
+                            responsedata["content_type"] = "application/vnd.ll.mesh";
+                            responsedata["int_response_code"] = 200;
+                            responsedata["reusecontext"] = false;
+                            responsedata["int_lod"] = 3;
+                        }
+                    }
+                    // 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.";
+                        responsedata["reusecontext"] = false;
+                        responsedata["int_lod"] = 1;
                         return responsedata;
                     }
                 }
+                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!";
+                    responsedata["reusecontext"] = false;
+                    responsedata["int_lod"] = 0;
+                    return responsedata;
+                }
+            }
+
+            return responsedata;
+        }
+        private bool TryParseRange(string header, out int start, out int end)
+        {
+            if (header.StartsWith("bytes="))
+            {
+                string[] rangeValues = header.Substring(6).Split('-');
+                if (rangeValues.Length == 2)
+                {
+                    if (Int32.TryParse(rangeValues[0], out start) && Int32.TryParse(rangeValues[1], out end))
+                        return true;
+                }
+            }
+
+            start = end = 0;
+            return false;
+        }
+    }
 }

OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs

@@ -68,7 +68,7 @@ namespace OpenSim.Capabilities.Handlers
             IRequestHandler reqHandler
                 = new RestHTTPHandler(
                     "GET",
-                    "/" + UUID.Random(),
+                    "/CAPS/" + UUID.Random(),
                     httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
                     "GetMesh",
                     null);

OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs

@@ -56,6 +56,10 @@ namespace OpenSim.Capabilities.Handlers
 
         public const string DefaultFormat = "x-j2c";
 
+        // TODO: Change this to a config option
+        private string m_RedirectURL = null;
+
+ 
         public GetTextureHandler(IAssetService assService)
         {
             m_assetService = assService;
@@ -66,6 +70,8 @@ namespace OpenSim.Capabilities.Handlers
             Hashtable ret = new Hashtable();
             ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound;
             ret["content_type"] = "text/plain";
+            ret["keepalive"] = false;
+            ret["reusecontext"] = false;
             ret["int_bytes"] = 0;
             string textureStr = (string)request["texture_id"];
             string format = (string)request["format"];
@@ -110,6 +116,8 @@ namespace OpenSim.Capabilities.Handlers
                     ret["error_status_text"] = "not found";
                     ret["str_response_string"] = "not found";
                     ret["content_type"] = "text/plain";
+                    ret["keepalive"] = false;
+                    ret["reusecontext"] = false;
                     ret["int_bytes"] = 0;
                 }
             }
@@ -210,7 +218,7 @@ namespace OpenSim.Capabilities.Handlers
             {
                 // Range request
                 int start, end;
-                if (Util.TryParseHttpRange(range, out start, out 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
@@ -249,6 +257,15 @@ namespace OpenSim.Capabilities.Handlers
 //                        m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
 
                         response["content-type"] = texture.Metadata.ContentType;
+
+                        if (start == 0 && len == texture.Data.Length) // well redudante maybe
+                        {
+                            response["int_response_code"] = (int)System.Net.HttpStatusCode.OK;
+                            response["bin_response_data"] = texture.Data;
+                            response["int_bytes"] = texture.Data.Length;
+                        }
+                        else
+                        {
                             response["int_response_code"] = (int)System.Net.HttpStatusCode.PartialContent;
                             headers["Content-Range"] = String.Format("bytes {0}-{1}/{2}", start, end, texture.Data.Length);
 
@@ -257,6 +274,8 @@ namespace OpenSim.Capabilities.Handlers
                             response["bin_response_data"] = d;
                             response["int_bytes"] = len;
                         }
+//                        response.Body.Write(texture.Data, start, len);
+                    }
                 }
                 else
                 {
@@ -289,28 +308,73 @@ namespace OpenSim.Capabilities.Handlers
 //                    texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length);
         }
 
+        /// <summary>
+        /// Parse a range header.
+        /// </summary>
+        /// <remarks>
+        /// As per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html,
+        /// this obeys range headers with two values (e.g. 533-4165) and no second value (e.g. 533-).
+        /// Where there is no value, -1 is returned.
+        /// FIXME: Need to cover the case where only a second value is specified (e.g. -4165), probably by returning -1
+        /// for start.</remarks>
+        /// <returns></returns>
+        /// <param name='header'></param>
+        /// <param name='start'>Start of the range.  Undefined if this was not a number.</param>
+        /// <param name='end'>End of the range.  Will be -1 if no end specified.  Undefined if there was a raw string but this was not a number.</param>
+        private bool TryParseRange(string header, out int start, out int end)
+        {
+            start = end = 0;
+
+            if (header.StartsWith("bytes="))
+            {
+                string[] rangeValues = header.Substring(6).Split('-');
+
+                if (rangeValues.Length == 2)
+                {
+                    if (!Int32.TryParse(rangeValues[0], out start))
+                        return false;
+
+                    string rawEnd = rangeValues[1];
+
+                    if (rawEnd == "")
+                    {
+                        end = -1;
+                        return true;
+                    }
+                    else if (Int32.TryParse(rawEnd, out end))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            start = end = 0;
+            return false;
+        }
+
         private byte[] ConvertTextureData(AssetBase texture, string format)
         {
             m_log.DebugFormat("[GETTEXTURE]: Converting texture {0} to {1}", texture.ID, format);
             byte[] data = new byte[0];
 
             MemoryStream imgstream = new MemoryStream();
-            Bitmap mTexture = null;
-            ManagedImage managedImage = null;
-            Image image = null;
+            Bitmap mTexture = new Bitmap(1, 1);
+            ManagedImage managedImage;
+            Image image = (Image)mTexture;
 
             try
             {
                 // Taking our jpeg2000 data, decoding it, then saving it to a byte array with regular data
 
+                imgstream = new MemoryStream();
+
                 // Decode image to System.Drawing.Image
-                if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image) && image != null)
+                if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image))
                 {
                     // Save to bitmap
                     mTexture = new Bitmap(image);
 
-                    using(EncoderParameters myEncoderParameters = new EncoderParameters())
-                    {
+                    EncoderParameters myEncoderParameters = new EncoderParameters();
                     myEncoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, 95L);
 
                     // Save bitmap to stream
@@ -323,7 +387,7 @@ namespace OpenSim.Capabilities.Handlers
                     }
                     else
                         m_log.WarnFormat("[GETTEXTURE]: No such codec {0}", format);
-                    }
+
                 }
             }
             catch (Exception e)
@@ -340,11 +404,12 @@ namespace OpenSim.Capabilities.Handlers
                 if (image != null)
                     image.Dispose();
 
-                if(managedImage != null)
-                    managedImage.Clear();
                 if (imgstream != null)
+                {
+                    imgstream.Close();
                     imgstream.Dispose();
                 }
+            }
 
             return data;
         }

OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs

@@ -32,7 +32,6 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Reflection;
 using System.IO;
-using System.Net;
 using System.Web;
 using log4net;
 using Nini.Config;
@@ -81,7 +80,6 @@ namespace OpenSim.Capabilities.Handlers
             {
                 m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");
                 httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
-                return null;
             }
  
             UUID textureID;
@@ -133,17 +131,47 @@ namespace OpenSim.Capabilities.Handlers
         private bool FetchTexture(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, UUID textureID, string format)
         {
 //            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
+            AssetBase texture;
+ 
+            string fullID = textureID.ToString();
+            if (format != DefaultFormat)
+                fullID = fullID + "-" + format;
+ 
             if (!String.IsNullOrEmpty(m_RedirectURL))
+            {
+                // Only try to fetch locally cached textures. Misses are redirected
+                texture = m_assetService.GetCached(fullID);
+ 
+                if (texture != null)
+                {
+                    if (texture.Type != (sbyte)AssetType.Texture)
+                    {
+                        httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                        return true;
+                    }
+                    WriteTextureData(httpRequest, httpResponse, texture, format);
+                }
+                else
                 {
                     string textureUrl = m_RedirectURL + "?texture_id="+ textureID.ToString();
                     m_log.Debug("[GETTEXTURE]: Redirecting texture request to " + textureUrl);
-                httpResponse.StatusCode = (int)HttpStatusCode.Moved;
-                httpResponse.AddHeader("Location:", textureUrl);
+                    httpResponse.StatusCode = (int)OSHttpStatusCode.RedirectMovedPermanently;
+                    httpResponse.RedirectLocation = textureUrl;
                     return true;
                 }
+            }
+            else // no redirect
+            {
+                // try the cache
+                texture = m_assetService.GetCached(fullID);
+ 
+                if (texture == null)
+                {
+//                    m_log.DebugFormat("[GETTEXTURE]: texture was not in the cache");
+ 
+                    // Fetch locally or remotely. Misses return a 404
+                    texture = m_assetService.Get(textureID.ToString());
  
-            // Fetch,  Misses or invalid return a 404
-            AssetBase texture = m_assetService.Get(textureID.ToString());
                     if (texture != null)
                     {
                         if (texture.Type != (sbyte)AssetType.Texture)
@@ -156,8 +184,8 @@ namespace OpenSim.Capabilities.Handlers
                             WriteTextureData(httpRequest, httpResponse, texture, format);
                             return true;
                         }
-
-                // need to convert format
+                        else
+                        {
                             AssetBase newTexture = new AssetBase(texture.ID + "-" + format, texture.Name, (sbyte)AssetType.Texture, texture.Metadata.CreatorID);
                             newTexture.Data = ConvertTextureData(texture, format);
                             if (newTexture.Data.Length == 0)
@@ -166,9 +194,19 @@ namespace OpenSim.Capabilities.Handlers
                             newTexture.Flags = AssetFlags.Collectable;
                             newTexture.Temporary = true;
                             newTexture.Local = true;
+                            m_assetService.Store(newTexture);
                             WriteTextureData(httpRequest, httpResponse, newTexture, format);
                             return true;
                         }
+                    }
+               }
+               else // it was on the cache
+               {
+//                   m_log.DebugFormat("[GETTEXTURE]: texture was in the cache");
+                   WriteTextureData(httpRequest, httpResponse, texture, format);
+                   return true;
+               }
+            }
  
             // not found
 //            m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
@@ -239,9 +277,8 @@ namespace OpenSim.Capabilities.Handlers
                         response.ContentLength = len;
                         response.ContentType = texture.Metadata.ContentType;
                         response.AddHeader("Content-Range", String.Format("bytes {0}-{1}/{2}", start, end, texture.Data.Length));
-                        response.RawBuffer = texture.Data;
-                        response.RawBufferStart = start;
-                        response.RawBufferLen = len;
+ 
+                        response.Body.Write(texture.Data, start, len);
                     }
                 }
                 else
@@ -259,9 +296,7 @@ namespace OpenSim.Capabilities.Handlers
                     response.ContentType = texture.Metadata.ContentType;
                 else
                     response.ContentType = "image/" + format;
-                response.RawBuffer = texture.Data;
-                response.RawBufferStart = 0;
-                response.RawBufferLen = texture.Data.Length;
+                response.Body.Write(texture.Data, 0, texture.Data.Length);
             }
  
 //            if (response.StatusCode < 200 || response.StatusCode > 299)
@@ -324,21 +359,23 @@ namespace OpenSim.Capabilities.Handlers
             byte[] data = new byte[0];
  
             MemoryStream imgstream = new MemoryStream();
-            Bitmap mTexture = null;
-            ManagedImage managedImage = null;
-            Image image = null;
+            Bitmap mTexture = new Bitmap(1, 1);
+            ManagedImage managedImage;
+            Image image = (Image)mTexture;
  
             try
             {
                 // Taking our jpeg2000 data, decoding it, then saving it to a byte array with regular data
+ 
+                imgstream = new MemoryStream();
+ 
                 // Decode image to System.Drawing.Image
-                if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image) && image != null)
+                if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image))
                 {
                     // Save to bitmap
                     mTexture = new Bitmap(image);
  
-                    using(EncoderParameters myEncoderParameters = new EncoderParameters())
-                    {
+                    EncoderParameters myEncoderParameters = new EncoderParameters();
                     myEncoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, 95L);
  
                     // Save bitmap to stream
@@ -351,7 +388,7 @@ namespace OpenSim.Capabilities.Handlers
                     }
                     else
                         m_log.WarnFormat("[GETTEXTURE]: No such codec {0}", format);
-                    }
+ 
                 }
             }
             catch (Exception e)
@@ -368,12 +405,12 @@ namespace OpenSim.Capabilities.Handlers
                 if (image != null)
                     image.Dispose();
  
-                if(managedImage != null)
-                    managedImage.Clear();
-
                 if (imgstream != null)
+                {
+                    imgstream.Close();
                     imgstream.Dispose();
                 }
+            }
  
             return data;
         }

OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs

@@ -66,7 +66,7 @@ namespace OpenSim.Capabilities.Handlers
             string rurl = serverConfig.GetString("GetTextureRedirectURL");
             ;
             server.AddStreamHandler(
-                new GetTextureRobustHandler("/CAPS/GetTexture", m_AssetService, "GetTexture", null, rurl));
+                new GetTextureRobustHandler("/CAPS/GetTexture/", m_AssetService, "GetTexture", null, rurl));
         }
     }
 }

OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
+[assembly: AssemblyVersion("0.8.3.*")]
 

OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs

@@ -0,0 +1,188 @@
+/*
+ * 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;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class UploadBakedTextureHandler
+    {
+      
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Caps m_HostCapsObj;
+        private IAssetService m_assetService;
+        private bool m_persistBakedTextures;
+
+        public UploadBakedTextureHandler(Caps caps, IAssetService assetService, bool persistBakedTextures)
+        {
+            m_HostCapsObj = caps;
+            m_assetService = assetService;
+            m_persistBakedTextures = persistBakedTextures;
+        }
+
+        /// <summary>
+        /// Handle a request from the client for a Uri to upload a baked texture.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <param name="httpRequest"></param>
+        /// <param name="httpResponse"></param>
+        /// <returns>The upload response if the request is successful, null otherwise.</returns>
+        public string UploadBakedTexture(
+            string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            try
+            {
+                string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath;
+                string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
+                
+                BakedTextureUploader uploader =
+                    new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_HostCapsObj.AgentID);
+                uploader.OnUpLoad += BakedTextureUploaded;
+
+                m_HostCapsObj.HttpListener.AddStreamHandler(
+                    new BinaryStreamHandler(
+                        "POST", capsBase + uploaderPath, uploader.uploaderCaps, "UploadBakedTexture", null));
+
+                string protocol = "http://";
+
+                if (m_HostCapsObj.SSLCaps)
+                    protocol = "https://";
+
+                string uploaderURL = protocol + m_HostCapsObj.HostName + ":" +
+                        m_HostCapsObj.Port.ToString() + capsBase + uploaderPath;
+
+                LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
+                uploadResponse.uploader = uploaderURL;
+                uploadResponse.state = "upload";
+
+                return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[UPLOAD BAKED TEXTURE HANDLER]: {0}{1}", e.Message, e.StackTrace);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Called when a baked texture has been successfully uploaded by a client.
+        /// </summary>
+        /// <param name="assetID"></param>
+        /// <param name="data"></param>
+        private void BakedTextureUploaded(UUID assetID, byte[] data)
+        {
+            m_log.DebugFormat("[UPLOAD BAKED TEXTURE HANDLER]: Received baked texture {0}", assetID.ToString());
+
+            AssetBase asset;
+            asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_HostCapsObj.AgentID.ToString());
+            asset.Data = data;
+            asset.Temporary = true;
+            asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are
+            m_assetService.Store(asset);
+            
+        }
+    }
+
+    class BakedTextureUploader
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public event Action<UUID, byte[]> OnUpLoad;
+
+        private string uploaderPath = String.Empty;
+        private UUID newAssetID;
+        private IHttpServer httpListener;
+        private UUID AgentId = UUID.Zero;
+
+        public BakedTextureUploader(string path, IHttpServer httpServer, UUID uUID)
+        {
+            newAssetID = UUID.Random();
+            uploaderPath = path;
+            httpListener = httpServer;
+            AgentId = uUID;
+            //                m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID);
+        }
+
+       
+
+        /// <summary>
+        /// Handle raw uploaded baked texture data.
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="path"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public string uploaderCaps(byte[] data, string path, string param)
+        {
+            Action<UUID, byte[]> handlerUpLoad = OnUpLoad;
+
+            // Don't do this asynchronously, otherwise it's possible for the client to send set appearance information
+            // on another thread which might send out avatar updates before the asset has been put into the asset
+            // service.
+            if (handlerUpLoad != null)
+                handlerUpLoad(newAssetID, data);
+
+            string res = String.Empty;
+            LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
+            uploadComplete.new_asset = newAssetID.ToString();
+            uploadComplete.new_inventory_item = UUID.Zero;
+            uploadComplete.state = "complete";
+
+            res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
+
+            httpListener.RemoveStreamHandler("POST", uploaderPath);
+
+//            m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID);
+
+            return res;
+        }
+    }
+}

OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs

@@ -0,0 +1,76 @@
+/*
+ * 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 Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class UploadBakedTextureServerConnector : ServiceConnector
+    {
+        private IAssetService m_AssetService;
+        private string m_ConfigName = "CapsService";
+
+        public UploadBakedTextureServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
+        {
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
+
+            string assetService = serverConfig.GetString("AssetService", String.Empty);
+
+            if (assetService == String.Empty)
+                throw new Exception("No AssetService in config file");
+
+            Object[] args = new Object[] { config };
+            m_AssetService =
+                    ServerUtils.LoadPlugin<IAssetService>(assetService, args);
+
+            if (m_AssetService == null)
+                throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
+
+            // NEED TO FIX THIS
+            OpenSim.Framework.Capabilities.Caps caps = new OpenSim.Framework.Capabilities.Caps(server, "", server.Port, "", UUID.Zero, "");
+            server.AddStreamHandler(new RestStreamHandler(
+                        "POST",
+                        "/CAPS/UploadBakedTexture/",
+                        new UploadBakedTextureHandler(caps, m_AssetService, true).UploadBakedTexture,
+                        "UploadBakedTexture",
+                        "Upload Baked Texture Capability"));
+
+         }
+    }
+}

OpenSim/Capabilities/LLSD.cs

@@ -107,18 +107,18 @@ namespace OpenSim.Framework.Capabilities
         /// <returns></returns>
         public static byte[] LLSDSerialize(object obj)
         {
-            using(StringWriter sw = new StringWriter())
-            using(XmlTextWriter writer = new XmlTextWriter(sw))
-            {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter writer = new XmlTextWriter(sw);
             writer.Formatting = Formatting.None;
 
             writer.WriteStartElement(String.Empty, "llsd", String.Empty);
             LLSDWriteOne(writer, obj);
             writer.WriteEndElement();
-                writer.Flush();
+
+            writer.Close();
+
             return Util.UTF8.GetBytes(sw.ToString());
         }
-        }
 
         /// <summary>
         ///
@@ -566,7 +566,7 @@ namespace OpenSim.Framework.Capabilities
                         endPos = FindEnd(llsd, 1);
 
                         if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float,
-                                            Culture.NumberFormatInfo, out value))
+                                            Utils.EnUsCulture.NumberFormat, out value))
                             return value;
                         else
                             throw new LLSDParseException("Failed to parse double value type");

OpenSim/Capabilities/LLSDAssetUploadComplete.cs

@@ -40,10 +40,6 @@ namespace OpenSim.Framework.Capabilities
         public string state = String.Empty;
         public LLSDAssetUploadError error = null;
         //public bool success = false;
-        public int new_next_owner_mask = 0;
-        public int new_group_mask = 0;
-        public int new_everyone_mask = 0;
-        public int inventory_item_flags = 0;
 
         public LLSDAssetUploadComplete()
         {

OpenSim/Capabilities/LLSDEnvironmentSettings.cs

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDEnvironmentRequest
+    {
+        public UUID messageID;
+        public UUID regionID;
+    }
+
+    [OSDMap]
+    public class LLSDEnvironmentSetResponse
+    {
+        public UUID regionID;
+        public UUID messageID;
+        public Boolean success;
+        public String fail_reason;
+    }
+
+    public class EnvironmentSettings
+    {
+        /// <summary>
+        /// generates a empty llsd settings response for viewer
+        /// </summary>
+        /// <param name="messageID">the message UUID</param>
+        /// <param name="regionID">the region UUID</param>
+        public static string EmptySettings(UUID messageID, UUID regionID)
+        {
+            OSDArray arr = new OSDArray();
+            LLSDEnvironmentRequest msg = new LLSDEnvironmentRequest();
+            msg.messageID = messageID;
+            msg.regionID = regionID;
+            arr.Array.Add(msg);
+            return LLSDHelpers.SerialiseLLSDReply(arr);
+        }
+    }
+
+}

OpenSim/Capabilities/LLSDHelpers.cs

@@ -30,7 +30,6 @@ using System.Collections;
 using System.IO;
 using System.Reflection;
 using System.Xml;
-using OpenMetaverse;
 
 namespace OpenSim.Framework.Capabilities
 {
@@ -41,33 +40,18 @@ namespace OpenSim.Framework.Capabilities
 
         public static string SerialiseLLSDReply(object obj)
         {
-            using(StringWriter sw = new StringWriter())
-            using(XmlTextWriter writer = new XmlTextWriter(sw))
-            {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter writer = new XmlTextWriter(sw);
             writer.Formatting = Formatting.None;
             writer.WriteStartElement(String.Empty, "llsd", String.Empty);
             SerializeOSDType(writer, obj);
             writer.WriteEndElement();
-                writer.Flush();
+            writer.Close();
+
             //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString());
 
             return sw.ToString();
         }
-        }
-
-        public static string SerialiseLLSDReplyNoHeader(object obj)
-        {
-            using(StringWriter sw = new StringWriter())
-            using(XmlTextWriter writer = new XmlTextWriter(sw))
-            {
-                writer.Formatting = Formatting.None;
-                SerializeOSDType(writer, obj);
-                writer.Flush();
-            //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString());
-
-                return sw.ToString();
-            }
-        }
 
         private static void SerializeOSDType(XmlTextWriter writer, object obj)
         {
@@ -173,22 +157,6 @@ namespace OpenSim.Framework.Capabilities
                                     // the LLSD map/array types in the array need to be deserialised
                                     // but first we need to know the right class to deserialise them into.
                                 }
-                                else if(enumerator.Value is Boolean && field.FieldType == typeof(int) )
-                                {
-                                    int i = (bool)enumerator.Value ? 1 : 0;
-                                    field.SetValue(obj, i);
-                                }
-                                else if(field.FieldType == typeof(bool) &&  enumerator.Value is int)
-                                {
-                                    bool b = (int)enumerator.Value != 0;
-                                    field.SetValue(obj, b);
-                                }
-                                else if(field.FieldType == typeof(UUID) &&  enumerator.Value is string)
-                                {
-                                    UUID u;
-                                    UUID.TryParse((string)enumerator.Value, out u);
-                                    field.SetValue(obj, u);
-                                }
                                 else
                                 {
                                     field.SetValue(obj, enumerator.Value);

OpenSim/Capabilities/LLSDInventoryFolder.cs

@@ -37,6 +37,5 @@ namespace OpenSim.Framework.Capabilities
         public string name;
         public int type;
         public int preferred_type;
-        public int version;
     }
 }

OpenSim/Capabilities/LLSDItemUpdate.cs

@@ -27,15 +27,15 @@
 
 using OpenMetaverse;
 
-namespace OpenSim.Framework
+namespace OpenSim.Framework.Capabilities
 {
-    public class MuteData
+    [OSDMap]
+    public class LLSDItemUpdate
+    {
+        public UUID item_id;
+
+        public LLSDItemUpdate()
         {
-        public UUID AgentID;
-        public UUID MuteID;
-        public string MuteName;
-        public int MuteType;
-        public int MuteFlags;
-        public int Stamp;
+        }
     }
 }

OpenSim/Capabilities/LLSDParcelVoiceInfoResponse.cs

@@ -0,0 +1,51 @@
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSimulator Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+
+using System.Collections;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDParcelVoiceInfoResponse
+    {
+        public int parcel_local_id;
+        public string region_name;
+        public Hashtable voice_credentials;
+
+        public LLSDParcelVoiceInfoResponse()
+        {
+        }
+
+        public LLSDParcelVoiceInfoResponse(string region, int localID, Hashtable creds)
+        {
+            region_name = region;
+            parcel_local_id = localID;
+            voice_credentials = creds;
+        }
+    }
+}

OpenSim/Capabilities/LLSDRemoteParcelResponse.cs

@@ -0,0 +1,42 @@
+/*
+* 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDRemoteParcelResponse
+    {
+        public UUID parcel_id;
+
+        public LLSDRemoteParcelResponse()
+        {
+        }
+    }
+}

OpenSim/Capabilities/LLSDStreamHandler.cs

@@ -61,9 +61,6 @@ namespace OpenSim.Framework.Capabilities
             //    OpenMetaverse.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));
 
             Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request);
-            if(hash == null)
-                return new byte[0];
-
             TRequest llsdRequest = new TRequest();
             LLSDHelpers.DeserialiseOSDMap(hash, llsdRequest);
 

OpenSim/Capabilities/LLSDTaskScriptUpdate.cs

@@ -0,0 +1,50 @@
+/*
+ * 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 OpenMetaverse;
+
+namespace OpenSim.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDTaskScriptUpdate
+    {
+        /// <summary>
+        /// The item containing the script to update
+        /// </summary>
+        public UUID item_id;
+
+        /// <summary>
+        /// The task containing the script
+        /// </summary>
+        public UUID task_id;
+
+        /// <summary>
+        /// Signals whether the script is currently active
+        /// </summary>
+        public int is_script_running;
+    }
+}

OpenSim/Capabilities/LLSDVoiceAccountResponse.cs

@@ -0,0 +1,57 @@
+/*
+* 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.
+*
+*/
+
+namespace OpenSim.Framework.Capabilities
+{
+    [OSDMap]
+    public class LLSDVoiceAccountResponse
+    {
+        public string username;
+        public string password;
+        public string voice_sip_uri_hostname;
+        public string voice_account_server_name;
+
+        public LLSDVoiceAccountResponse()
+        {
+        }
+
+        public LLSDVoiceAccountResponse(string user, string pass)
+        {
+            username = user;
+            password = pass;
+        }
+
+        public LLSDVoiceAccountResponse(string user, string pass, string sipUriHost, string accountServer)
+        {
+            username = user;
+            password = pass;
+            voice_sip_uri_hostname = sipUriHost;
+            voice_account_server_name = accountServer;
+        }
+    }
+}

OpenSim/ConsoleClient/ConsoleClient.cs

@@ -80,7 +80,7 @@ namespace OpenSim.ConsoleClient
             while (m_Server.Running)
             {
                 System.Threading.Thread.Sleep(500);
-                MainConsole.Instance.Prompt();
+                // MainConsole.Instance.Prompt();
             }
 
             if (pidFile != String.Empty)

OpenSim/Data/DBGuids.cs

@@ -47,25 +47,24 @@ namespace OpenSim.Data
             if ((id == null) || (id == DBNull.Value))
                 return UUID.Zero;
 
-            Type idtype = id.GetType();
-
-            if (idtype == typeof(Guid))
+            if (id.GetType() == typeof(Guid))
                 return new UUID((Guid)id);
 
-            if (id.GetType() == typeof(string))
+            if (id.GetType() == typeof(byte[]))
             {
-                Guid gg; 
-                if (Guid.TryParse((string)id, out gg))
-                    return new UUID(gg);
-                return UUID.Zero;
-            }
-
-            if (idtype == typeof(byte[]))
-            {
-                if (((byte[])id).Length < 16)
+                if (((byte[])id).Length == 0)
                     return UUID.Zero;
+                else if (((byte[])id).Length == 16)
                     return new UUID((byte[])id, 0);
             }
+            else if (id.GetType() == typeof(string))
+            {
+                if (((string)id).Length == 0)
+                    return UUID.Zero;
+                else if (((string)id).Length == 36)
+                    return new UUID((string)id);
+            }
+
             throw new Exception("Failed to convert db value to UUID: " + id.ToString());
         }
     }

OpenSim/Data/IRegionData.cs

@@ -71,8 +71,6 @@ namespace OpenSim.Data
     {
         RegionData Get(UUID regionID, UUID ScopeID);
         List<RegionData> Get(string regionName, UUID ScopeID);
-        RegionData GetSpecific(string regionName, UUID ScopeID);
-
         RegionData Get(int x, int y, UUID ScopeID);
         List<RegionData> Get(int xStart, int yStart, int xEnd, int yEnd, UUID ScopeID);
 

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -75,7 +75,6 @@ namespace OpenSim.Data.MySQL
                 dbcon.Open();
                 Migration m = new Migration(dbcon, Assembly, "AssetStore");
                 m.Update();
-                dbcon.Close();
             }
         }
 
@@ -145,7 +144,6 @@ namespace OpenSim.Data.MySQL
                             string.Format("[ASSETS DB]: MySql failure fetching asset {0}.  Exception  ", assetID), e);
                     }
                 }
-                dbcon.Close();
             }
 
             return asset;
@@ -158,6 +156,10 @@ namespace OpenSim.Data.MySQL
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
         override public bool StoreAsset(AssetBase asset)
         {
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            {
+                dbcon.Open();
+
                 string assetName = asset.Name;
                 if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
                 {
@@ -176,9 +178,6 @@ namespace OpenSim.Data.MySQL
                         asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
                 }
 
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
                 using (MySqlCommand cmd =
                     new MySqlCommand(
                         "replace INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, asset_flags, CreatorID, data)" +
@@ -201,14 +200,12 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
                         cmd.Parameters.AddWithValue("?data", asset.Data);
                         cmd.ExecuteNonQuery();
-                        dbcon.Close();
                         return true;
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
                             asset.FullID, asset.Name, e.Message);
-                        dbcon.Close();
                         return false;
                     }
                 }
@@ -241,7 +238,6 @@ namespace OpenSim.Data.MySQL
                             e);
                     }
                 }
-                dbcon.Close();
             }
         }
 
@@ -274,7 +270,6 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
-                dbcon.Close();
             }
 
             bool[] results = new bool[uuids.Length];
@@ -339,7 +334,6 @@ namespace OpenSim.Data.MySQL
                             e);
                     }
                 }
-                dbcon.Close();
             }
 
             return retList;
@@ -356,7 +350,6 @@ namespace OpenSim.Data.MySQL
                     cmd.Parameters.AddWithValue("?id", id);
                     cmd.ExecuteNonQuery();
                 }
-                dbcon.Close();
             }
 
             return true;

OpenSim/Data/MySQL/MySQLAuthenticationData.cs

@@ -59,7 +59,6 @@ namespace OpenSim.Data.MySQL
                 dbcon.Open();
                 Migration m = new Migration(dbcon, Assembly, "AuthStore");
                 m.Update();
-                dbcon.Close();
             }
         }
 
@@ -77,8 +76,8 @@ namespace OpenSim.Data.MySQL
                 {
                     cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
 
-                    using(IDataReader result = cmd.ExecuteReader())
-                    {
+                    IDataReader result = cmd.ExecuteReader();
+    
                     if (result.Read())
                     {
                         ret.PrincipalID = principalID;
@@ -93,18 +92,15 @@ namespace OpenSim.Data.MySQL
                             ret.Data[s] = result[s].ToString();
                         }
     
-                            dbcon.Close();
                         return ret;
                     }
                     else
                     {
-                            dbcon.Close();
                         return null;
                     }
                 }
             }
         }
-        }
 
         private void CheckColumnNames(IDataReader result)
         {

OpenSim/Data/MySQL/MySQLEstateData.cs

@@ -82,7 +82,6 @@ namespace OpenSim.Data.MySQL
 
                 Migration m = new Migration(dbcon, Assembly, "EstateStore");
                 m.Update();
-                dbcon.Close();
 
                 Type t = typeof(EstateSettings);
                 m_Fields = t.GetFields(BindingFlags.NonPublic |
@@ -144,6 +143,7 @@ namespace OpenSim.Data.MySQL
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
+
                 cmd.Connection = dbcon;
 
                 bool found = false;
@@ -171,8 +171,6 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
-                dbcon.Close();
-                cmd.Connection = null;
 
                 if (!found && create)
                 {
@@ -233,7 +231,6 @@ namespace OpenSim.Data.MySQL
 
                     es.Save();
                 }
-                dbcon.Close();
             }
         }
 
@@ -266,7 +263,6 @@ namespace OpenSim.Data.MySQL
 
                     cmd.ExecuteNonQuery();
                 }
-                dbcon.Close();
             }
 
             SaveBanList(es);
@@ -285,7 +281,7 @@ namespace OpenSim.Data.MySQL
 
                 using (MySqlCommand cmd = dbcon.CreateCommand())
                 {
-                    cmd.CommandText = "select *  from estateban where EstateID = ?EstateID";
+                    cmd.CommandText = "select bannedUUID from estateban where EstateID = ?EstateID";
                     cmd.Parameters.AddWithValue("?EstateID", es.EstateID);
 
                     using (IDataReader r = cmd.ExecuteReader())
@@ -293,16 +289,17 @@ namespace OpenSim.Data.MySQL
                         while (r.Read())
                         {
                             EstateBan eb = new EstateBan();
-                            eb.BannedUserID = DBGuid.FromDB(r["bannedUUID"]); ;
+
+                            UUID uuid = new UUID();
+                            UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
+
+                            eb.BannedUserID = uuid;
                             eb.BannedHostAddress = "0.0.0.0";
                             eb.BannedHostIPMask = "0.0.0.0";
-                            eb.BanningUserID = DBGuid.FromDB(r["banningUUID"]);
-                            eb.BanTime = Convert.ToInt32(r["banTime"]);
                             es.AddBan(eb);
                         }
                     }
                 }
-                dbcon.Close();
             }
         }
 
@@ -321,20 +318,17 @@ namespace OpenSim.Data.MySQL
 
                     cmd.Parameters.Clear();
 
-                    cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask, banningUUID, banTime) values ( ?EstateID, ?bannedUUID, '', '', '', ?banningUUID, ?banTime)";
+                    cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( ?EstateID, ?bannedUUID, '', '', '' )";
 
                     foreach (EstateBan b in es.EstateBans)
                     {
                         cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
                         cmd.Parameters.AddWithValue("?bannedUUID", b.BannedUserID.ToString());
-                        cmd.Parameters.AddWithValue("?banningUUID", b.BanningUserID.ToString());
-                        cmd.Parameters.AddWithValue("?banTime", b.BanTime);
 
                         cmd.ExecuteNonQuery();
                         cmd.Parameters.Clear();
                     }
                 }
-                dbcon.Close();
             }
         }
 
@@ -364,7 +358,6 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.Clear();
                     }
                 }
-                dbcon.Close();
             }
         }
 
@@ -390,7 +383,6 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
-                dbcon.Close();
             }
 
             return uuids.ToArray();
@@ -445,6 +437,7 @@ namespace OpenSim.Data.MySQL
                         reader.Close();
                     }
                 }
+
                 dbcon.Close();
             }
 
@@ -473,6 +466,7 @@ namespace OpenSim.Data.MySQL
                         reader.Close();
                     }
                 }
+
                 dbcon.Close();
             }
 

OpenSim/Data/MySQL/MySQLFSAssetData.cs

@@ -41,8 +41,10 @@ namespace OpenSim.Data.MySQL
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        protected MySqlConnection m_Connection = null;
         protected string m_ConnectionString;
         protected string m_Table;
+        protected Object m_connLock = new Object();
 
         /// <summary>
         /// Number of days that must pass before we update the access time on an asset when it has been fetched
@@ -73,13 +75,10 @@ namespace OpenSim.Data.MySQL
 
             try
             {
-                using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
-                {
-                    conn.Open();
-                    Migration m = new Migration(conn, Assembly, "FSAssetStore");
+                OpenDatabase();
+
+                Migration m = new Migration(m_Connection, Assembly, "FSAssetStore");
                 m.Update();
-                    conn.Close();
-                }
             }
             catch (MySqlException e)
             {
@@ -101,68 +100,93 @@ namespace OpenSim.Data.MySQL
 
         #endregion
 
-        private bool ExecuteNonQuery(MySqlCommand cmd)
-        {
-            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
+        private bool OpenDatabase()
         {
             try
             {
-                    conn.Open();
-                }
-                catch (MySqlException e)
-                {
-                    m_log.ErrorFormat("[FSASSETS]: Database open failed with {0}", e.ToString());
-                    return false;
-                }
+                m_Connection = new MySqlConnection(m_ConnectionString);
 
-                cmd.Connection = conn;
-                try
-                {
-                    cmd.ExecuteNonQuery();
+                m_Connection.Open();
             }
             catch (MySqlException e)
             {
-                    cmd.Connection = null;
-                    conn.Close();
-                    m_log.ErrorFormat("[FSASSETS]: Query {0} failed with {1}", cmd.CommandText, e.ToString());
+                m_log.ErrorFormat("[FSASSETS]: Can't connect to database: {0}",
+                        e.Message.ToString());
+
                 return false;
             }
-                conn.Close();
-                cmd.Connection = null;
-            }
 
             return true;
         }
 
+        private IDataReader ExecuteReader(MySqlCommand c)
+        {
+            IDataReader r = null;
+            MySqlConnection connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
+            connection.Open();
+            c.Connection = connection;
+
+            r = c.ExecuteReader();
+
+            return r;
+        }
+
+        private void ExecuteNonQuery(MySqlCommand c)
+        {
+            lock (m_connLock)
+            {
+                bool errorSeen = false;
+
+                while (true)
+                {
+                    try
+                    {
+                        c.ExecuteNonQuery();
+                    }
+                    catch (MySqlException)
+                    {
+                        System.Threading.Thread.Sleep(500);
+
+                        m_Connection.Close();
+                        m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
+                        m_Connection.Open();
+                        c.Connection = m_Connection;
+
+                        if (!errorSeen)
+                        {
+                            errorSeen = true;
+                            continue;
+                        }
+                        m_log.ErrorFormat("[FSASSETS] MySQL command: {0}", c.CommandText);
+                        throw;
+                    }
+
+                    break;
+                }
+            }
+        }
+
         #region IFSAssetDataPlugin Members
 
         public AssetMetadata Get(string id, out string hash)
         {
             hash = String.Empty;
 
-            AssetMetadata meta = new AssetMetadata();
+            MySqlCommand cmd = new MySqlCommand();
 
-            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
-            {
-                try
-                {
-                    conn.Open();
-                }
-                catch (MySqlException e)
-                {
-                    m_log.ErrorFormat("[FSASSETS]: Database open failed with {0}", e.ToString());
-                    return null;
-                }
-
-                using (MySqlCommand cmd = conn.CreateCommand())
-                {
-                    cmd.CommandText = String.Format("select id, name, description, type, hash, create_time, asset_flags, access_time from {0} where id = ?id", m_Table);
+            cmd.CommandText = String.Format("select id, name, description, type, hash, create_time, access_time, asset_flags from {0} where id = ?id", m_Table);
             cmd.Parameters.AddWithValue("?id", id);
 
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
+            IDataReader reader = ExecuteReader(cmd);
+
             if (!reader.Read())
+            {
+                reader.Close();
+                FreeCommand(cmd);
                 return null;
+            }
+            
+            AssetMetadata meta = new AssetMetadata();
 
             hash = reader["hash"].ToString();
 
@@ -177,42 +201,34 @@ namespace OpenSim.Data.MySQL
             meta.Flags = (AssetFlags)Convert.ToInt32(reader["asset_flags"]);
 
             int AccessTime = Convert.ToInt32(reader["access_time"]);
-                        UpdateAccessTime(id, AccessTime);
-                    }
-                }
-                conn.Close();
-            }
+
+            reader.Close();
+
+            UpdateAccessTime(AccessTime, cmd);
+
+            FreeCommand(cmd);
 
             return meta;
         }
 
-        private void UpdateAccessTime(string AssetID, int AccessTime)
+        private void UpdateAccessTime(int AccessTime, MySqlCommand cmd)
         {
             // Reduce DB work by only updating access time if asset hasn't recently been accessed
             // 0 By Default, Config option is "DaysBetweenAccessTimeUpdates"
             if (DaysBetweenAccessTimeUpdates > 0 && (DateTime.UtcNow - Utils.UnixTimeToDateTime(AccessTime)).TotalDays < DaysBetweenAccessTimeUpdates)
                 return;
 
-            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
-            {
-                try
-                {
-                    conn.Open();
-                }
-                catch (MySqlException e)
-                {
-                    m_log.ErrorFormat("[FSASSETS]: Database open failed with {0}", e.ToString());
-                    return;
-                }
-
-                using (MySqlCommand cmd = conn.CreateCommand())
-                {
             cmd.CommandText = String.Format("UPDATE {0} SET `access_time` = UNIX_TIMESTAMP() WHERE `id` = ?id", m_Table);
-                    cmd.Parameters.AddWithValue("?id", AssetID);
+
             cmd.ExecuteNonQuery();
         }
-                conn.Close();
-            }
+
+        protected void FreeCommand(MySqlCommand cmd)
+        {
+            MySqlConnection c = cmd.Connection;
+            cmd.Dispose();
+            c.Close();
+            c.Dispose();
         }
 
         public bool Store(AssetMetadata meta, string hash)
@@ -222,13 +238,12 @@ namespace OpenSim.Data.MySQL
                 string oldhash;
                 AssetMetadata existingAsset = Get(meta.ID, out oldhash);
 
-                using (MySqlCommand cmd = new MySqlCommand())
-                {
+                MySqlCommand cmd = m_Connection.CreateCommand();
+
                 cmd.Parameters.AddWithValue("?id", meta.ID);
                 cmd.Parameters.AddWithValue("?name", meta.Name);
                 cmd.Parameters.AddWithValue("?description", meta.Description);
-//                    cmd.Parameters.AddWithValue("?type", meta.Type.ToString());
-                    cmd.Parameters.AddWithValue("?type", meta.Type);
+                cmd.Parameters.AddWithValue("?type", meta.Type.ToString());
                 cmd.Parameters.AddWithValue("?hash", hash);
                 cmd.Parameters.AddWithValue("?asset_flags", meta.Flags);
 
@@ -238,6 +253,8 @@ namespace OpenSim.Data.MySQL
 
                     ExecuteNonQuery(cmd);
 
+                    cmd.Dispose();
+
                     return true;
                 }
 
@@ -245,13 +262,8 @@ namespace OpenSim.Data.MySQL
 
                 //ExecuteNonQuery(cmd);
 
-                }
-
-//                return false;
-                // if the asset already exits
-                // assume it was already correctly stored
-                // or regions will keep retry.
-                return true;
+                cmd.Dispose();
+                return false;
             }
             catch(Exception e)
             {
@@ -271,28 +283,12 @@ namespace OpenSim.Data.MySQL
             if (uuids.Length == 0)
                 return new bool[0];
 
-            bool[] results = new bool[uuids.Length];
-            for (int i = 0; i < uuids.Length; i++)
-                results[i] = false;
-
             HashSet<UUID> exists = new HashSet<UUID>();
 
             string ids = "'" + string.Join("','", uuids) + "'";
             string sql = string.Format("select id from {1} where id in ({0})", ids, m_Table);
 
-            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
-            {
-                try
-                {
-                    conn.Open();
-                }
-                catch (MySqlException e)
-                {
-                    m_log.ErrorFormat("[FSASSETS]: Failed to open database: {0}", e.ToString());
-                    return results;
-                }
-
-                using (MySqlCommand cmd = conn.CreateCommand())
+            using (MySqlCommand cmd = m_Connection.CreateCommand())
             {
                 cmd.CommandText = sql;
 
@@ -305,9 +301,8 @@ namespace OpenSim.Data.MySQL
                     }
                 }
             }
-                conn.Close();
-            }
 
+            bool[] results = new bool[uuids.Length];
             for (int i = 0; i < uuids.Length; i++)
                 results[i] = exists.Contains(uuids[i]);
             return results;
@@ -315,42 +310,26 @@ namespace OpenSim.Data.MySQL
 
         public int Count()
         {
-            int count = 0;
+            MySqlCommand cmd = m_Connection.CreateCommand();
 
-            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
-            {
-                try
-                {
-                    conn.Open();
-                }
-                catch (MySqlException e)
-                {
-                    m_log.ErrorFormat("[FSASSETS]: Failed to open database: {0}", e.ToString());
-                    return 0;
-                }
-
-                using(MySqlCommand cmd = conn.CreateCommand())
-                {
             cmd.CommandText = String.Format("select count(*) as count from {0}", m_Table);
 
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
+            IDataReader reader = ExecuteReader(cmd);
+
             reader.Read();
 
-                        count = Convert.ToInt32(reader["count"]);
-                    }
-                }
-                conn.Close();
-            }
+            int count = Convert.ToInt32(reader["count"]);
+
+            reader.Close();
+            FreeCommand(cmd);
 
             return count;
         }
 
         public bool Delete(string id)
         {
-            using(MySqlCommand cmd = new MySqlCommand())
+            using (MySqlCommand cmd = m_Connection.CreateCommand())
             {
-
                 cmd.CommandText = String.Format("delete from {0} where id = ?id", m_Table);
 
                 cmd.Parameters.AddWithValue("?id", id);
@@ -363,12 +342,12 @@ namespace OpenSim.Data.MySQL
 
         public void Import(string conn, string table, int start, int count, bool force, FSStoreDelegate store)
         {
-            int imported = 0;
+            MySqlConnection importConn;
 
-            using (MySqlConnection importConn = new MySqlConnection(conn))
-            {
             try
             {
+                importConn = new MySqlConnection(conn);
+
                 importConn.Open();
             }
             catch (MySqlException e)
@@ -379,8 +358,10 @@ namespace OpenSim.Data.MySQL
                 return;
             }
 
-                using (MySqlCommand cmd = importConn.CreateCommand())
-                {
+            int imported = 0;
+
+            MySqlCommand cmd = importConn.CreateCommand();
+
             string limit = String.Empty;
             if (count != -1)
             {
@@ -390,8 +371,8 @@ namespace OpenSim.Data.MySQL
             cmd.CommandText = String.Format("select * from {0}{1}", table, limit);
 
             MainConsole.Instance.Output("Querying database");
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
+            IDataReader reader = cmd.ExecuteReader();
+
             MainConsole.Instance.Output("Reading data");
 
             while (reader.Read())
@@ -420,10 +401,10 @@ namespace OpenSim.Data.MySQL
 
                 imported++;
             }
-                    }
-                }
+
+            reader.Close();
+            cmd.Dispose();
             importConn.Close();
-            }
 
             MainConsole.Instance.Output(String.Format("Import done, {0} assets imported", imported));
         }

OpenSim/Data/MySQL/MySQLFramework.cs

@@ -36,7 +36,7 @@ using MySql.Data.MySqlClient;
 namespace OpenSim.Data.MySQL
 {
     /// <summary>
-    /// Common code for a number of database modules
+    /// A database interface class to a user profile storage system
     /// </summary>
     public class MySqlFramework
     {
@@ -44,24 +44,14 @@ namespace OpenSim.Data.MySQL
                 log4net.LogManager.GetLogger(
                 System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected string m_connectionString = String.Empty;
-        protected MySqlTransaction m_trans = null;
+        protected string m_connectionString;
+        protected object m_dbLock = new object();
 
-        // Constructor using a connection string. Instances constructed
-        // this way will open a new connection for each call.
         protected MySqlFramework(string connectionString)
         {
             m_connectionString = connectionString;
         }
 
-        // Constructor using a connection object. Instances constructed
-        // this way will use the connection object and never create
-        // new connections.
-        protected MySqlFramework(MySqlTransaction trans)
-        {
-            m_trans = trans;
-        }
-
         //////////////////////////////////////////////////////////////
         //
         // All non queries are funneled through one connection
@@ -69,45 +59,23 @@ namespace OpenSim.Data.MySQL
         //
         protected int ExecuteNonQuery(MySqlCommand cmd)
         {
-            if (m_trans == null)
+            lock (m_dbLock)
             {
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-                    int ret = ExecuteNonQueryWithConnection(cmd, dbcon);
-                    dbcon.Close();
-                    return ret;
-                }
-            }
-            else
-            {
-                return ExecuteNonQueryWithTransaction(cmd, m_trans);
-            }
-        }
-
-        private int ExecuteNonQueryWithTransaction(MySqlCommand cmd, MySqlTransaction trans)
-        {
-            cmd.Transaction = trans;
-            return ExecuteNonQueryWithConnection(cmd, trans.Connection);
-        }
-
-        private int ExecuteNonQueryWithConnection(MySqlCommand cmd, MySqlConnection dbcon)
                 {
                     try
                     {
+                        dbcon.Open();
                         cmd.Connection = dbcon;
 
                         try
                         {
-                    int ret = cmd.ExecuteNonQuery();
-                    cmd.Connection = null;
-                    return ret;
+                            return cmd.ExecuteNonQuery();
                         }
                         catch (Exception e)
                         {
                             m_log.Error(e.Message, e);
                             m_log.Error(Environment.StackTrace.ToString());
-                    cmd.Connection = null;
                             return 0;
                         }
                     }
@@ -119,3 +87,5 @@ namespace OpenSim.Data.MySQL
                 }
             }
         }
+    }
+}

OpenSim/Data/MySQL/MySQLGenericTableHandler.cs

@@ -29,9 +29,11 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using System.Text;
+using log4net;
 using MySql.Data.MySqlClient;
 using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Data.MySQL
 {
@@ -51,27 +53,14 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySQLGenericTableHandler(MySqlTransaction trans,
-                string realm, string storeName) : base(trans)
-        {
-            m_Realm = realm;
-
-            CommonConstruct(storeName);
-        }
-
         public MySQLGenericTableHandler(string connectionString,
                 string realm, string storeName) : base(connectionString)
         {
             m_Realm = realm;
+            m_connectionString = connectionString;
             
-            CommonConstruct(storeName);
-        }
-
-        protected void CommonConstruct(string storeName)
-        {
             if (storeName != String.Empty)
             {
-                // We always use a new connection for any Migrations
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
@@ -117,69 +106,30 @@ namespace OpenSim.Data.MySQL
 
         public virtual T[] Get(string field, string key)
         {
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                cmd.Parameters.AddWithValue(field, key);
-                cmd.CommandText = string.Format("select * from {0} where `{1}` = ?{1}", m_Realm, field);
-                return DoQuery(cmd);
-            }
-        }
-
-        public virtual T[] Get(string field, string[] keys)
-        {
-            int flen = keys.Length;
-            if(flen == 0)
-                return new T[0];
-
-            int flast = flen - 1;
-            StringBuilder sb = new StringBuilder(1024);
-            sb.AppendFormat("select * from {0} where {1} IN (?", m_Realm, field);
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                for (int i = 0 ; i < flen ; i++)
-                {
-                    string fname = field + i.ToString();
-                    cmd.Parameters.AddWithValue(fname, keys[i]);
-
-                    sb.Append(fname);
-                    if(i < flast)
-                        sb.Append(",?");
-                    else
-                        sb.Append(")");
-                }
-                cmd.CommandText = sb.ToString();
-                return DoQuery(cmd);
-            }
+            return Get(new string[] { field }, new string[] { key });
         }
 
         public virtual T[] Get(string[] fields, string[] keys)
         {
-            return Get(fields, keys, String.Empty);
-        }
-
-        public virtual T[] Get(string[] fields, string[] keys, string options)
-        {
-            int flen = fields.Length;
-            if (flen == 0 || flen != keys.Length)
+            if (fields.Length != keys.Length)
                 return new T[0];
 
-            int flast = flen - 1;
-            StringBuilder sb = new StringBuilder(1024);
-            sb.AppendFormat("select * from {0} where ", m_Realm);
+            List<string> terms = new List<string>();
 
             using (MySqlCommand cmd = new MySqlCommand())
             {
-                for (int i = 0 ; i < flen ; i++)
+                for (int i = 0 ; i < fields.Length ; i++)
                 {
                     cmd.Parameters.AddWithValue(fields[i], keys[i]);
-                    if(i < flast)
-                        sb.AppendFormat("`{0}` = ?{0} and ", fields[i]);
-                    else
-                        sb.AppendFormat("`{0}` = ?{0} ", fields[i]);
+                    terms.Add("`" + fields[i] + "` = ?" + fields[i]);
                 }
 
-                sb.Append(options);
-                cmd.CommandText = sb.ToString();
+                string where = String.Join(" and ", terms.ToArray());
+
+                string query = String.Format("select * from {0} where {1}",
+                                             m_Realm, where);
+
+                cmd.CommandText = query;
                 
                 return DoQuery(cmd);
             }
@@ -187,33 +137,11 @@ namespace OpenSim.Data.MySQL
 
         protected T[] DoQuery(MySqlCommand cmd)
         {
-            if (m_trans == null)
-            {
+            List<T> result = new List<T>();
+
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
-                    T[] ret = DoQueryWithConnection(cmd, dbcon);
-                    dbcon.Close();
-                    return ret;
-                }
-            }
-            else
-            {
-                return DoQueryWithTransaction(cmd, m_trans);
-            }
-        }
-
-        protected T[] DoQueryWithTransaction(MySqlCommand cmd, MySqlTransaction trans)
-        {
-            cmd.Transaction = trans;
-
-            return DoQueryWithConnection(cmd, trans.Connection);
-        }
-
-        protected T[] DoQueryWithConnection(MySqlCommand cmd, MySqlConnection dbcon)
-        {
-            List<T> result = new List<T>();
-
                 cmd.Connection = dbcon;
 
                 using (IDataReader reader = cmd.ExecuteReader())
@@ -236,7 +164,7 @@ namespace OpenSim.Data.MySQL
                             if (m_Fields[name].FieldType == typeof(bool))
                             {
                                 int v = Convert.ToInt32(reader[name]);
-                            m_Fields[name].SetValue(row, v != 0);
+                                m_Fields[name].SetValue(row, v != 0 ? true : false);
                             }
                             else if (m_Fields[name].FieldType == typeof(UUID))
                             {
@@ -276,7 +204,8 @@ namespace OpenSim.Data.MySQL
                         result.Add(row);
                     }
                 }
-            cmd.Connection = null;
+            }
+
             return result.ToArray();
         }
 
@@ -355,26 +284,25 @@ namespace OpenSim.Data.MySQL
 //                "[MYSQL GENERIC TABLE HANDLER]: Delete(string[] fields, string[] keys) invoked with {0}:{1}",
 //                string.Join(",", fields), string.Join(",", keys));
 
-            int flen = fields.Length;
-            if (flen == 0 || flen != keys.Length)
+            if (fields.Length != keys.Length)
                 return false;
 
-            int flast = flen - 1;
-            StringBuilder sb = new StringBuilder(1024);
-            sb.AppendFormat("delete from {0} where ", m_Realm);
+            List<string> terms = new List<string>();
 
             using (MySqlCommand cmd = new MySqlCommand())
             {
-                for (int i = 0 ; i < flen ; i++)
+                for (int i = 0 ; i < fields.Length ; i++)
                 {
                     cmd.Parameters.AddWithValue(fields[i], keys[i]);
-                    if(i < flast)
-                        sb.AppendFormat("`{0}` = ?{0} and ", fields[i]);
-                    else
-                        sb.AppendFormat("`{0}` = ?{0}", fields[i]);
+                    terms.Add("`" + fields[i] + "` = ?" + fields[i]);
                 }
 
-                cmd.CommandText = sb.ToString();
+                string where = String.Join(" and ", terms.ToArray());
+
+                string query = String.Format("delete from {0} where {1}", m_Realm, where);
+
+                cmd.CommandText = query;
+
                 return ExecuteNonQuery(cmd) > 0;
             }
         }
@@ -386,27 +314,27 @@ namespace OpenSim.Data.MySQL
 
         public long GetCount(string[] fields, string[] keys)
         {
-            int flen = fields.Length;
-            if (flen == 0 || flen != keys.Length)
+            if (fields.Length != keys.Length)
                 return 0;
 
-            int flast = flen - 1;
-            StringBuilder sb = new StringBuilder(1024);
-            sb.AppendFormat("select count(*) from {0} where ", m_Realm);
+            List<string> terms = new List<string>();
 
             using (MySqlCommand cmd = new MySqlCommand())
             {
-                for (int i = 0 ; i < flen ; i++)
+                for (int i = 0; i < fields.Length; i++)
                 {
                     cmd.Parameters.AddWithValue(fields[i], keys[i]);
-                    if(i < flast)
-                        sb.AppendFormat("`{0}` = ?{0} and ", fields[i]);
-                    else
-                        sb.AppendFormat("`{0}` = ?{0}", fields[i]);
+                    terms.Add("`" + fields[i] + "` = ?" + fields[i]);
                 }
 
-                cmd.CommandText = sb.ToString();
-                object result = DoQueryScalar(cmd);
+                string where = String.Join(" and ", terms.ToArray());
+
+                string query = String.Format("select count(*) from {0} where {1}",
+                                             m_Realm, where);
+
+                cmd.CommandText = query;
+
+                Object result = DoQueryScalar(cmd);
 
                 return Convert.ToInt64(result);
             }
@@ -428,27 +356,15 @@ namespace OpenSim.Data.MySQL
         }
 
         public object DoQueryScalar(MySqlCommand cmd)
-        {
-            if (m_trans == null)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
                 cmd.Connection = dbcon;
 
-                    object ret = cmd.ExecuteScalar();
-                    cmd.Connection = null;
-                    dbcon.Close();
-                    return ret;
-                }
-            }
-            else
-            {
-                cmd.Connection = m_trans.Connection;
-                cmd.Transaction = m_trans;
-
                 return cmd.ExecuteScalar();
             }
         }
+
     }
 }

OpenSim/Data/MySQL/MySQLGroupsData.cs

@@ -90,7 +90,7 @@ namespace OpenSim.Data.MySQL
             else
                 pattern = string.Format("Name LIKE '%{0}%'", MySqlHelper.EscapeString(pattern));
 
-            return m_Groups.Get(string.Format("ShowInList=1 AND ({0})", pattern));
+            return m_Groups.Get(string.Format("ShowInList=1 AND ({0}) ORDER BY Name LIMIT 100", pattern));
         }
 
         public bool DeleteGroup(UUID groupID)
@@ -431,7 +431,8 @@ namespace OpenSim.Data.MySQL
 
             using (MySqlCommand cmd = new MySqlCommand())
             {
-                cmd.CommandText = String.Format("delete from {0} where TMStamp < NOW() - INTERVAL 2 WEEK", m_Realm);
+                cmd.CommandText = String.Format("delete from {0} where TMStamp < ?tstamp", m_Realm);
+                cmd.Parameters.AddWithValue("?tstamp", now - 14 * 24 * 60 * 60); // > 2 weeks old
 
                 ExecuteNonQuery(cmd);
             }

OpenSim/Data/MySQL/MySQLInventoryData.cs

@@ -78,7 +78,6 @@ namespace OpenSim.Data.MySQL
                 dbcon.Open();
                 Migration m = new Migration(dbcon, assem, "InventoryStore");
                 m.Update();
-                dbcon.Close();
             }
         }
 
@@ -131,7 +130,6 @@ namespace OpenSim.Data.MySQL
                                         items.Add(item);
                                 }
 
-                                dbcon.Close();
                                 return items;
                             }
                         }
@@ -172,7 +170,6 @@ namespace OpenSim.Data.MySQL
                                 while (reader.Read())
                                     items.Add(readInventoryFolder(reader));
 
-                                dbcon.Close();
                                 return items;
                             }
                         }
@@ -224,7 +221,6 @@ namespace OpenSim.Data.MySQL
                                 if (items.Count > 0)
                                     rootFolder = items[0];
 
-                                dbcon.Close();
                                 return rootFolder;
                             }
                         }
@@ -265,7 +261,6 @@ namespace OpenSim.Data.MySQL
                                 while (reader.Read())
                                     items.Add(readInventoryFolder(reader));
 
-                                dbcon.Close();
                                 return items;
                             }
                         }
@@ -357,7 +352,6 @@ namespace OpenSim.Data.MySQL
                                 if (reader.Read())
                                     item = readInventoryItem(reader);
 
-                                dbcon.Close();
                                 return item;
                             }
                         }
@@ -423,7 +417,6 @@ namespace OpenSim.Data.MySQL
                                 if (reader.Read())
                                     folder = readInventoryFolder(reader);
 
-                                dbcon.Close();
                                 return folder;
                             }
                         }
@@ -511,7 +504,6 @@ namespace OpenSim.Data.MySQL
                         lock (m_dbLock)
                             result.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (MySqlException e)
@@ -548,7 +540,6 @@ namespace OpenSim.Data.MySQL
                         lock (m_dbLock)
                             cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (MySqlException e)
@@ -609,7 +600,6 @@ namespace OpenSim.Data.MySQL
                         m_log.Error(e.ToString());
                     }
                 }
-                dbcon.Close();
             }
         }
 
@@ -653,7 +643,6 @@ namespace OpenSim.Data.MySQL
                         m_log.Error(e.ToString());
                     }
                 }
-                dbcon.Close();
             }
         }
 
@@ -817,7 +806,6 @@ namespace OpenSim.Data.MySQL
                         lock (m_dbLock)
                             cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (MySqlException e)
@@ -845,7 +833,6 @@ namespace OpenSim.Data.MySQL
                         lock (m_dbLock)
                             cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (MySqlException e)
@@ -899,7 +886,6 @@ namespace OpenSim.Data.MySQL
                                     if (item != null)
                                         list.Add(item);
                                 }
-                                dbcon.Close();
                                 return list;
                             }
                         }

OpenSim/Data/MySQL/MySQLRegionData.cs

@@ -60,7 +60,6 @@ namespace OpenSim.Data.MySQL
                 dbcon.Open();
                 Migration m = new Migration(dbcon, Assembly, "GridStore");
                 m.Update();
-                dbcon.Close();
             }
         }
 
@@ -81,15 +80,17 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public RegionData GetSpecific(string regionName, UUID scopeID)
+        public RegionData Get(int posX, int posY, UUID scopeID)
         {
-            string command = "select * from `" + m_Realm + "` where regionName = ?regionName";
+/* fixed size regions
+            string command = "select * from `"+m_Realm+"` where locX = ?posX and locY = ?posY";
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
             using (MySqlCommand cmd = new MySqlCommand(command))
             {
-                cmd.Parameters.AddWithValue("?regionName", regionName);
+                cmd.Parameters.AddWithValue("?posX", posX.ToString());
+                cmd.Parameters.AddWithValue("?posY", posY.ToString());
                 cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
 
                 List<RegionData> ret = RunCommand(cmd);
@@ -98,11 +99,8 @@ namespace OpenSim.Data.MySQL
 
                 return ret[0];
             }
-
-        }
-
-        public RegionData Get(int posX, int posY, UUID scopeID)
-        {
+*/
+            // extend database search for maximum region size area
             string command = "select * from `" + m_Realm + "` where locX between ?startX and ?endX and locY between ?startY and ?endY";
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
@@ -206,7 +204,7 @@ namespace OpenSim.Data.MySQL
             foreach (RegionData r in dbret)
             {
                 if (r.posX + r.sizeX > startX && r.posX <= endX
-                    && r.posY + r.sizeY > startY && r.posY <= endY)
+                    && r.posY + r.sizeX > startY && r.posY <= endY)
                     ret.Add(r);
             }
             return ret;
@@ -262,8 +260,6 @@ namespace OpenSim.Data.MySQL
                         retList.Add(ret);
                     }
                 }
-                cmd.Connection = null;
-                dbcon.Close();
             }
 
             return retList;

OpenSim/Data/MySQL/MySQLUserProfilesData.cs

@@ -69,7 +69,6 @@ namespace OpenSim.Data.MySQL
                 
                 Migration m = new Migration(dbcon, Assembly, "UserProfiles");
                 m.Update();
-                dbcon.Close();
             }
         }
         #endregion Member Functions
@@ -90,7 +89,7 @@ namespace OpenSim.Data.MySQL
             
             using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
             {
-                const string query = "SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = ?Id";
+                string query = "SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = ?Id";
                 dbcon.Open();
                 using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                 {
@@ -112,7 +111,8 @@ namespace OpenSim.Data.MySQL
                                 }
                                 catch (Exception e)
                                 {
-                                    m_log.ErrorFormat("[PROFILES_DATA] GetClassifiedRecords exception {0}", e.Message);
+                                    m_log.ErrorFormat("[PROFILES_DATA]" +
+                                                     ": UserAccount exception {0}", e.Message);
                                 }
                                 n.Add("classifieduuid", OSD.FromUUID(Id));
                                 n.Add("name", OSD.FromString(Name));
@@ -121,58 +121,58 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
-                dbcon.Close();
             }
             return data;
         }
         
         public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
         {
-             const string query = 
-                "INSERT INTO classifieds ("
-                + "`classifieduuid`,"
-                +  "`creatoruuid`,"
-                +  "`creationdate`,"
-                +  "`expirationdate`,"
-                +  "`category`,"
-                +  "`name`,"
-                +  "`description`,"
-                +  "`parceluuid`,"
-                +  "`parentestate`,"
-                +  "`snapshotuuid`,"
-                +  "`simname`,"
-                +  "`posglobal`,"
-                +  "`parcelname`,"
-                + "`classifiedflags`,"
-                + "`priceforlisting`) "
-                + "VALUES ("
-                + "?ClassifiedId,"
-                + "?CreatorId,"
-                + "?CreatedDate,"
-                + "?ExpirationDate,"
-                + "?Category,"
-                + "?Name,"
-                + "?Description,"
-                + "?ParcelId,"
-                + "?ParentEstate,"
-                + "?SnapshotId,"
-                + "?SimName,"
-                + "?GlobalPos,"
-                + "?ParcelName,"
-                + "?Flags,"
-                + "?ListingPrice ) "
-                + "ON DUPLICATE KEY UPDATE "
-                + "category=?Category, "
-                + "expirationdate=?ExpirationDate, "
-                + "name=?Name, "
-                + "description=?Description, "
-                + "parentestate=?ParentEstate, "
-                + "posglobal=?GlobalPos, "
-                + "parcelname=?ParcelName, "
-                + "classifiedflags=?Flags, "
-                + "priceforlisting=?ListingPrice, "
-                + "snapshotuuid=?SnapshotId"
-                ;
+            string query = string.Empty;
+            
+            
+            query += "INSERT INTO classifieds (";
+            query += "`classifieduuid`,";
+            query += "`creatoruuid`,";
+            query += "`creationdate`,";
+            query += "`expirationdate`,";
+            query += "`category`,";
+            query += "`name`,";
+            query += "`description`,";
+            query += "`parceluuid`,";
+            query += "`parentestate`,";
+            query += "`snapshotuuid`,";
+            query += "`simname`,";
+            query += "`posglobal`,";
+            query += "`parcelname`,";
+            query += "`classifiedflags`,";
+            query += "`priceforlisting`) ";
+            query += "VALUES (";
+            query += "?ClassifiedId,";
+            query += "?CreatorId,";
+            query += "?CreatedDate,";
+            query += "?ExpirationDate,";
+            query += "?Category,";
+            query += "?Name,";
+            query += "?Description,";
+            query += "?ParcelId,";
+            query += "?ParentEstate,";
+            query += "?SnapshotId,";
+            query += "?SimName,";
+            query += "?GlobalPos,";
+            query += "?ParcelName,";
+            query += "?Flags,";
+            query += "?ListingPrice ) ";
+            query += "ON DUPLICATE KEY UPDATE ";
+            query += "category=?Category, ";
+            query += "expirationdate=?ExpirationDate, ";
+            query += "name=?Name, ";
+            query += "description=?Description, ";
+            query += "parentestate=?ParentEstate, ";
+            query += "posglobal=?GlobalPos, ";
+            query += "parcelname=?ParcelName, ";
+            query += "classifiedflags=?Flags, ";
+            query += "priceforlisting=?ListingPrice, ";
+            query += "snapshotuuid=?SnapshotId";
             
             if(string.IsNullOrEmpty(ad.ParcelName))
                 ad.ParcelName = "Unknown";
@@ -228,12 +228,12 @@ namespace OpenSim.Data.MySQL
                         
                         cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: UpdateClassifiedRecord exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": ClassifiedesUpdate exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -242,7 +242,10 @@ namespace OpenSim.Data.MySQL
         
         public bool DeleteClassifiedRecord(UUID recordId)
         {
-            const string query = "DELETE FROM classifieds WHERE classifieduuid = ?recordId";
+            string query = string.Empty;
+            
+            query += "DELETE FROM classifieds WHERE ";
+            query += "classifieduuid = ?recordId";
             
             try
             {
@@ -255,12 +258,12 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?recordId", recordId.ToString());
                         cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: DeleteClassifiedRecord exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": DeleteClassifiedRecord exception {0}", e.Message);
                 return false;
             }
             return true;
@@ -268,8 +271,10 @@ namespace OpenSim.Data.MySQL
         
         public bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result)
         {
+            string query = string.Empty;
             
-            const string query = "SELECT * FROM classifieds WHERE classifieduuid = ?AdId";
+            query += "SELECT * FROM classifieds WHERE ";
+            query += "classifieduuid = ?AdId";
             
             try
             {
@@ -307,7 +312,8 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: GetClassifiedInfo exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": GetPickInfo exception {0}", e.Message);
             }
             return true;
         }
@@ -316,8 +322,10 @@ namespace OpenSim.Data.MySQL
         #region Picks Queries
         public OSDArray GetAvatarPicks(UUID avatarId)
         {
-            const string query = "SELECT `pickuuid`,`name` FROM userpicks WHERE creatoruuid = ?Id";
+            string query = string.Empty;
             
+            query += "SELECT `pickuuid`,`name` FROM userpicks WHERE ";
+            query += "creatoruuid = ?Id";
             OSDArray data = new OSDArray();
             
             try
@@ -344,20 +352,24 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: GetAvatarPicks exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": GetAvatarPicks exception {0}", e.Message);
             }
             return data;
         }
         
         public UserProfilePick GetPickInfo(UUID avatarId, UUID pickId)
         {
+            string query = string.Empty;
             UserProfilePick pick = new UserProfilePick();
-            const string query = "SELECT * FROM userpicks WHERE creatoruuid = ?CreatorId AND pickuuid =  ?PickId";
+            
+            query += "SELECT * FROM userpicks WHERE ";
+            query += "creatoruuid = ?CreatorId AND ";
+            query += "pickuuid =  ?PickId";
             
             try
             {
@@ -402,40 +414,41 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: GetPickInfo exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": GetPickInfo exception {0}", e.Message);
             }
             return pick;
         }
         
         public bool UpdatePicksRecord(UserProfilePick pick)
         {       
-            const string query =
-                "INSERT INTO userpicks VALUES ("
-                + "?PickId,"
-                + "?CreatorId,"
-                + "?TopPick,"
-                + "?ParcelId,"
-                + "?Name,"
-                + "?Desc,"
-                + "?SnapshotId,"
-                + "?User,"
-                + "?Original,"
-                + "?SimName,"
-                + "?GlobalPos,"
-                + "?SortOrder,"
-                + "?Enabled,"
-                + "?Gatekeeper)"
-                + "ON DUPLICATE KEY UPDATE "
-                + "parceluuid=?ParcelId,"
-                + "name=?Name,"
-                + "description=?Desc,"
-                + "user=?User,"
-                + "simname=?SimName,"
-                + "snapshotuuid=?SnapshotId,"
-                + "pickuuid=?PickId,"
-                + "posglobal=?GlobalPos,"
-                + "gatekeeper=?Gatekeeper"
-                ;
+            string query = string.Empty;
+            
+            query += "INSERT INTO userpicks VALUES (";
+            query += "?PickId,";
+            query += "?CreatorId,";
+            query += "?TopPick,";
+            query += "?ParcelId,";
+            query += "?Name,";
+            query += "?Desc,";
+            query += "?SnapshotId,";
+            query += "?User,";
+            query += "?Original,";
+            query += "?SimName,";
+            query += "?GlobalPos,";
+            query += "?SortOrder,";
+            query += "?Enabled,";
+            query += "?Gatekeeper)";
+            query += "ON DUPLICATE KEY UPDATE ";
+            query += "parceluuid=?ParcelId,";
+            query += "name=?Name,";
+            query += "description=?Desc,";
+            query += "user=?User,";
+            query += "simname=?SimName,";
+            query += "snapshotuuid=?SnapshotId,";
+            query += "pickuuid=?PickId,";
+            query += "posglobal=?GlobalPos,";
+            query += "gatekeeper=?Gatekeeper";
             
             try
             {
@@ -461,12 +474,12 @@ namespace OpenSim.Data.MySQL
                         
                         cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: UpdatePicksRecord exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": UpdateAvatarNotes exception {0}", e.Message);
                 return false;
             }
             return true;
@@ -474,7 +487,10 @@ namespace OpenSim.Data.MySQL
         
         public bool DeletePicksRecord(UUID pickId)
         {
-            string query = "DELETE FROM userpicks WHERE pickuuid = ?PickId";
+            string query = string.Empty;
+            
+            query += "DELETE FROM userpicks WHERE ";
+            query += "pickuuid = ?PickId";
             
             try
             {
@@ -488,12 +504,12 @@ namespace OpenSim.Data.MySQL
                         
                         cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: DeletePicksRecord exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": DeleteUserPickRecord exception {0}", e.Message);
                 return false;
             }
             return true;
@@ -503,7 +519,12 @@ namespace OpenSim.Data.MySQL
         #region Avatar Notes Queries
         public bool GetAvatarNotes(ref UserProfileNotes notes)
         {  // WIP
-            const string query = "SELECT `notes` FROM usernotes WHERE useruuid = ?Id AND targetuuid = ?TargetId";
+            string query = string.Empty;
+            
+            query += "SELECT `notes` FROM usernotes WHERE ";
+            query += "useruuid = ?Id AND ";
+            query += "targetuuid = ?TargetId";
+            OSDArray data = new OSDArray();
             
             try
             {
@@ -528,37 +549,38 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: GetAvatarNotes exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": GetAvatarNotes exception {0}", e.Message);
             }
             return true;
         }
         
         public bool UpdateAvatarNotes(ref UserProfileNotes note, ref string result)
         {          
-            string query;
+            string query = string.Empty;
             bool remove;
             
             if(string.IsNullOrEmpty(note.Notes))
             {
                 remove = true;
-                query = "DELETE FROM usernotes WHERE useruuid=?UserId AND targetuuid=?TargetId";
+                query += "DELETE FROM usernotes WHERE ";
+                query += "useruuid=?UserId AND ";
+                query += "targetuuid=?TargetId";
             }
             else
             {
                 remove = false;
-                query = "INSERT INTO usernotes VALUES (" 
-                    + "?UserId,"
-                    + "?TargetId,"
-                    + "?Notes )"
-                    + "ON DUPLICATE KEY "
-                    + "UPDATE "
-                    + "notes=?Notes"
-                    ;
+                query += "INSERT INTO usernotes VALUES ( ";
+                query += "?UserId,";
+                query += "?TargetId,";
+                query += "?Notes )";
+                query += "ON DUPLICATE KEY ";
+                query += "UPDATE ";
+                query += "notes=?Notes";
             }
             
             try
@@ -575,12 +597,12 @@ namespace OpenSim.Data.MySQL
                         
                         cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarNotes exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": UpdateAvatarNotes exception {0}", e.Message);
                 return false;
             }
             return true;
@@ -591,7 +613,10 @@ namespace OpenSim.Data.MySQL
         #region Avatar Properties
         public bool GetAvatarProperties(ref UserProfileProperties props, ref string result)
         {
-            string query = "SELECT * FROM userprofile WHERE useruuid = ?Id";
+            string query = string.Empty;
+            
+            query += "SELECT * FROM userprofile WHERE ";
+            query += "useruuid = ?Id";
             
             try
             {
@@ -640,36 +665,35 @@ namespace OpenSim.Data.MySQL
                                 props.PublishProfile = false;
                                 props.PublishMature = false;
 
-                                query = "INSERT INTO userprofile ("
-                                    + "useruuid, "
-                                    + "profilePartner, "
-                                    + "profileAllowPublish, "
-                                    + "profileMaturePublish, "
-                                    + "profileURL, "
-                                    + "profileWantToMask, "
-                                    + "profileWantToText, "
-                                    + "profileSkillsMask, "
-                                    + "profileSkillsText, "
-                                    + "profileLanguages, "
-                                    + "profileImage, "
-                                    + "profileAboutText, "
-                                    + "profileFirstImage, "
-                                    + "profileFirstText) VALUES ("
-                                    + "?userId, "
-                                    + "?profilePartner, "
-                                    + "?profileAllowPublish, "
-                                    + "?profileMaturePublish, "
-                                    + "?profileURL, "
-                                    + "?profileWantToMask, "
-                                    + "?profileWantToText, "
-                                    + "?profileSkillsMask, "
-                                    + "?profileSkillsText, "
-                                    + "?profileLanguages, "
-                                    + "?profileImage, "
-                                    + "?profileAboutText, "
-                                    + "?profileFirstImage, "
-                                    + "?profileFirstText)"
-                                    ;
+                                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 += "?userId, ";
+                                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)";
 
                                 dbcon.Close();
                                 dbcon.Open();
@@ -696,12 +720,12 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: GetAvatarProperties exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": Requst properties exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -710,10 +734,15 @@ namespace OpenSim.Data.MySQL
         
         public bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result)
         {            
-            const string query = "UPDATE userprofile SET profileURL=?profileURL,"
-                + "profileImage=?image, profileAboutText=?abouttext,"
-                + "profileFirstImage=?firstlifeimage, profileFirstText=?firstlifetext "
-                + "WHERE useruuid=?uuid";
+            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";
             
             try
             {
@@ -731,12 +760,12 @@ namespace OpenSim.Data.MySQL
                         
                         cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarProperties exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": AgentPropertiesUpdate exception {0}", e.Message);
                 
                 return false;
             }
@@ -747,13 +776,15 @@ namespace OpenSim.Data.MySQL
         #region Avatar Interests
         public bool UpdateAvatarInterests(UserProfileProperties up, ref string result)
         {           
-            const string query = "UPDATE userprofile SET "
-                + "profileWantToMask=?WantMask, "
-                + "profileWantToText=?WantText,"
-                + "profileSkillsMask=?SkillsMask,"
-                + "profileSkillsText=?SkillsText, "
-                + "profileLanguages=?Languages "
-                + "WHERE useruuid=?uuid";
+            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";
             
             try
             {
@@ -775,7 +806,8 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarInterests exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": AgentInterestsUpdate exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -786,17 +818,18 @@ namespace OpenSim.Data.MySQL
         public OSDArray GetUserImageAssets(UUID avatarId)
         {
             OSDArray data = new OSDArray();
-            const string queryA = "SELECT `snapshotuuid` FROM {0} WHERE `creatoruuid` = ?Id";
+            string query = "SELECT `snapshotuuid` FROM {0} WHERE `creatoruuid` = ?Id";
 
             // Get classified image assets
             
+            
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand cmd = new MySqlCommand(string.Format (queryA,"`classifieds`"), dbcon))
+                    using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`classifieds`"), dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
                         
@@ -815,7 +848,7 @@ namespace OpenSim.Data.MySQL
                     dbcon.Close();
                     dbcon.Open();
 
-                    using (MySqlCommand cmd = new MySqlCommand(string.Format (queryA,"`userpicks`"), dbcon))
+                    using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`userpicks`"), dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
                         
@@ -834,9 +867,9 @@ namespace OpenSim.Data.MySQL
                     dbcon.Close();
                     dbcon.Open();
 
-                    const string queryB = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = ?Id";
+                    query = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = ?Id";
 
-                    using (MySqlCommand cmd = new MySqlCommand(queryB, dbcon))
+                    using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`userpicks`"), dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
                         
@@ -852,12 +885,12 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: GetUserImageAssets exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                  ": GetAvatarNotes exception {0}", e.Message);
             }
             return data;
         }
@@ -865,7 +898,13 @@ namespace OpenSim.Data.MySQL
         #region User Preferences
         public bool GetUserPreferences(ref UserPreferences pref, ref string result)
         {
-            const string query = "SELECT imviaemail,visible,email FROM usersettings WHERE useruuid = ?Id";
+            string query = string.Empty;
+
+            query += "SELECT imviaemail,visible,email FROM ";
+            query += "usersettings WHERE ";
+            query += "useruuid = ?Id";
+
+            OSDArray data = new OSDArray();
 
             try
             {
@@ -889,9 +928,10 @@ namespace OpenSim.Data.MySQL
                                 dbcon.Close();
                                 dbcon.Open();
 
-                                const string queryB = "INSERT INTO usersettings VALUES (?uuid,'false','false', ?Email)";
+                                query = "INSERT INTO usersettings VALUES ";
+                                query += "(?uuid,'false','false', ?Email)";
 
-                                using (MySqlCommand put = new MySqlCommand(queryB, dbcon))
+                                using (MySqlCommand put = new MySqlCommand(query, dbcon))
                                 {
 
                                     put.Parameters.AddWithValue("?Email", pref.EMail);
@@ -902,12 +942,12 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: GetUserPreferences exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": Get preferences exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -916,9 +956,13 @@ namespace OpenSim.Data.MySQL
 
         public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
         {
-            const string query = "UPDATE usersettings SET imviaemail=?ImViaEmail," 
-                + "visible=?Visible, email=?EMail "
-                + "WHERE useruuid=?uuid";
+            string query = string.Empty;
+
+            query += "UPDATE usersettings SET ";
+            query += "imviaemail=?ImViaEmail, ";
+            query += "visible=?Visible, ";
+            query += "email=?EMail ";
+            query += "WHERE useruuid=?uuid";
 
             try
             {
@@ -934,12 +978,12 @@ namespace OpenSim.Data.MySQL
 
                         cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: UpdateUserPreferences exception {0} {1}", e.Message, e.InnerException);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                    ": UserPreferencesUpdate exception {0} {1}", e.Message, e.InnerException);
                 result = e.Message;
                 return false;
             }
@@ -950,7 +994,11 @@ namespace OpenSim.Data.MySQL
         #region Integration
         public bool GetUserAppData(ref UserAppData props, ref string result)
         {
-            const string query = "SELECT * FROM `userdata` WHERE UserId = ?Id AND TagId = ?TagId";
+            string query = string.Empty;
+            
+            query += "SELECT * FROM `userdata` WHERE ";
+            query += "UserId = ?Id AND ";
+            query += "TagId = ?TagId";
             
             try
             {
@@ -972,8 +1020,13 @@ namespace OpenSim.Data.MySQL
                             }
                             else
                             {
-                                const string queryB = "INSERT INTO userdata VALUES (?UserId, ?TagId, ?DataKey, ?DataVal)";
-                                using (MySqlCommand put = new MySqlCommand(queryB, dbcon))
+                                query += "INSERT INTO userdata VALUES ( ";
+                                query += "?UserId,";
+                                query += "?TagId,";
+                                query += "?DataKey,";
+                                query +=  "?DataVal) ";
+                                
+                                using (MySqlCommand put = new MySqlCommand(query, dbcon))
                                 {
                                     put.Parameters.AddWithValue("?UserId", props.UserId.ToString());
                                     put.Parameters.AddWithValue("?TagId", props.TagId.ToString());
@@ -985,12 +1038,12 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: GetUserAppData exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": Requst application data exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -999,7 +1052,14 @@ namespace OpenSim.Data.MySQL
 
         public bool SetUserAppData(UserAppData props, ref string result)
         {         
-            const string query = "UPDATE userdata SET TagId = ?TagId, DataKey = ?DataKey, DataVal = ?DataVal WHERE UserId = ?UserId AND TagId = ?TagId";
+            string query = string.Empty;
+            
+            query += "UPDATE userdata SET ";
+            query += "TagId = ?TagId, ";
+            query += "DataKey = ?DataKey, ";
+            query += "DataVal = ?DataVal WHERE ";
+            query += "UserId = ?UserId AND ";
+            query += "TagId = ?TagId";
             
             try
             {
@@ -1015,12 +1075,12 @@ namespace OpenSim.Data.MySQL
 
                         cmd.ExecuteNonQuery();
                     }
-                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]: SetUserAppData exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]" +
+                                 ": SetUserData exception {0}", e.Message);
                 return false;
             }
             return true;

OpenSim/Data/MySQL/MySQLXAssetData.cs

@@ -58,6 +58,11 @@ namespace OpenSim.Data.MySQL
         private bool m_enableCompression = false;
         private string m_connectionString;
 
+        /// <summary>
+        /// We can reuse this for all hashing since all methods are single-threaded through m_dbBLock
+        /// </summary>
+        private HashAlgorithm hasher = new SHA256CryptoServiceProvider();
+
         #region IPlugin Members
 
         public string Version { get { return "1.0.0.0"; } }
@@ -92,7 +97,6 @@ namespace OpenSim.Data.MySQL
                 dbcon.Open();
                 Migration m = new Migration(dbcon, Assembly, "XAssetStore");
                 m.Update();
-                dbcon.Close();
             }
         }
 
@@ -126,7 +130,6 @@ namespace OpenSim.Data.MySQL
 //            m_log.DebugFormat("[MYSQL XASSET DATA]: Looking for asset {0}", assetID);
 
             AssetBase asset = null;
-            int accessTime = 0;
 
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -137,6 +140,7 @@ namespace OpenSim.Data.MySQL
                     dbcon))
                 {
                     cmd.Parameters.AddWithValue("?ID", assetID.ToString());
+
                     try
                     {
                         using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
@@ -155,7 +159,23 @@ namespace OpenSim.Data.MySQL
 
                                 asset.Temporary = Convert.ToBoolean(dbReader["Temporary"]);
                                 asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
-                                accessTime = (int)dbReader["AccessTime"];
+
+                                if (m_enableCompression)
+                                {
+                                    using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress))
+                                    {
+                                        MemoryStream outputStream = new MemoryStream();
+                                        WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
+//                                        int compressedLength = asset.Data.Length;
+                                        asset.Data = outputStream.ToArray();
+
+//                                        m_log.DebugFormat(
+//                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
+//                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
+                                    }
+                                }
+
+                                UpdateAccessTime(asset.Metadata, (int)dbReader["AccessTime"]);
                             }
                         }
                     }
@@ -164,37 +184,8 @@ namespace OpenSim.Data.MySQL
                         m_log.Error(string.Format("[MYSQL XASSET DATA]: Failure fetching asset {0}", assetID), e);
                     }
                 }
-                dbcon.Close();
             }
 
-            if(asset == null)
-                return asset;
-
-            if(accessTime > 0)
-            {
-                try
-                {
-                    UpdateAccessTime(asset.Metadata, accessTime);
-                }
-                catch { }
-            }
-
-            if (m_enableCompression && asset.Data != null)
-            {
-                using(MemoryStream ms = new MemoryStream(asset.Data))
-                using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress))
-                {
-                    using(MemoryStream outputStream = new MemoryStream())
-                    {
-                        decompressionStream.CopyTo(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);
-                }                             
-            }
             return asset;
         }
 
@@ -245,9 +236,7 @@ namespace OpenSim.Data.MySQL
                         }
                     }
 
-                    byte[] hash;
-                    using (HashAlgorithm hasher = new SHA256CryptoServiceProvider())
-                        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}",
@@ -314,7 +303,6 @@ namespace OpenSim.Data.MySQL
 
                     transaction.Commit();
                 }
-                dbcon.Close();
             }
         }
 
@@ -356,7 +344,6 @@ namespace OpenSim.Data.MySQL
                         "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}", 
                         assetMetadata.ID, assetMetadata.Name);
                 }
-                dbcon.Close();
             }
         }
 
@@ -453,8 +440,7 @@ namespace OpenSim.Data.MySQL
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
-                using(MySqlCommand cmd = new MySqlCommand("SELECT Name, Description, AccessTime, AssetType, Temporary, ID, AssetFlags, CreatorID FROM XAssetsMeta LIMIT ?start, ?count",dbcon))
-                {
+                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);
 
@@ -487,8 +473,6 @@ namespace OpenSim.Data.MySQL
                     m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
                 }
             }
-                dbcon.Close();
-            }
 
             return retList;
         }
@@ -506,9 +490,9 @@ namespace OpenSim.Data.MySQL
                     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 (?)
-                dbcon.Close();
             }
 
             return true;

OpenSim/Data/MySQL/MySQLXInventoryData.cs

@@ -193,9 +193,7 @@ namespace OpenSim.Data.MySQL
         {
             using (MySqlCommand cmd  = new MySqlCommand())
             {
-//                cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags & 1", m_Realm);
-
-                cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags & 1");
+                cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags & 1", m_Realm);
 
                 cmd.Parameters.AddWithValue("?uuid", principalID.ToString());
                 cmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture);
@@ -214,10 +212,7 @@ namespace OpenSim.Data.MySQL
                 {
                     cmd.Connection = dbcon;
 
-//                    cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = ?PrincipalID and assetID = ?AssetID group by assetID", m_Realm);
-
-                    cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = ?PrincipalID and assetID = ?AssetID group by assetID");
-
+                    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.AddWithValue("?PrincipalID", principalID.ToString());
                     cmd.Parameters.AddWithValue("?AssetID", assetID.ToString());
                 
@@ -328,6 +323,7 @@ namespace OpenSim.Data.MySQL
                     {
                         return false;
                     }
+                    cmd.Dispose();
                 }
 
                 dbcon.Close();

OpenSim/Data/MySQL/Properties/AssemblyInfo.cs

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

OpenSim/Data/MySQL/Resources/AssetStore.migrations

@@ -1,21 +1,81 @@
 # -----------------
-:VERSION 10
+:VERSION 1
 
 BEGIN;
 
-CREATE TABLE IF NOT EXISTS `assets` (
+CREATE TABLE `assets` (
+  `id` binary(16) NOT NULL,
   `name` varchar(64) NOT NULL,
   `description` varchar(64) NOT NULL,
   `assetType` tinyint(4) NOT NULL,
+  `invType` tinyint(4) NOT NULL,
   `local` tinyint(1) NOT NULL,
   `temporary` tinyint(1) NOT NULL,
   `data` longblob NOT NULL,
-  `id` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `create_time` int(11) DEFAULT '0',
-  `access_time` int(11) DEFAULT '0',
-  `asset_flags` int(11) NOT NULL DEFAULT '0',
-  `CreatorID` varchar(128) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
 
 COMMIT;
+
+# -----------------
+:VERSION 2
+
+BEGIN;
+
+ALTER TABLE assets change id oldid binary(16);
+ALTER TABLE assets add id varchar(36) not null default '';
+UPDATE assets set id = concat(substr(hex(oldid),1,8),"-",substr(hex(oldid),9,4),"-",substr(hex(oldid),13,4),"-",substr(hex(oldid),17,4),"-",substr(hex(oldid),21,12));
+ALTER TABLE assets drop oldid;
+ALTER TABLE assets add constraint primary key(id);
+
+COMMIT;
+
+# -----------------
+:VERSION 3
+
+BEGIN;
+
+ALTER TABLE assets change id oldid varchar(36);
+ALTER TABLE assets add id char(36) not null default '00000000-0000-0000-0000-000000000000';
+UPDATE assets set id = oldid;
+ALTER TABLE assets drop oldid;
+ALTER TABLE assets add constraint primary key(id);
+
+COMMIT;
+
+# -----------------
+:VERSION 4
+
+BEGIN;
+
+ALTER TABLE assets drop InvType;
+
+COMMIT;
+
+# -----------------
+:VERSION 5
+
+BEGIN;
+
+ALTER TABLE assets add create_time integer default 0;
+ALTER TABLE assets add access_time integer default 0;
+
+COMMIT;
+
+# -----------------
+:VERSION 6
+
+DELETE FROM assets WHERE id = 'dc4b9f0b-d008-45c6-96a4-01dd947ac621'
+
+:VERSION 7
+
+ALTER TABLE assets ADD COLUMN asset_flags INTEGER NOT NULL DEFAULT 0;
+
+:VERSION 8
+
+ALTER TABLE assets ADD COLUMN CreatorID varchar(128) NOT NULL DEFAULT '';
+
+:VERSION 9
+
+BEGIN;
+COMMIT;

OpenSim/Data/MySQL/Resources/AuthStore.migrations

@@ -1,17 +1,16 @@
-:VERSION 4         # -------------------------------
+:VERSION 1         # -------------------------------
 
 begin;
 
-CREATE TABLE IF NOT EXISTS `auth` (
+CREATE TABLE `auth` (
   `UUID` char(36) NOT NULL,
-  `passwordHash` char(32) NOT NULL DEFAULT '',
-  `passwordSalt` char(32) NOT NULL DEFAULT '',
-  `webLoginKey` varchar(255) NOT NULL DEFAULT '',
-  `accountType` varchar(32) NOT NULL DEFAULT 'UserAccount',
+  `passwordHash` char(32) NOT NULL default '',
+  `passwordSalt` char(32) NOT NULL default '',
+  `webLoginKey` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`UUID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
-CREATE TABLE IF NOT EXISTS `tokens` (
+CREATE TABLE `tokens` (
   `UUID` char(36) NOT NULL,
   `token` varchar(255) NOT NULL,
   `validity` datetime NOT NULL,
@@ -19,6 +18,22 @@ CREATE TABLE IF NOT EXISTS `tokens` (
   KEY `UUID` (`UUID`),
   KEY `token` (`token`),
   KEY `validity` (`validity`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
+
+commit;
+
+:VERSION 2         # -------------------------------
+
+BEGIN;
+
+INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey) SELECT `UUID` AS UUID, `passwordHash` AS passwordHash, `passwordSalt` AS passwordSalt, `webLoginKey` AS webLoginKey FROM users;
+
+COMMIT;
+
+:VERSION 3         # -------------------------------
+
+BEGIN;
+
+ALTER TABLE `auth` ADD COLUMN `accountType` VARCHAR(32) NOT NULL DEFAULT 'UserAccount';
 
 COMMIT;

OpenSim/Data/MySQL/Resources/Avatar.migrations

@@ -1,13 +1,20 @@
-:VERSION 3
+:VERSION 1
 
 BEGIN;
 
-CREATE TABLE IF NOT EXISTS `Avatars` (
-  `PrincipalID` char(36) NOT NULL,
-  `Name` varchar(32) NOT NULL,
-  `Value` text,
-  PRIMARY KEY (`PrincipalID`,`Name`),
-  KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE Avatars (
+	PrincipalID CHAR(36) NOT NULL, 
+	Name VARCHAR(32) NOT NULL, 
+	Value VARCHAR(255) NOT NULL DEFAULT '', 
+	PRIMARY KEY(PrincipalID, Name), 
+	KEY(PrincipalID));
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN;
+
+alter table Avatars change column Value Value text;
 
 COMMIT;

OpenSim/Data/MySQL/Resources/EstateStore.migrations

@@ -1,29 +1,41 @@
-:VERSION 34
+:VERSION 13
+
+# The estate migrations used to be in Region store
+# here they will do nothing (bad) if the tables are already there, 
+# just update the store version.
 
 BEGIN;
 
-CREATE TABLE IF NOT EXISTS `estate_groups` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `uuid` char(36) NOT NULL,
-  KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 CREATE TABLE IF NOT EXISTS `estate_managers` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
-CREATE TABLE IF NOT EXISTS `estate_map` (
-  `RegionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `EstateID` int(11) NOT NULL,
-  PRIMARY KEY (`RegionID`),
+CREATE TABLE IF NOT EXISTS `estate_groups` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `estate_users` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `uuid` char(36) NOT NULL,
+  KEY `EstateID` (`EstateID`)
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `estateban` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `bannedUUID` varchar(36) NOT NULL,
+  `bannedIp` varchar(16) NOT NULL,
+  `bannedIpHostMask` varchar(16) NOT NULL,
+  `bannedNameMask` varchar(64) default NULL,
+  KEY `estateban_EstateID` (`EstateID`)
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `estate_settings` (
-  `EstateID` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `EstateName` varchar(64) DEFAULT NULL,
+  `EstateID` int(10) unsigned NOT NULL auto_increment,
+  `EstateName` varchar(64) default NULL,
   `AbuseEmailToEstateOwner` tinyint(4) NOT NULL,
   `DenyAnonymous` tinyint(4) NOT NULL,
   `ResetHomeOnTeleport` tinyint(4) NOT NULL,
@@ -43,41 +55,33 @@ CREATE TABLE IF NOT EXISTS `estate_settings` (
   `EstateSkipScripts` tinyint(4) NOT NULL,
   `BillableFactor` float NOT NULL,
   `PublicAccess` tinyint(4) NOT NULL,
-  `AbuseEmail` varchar(255) NOT NULL,
-  `EstateOwner` varchar(36) NOT NULL,
-  `DenyMinors` tinyint(4) NOT NULL,
-  `AllowLandmark` tinyint(4) NOT NULL DEFAULT '1',
-  `AllowParcelChanges` tinyint(4) NOT NULL DEFAULT '1',
-  `AllowSetHome` tinyint(4) NOT NULL DEFAULT '1',
+  `AbuseEmail` varchar(255) not null,
+  `EstateOwner` varchar(36) not null,
+  `DenyMinors` tinyint not null,
+  
   PRIMARY KEY  (`EstateID`)
-) ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=100;
 
-CREATE TABLE IF NOT EXISTS `estate_users` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `uuid` char(36) NOT NULL,
+CREATE TABLE IF NOT EXISTS `estate_map` (
+  `RegionID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `EstateID` int(11) NOT NULL,
+  PRIMARY KEY  (`RegionID`),
   KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE IF NOT EXISTS `estateban` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `bannedUUID` varchar(36) NOT NULL,
-  `bannedIp` varchar(16) NOT NULL,
-  `bannedIpHostMask` varchar(16) NOT NULL,
-  `bannedNameMask` varchar(64) DEFAULT NULL,
-  KEY `estateban_EstateID` (`EstateID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 COMMIT;
 
-:VERSION 35
+:VERSION 32			#--------------------- (moved from RegionStore migr, just in case)
+
 BEGIN;
-ALTER TABLE `estateban`
-    ADD COLUMN `banningUUID` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    ADD COLUMN `banTime` int(11) NOT NULL DEFAULT 0;
+ALTER TABLE estate_settings AUTO_INCREMENT = 100;
 COMMIT;
 
-:VERSION 36
+:VERSION 33			#--------------------- 
+
 BEGIN;
-ALTER TABLE `estate_settings`
-    ADD COLUMN `AllowEnviromentOverride` tinyint(4) NOT NULL DEFAULT '0';
+ALTER TABLE estate_settings ADD COLUMN `AllowLandmark` tinyint(4) NOT NULL default '1';
+ALTER TABLE estate_settings ADD COLUMN `AllowParcelChanges` tinyint(4) NOT NULL default '1';
+ALTER TABLE estate_settings ADD COLUMN `AllowSetHome` tinyint(4) NOT NULL default '1';
 COMMIT;
+

OpenSim/Data/MySQL/Resources/FriendsStore.migrations

@@ -1,14 +1,32 @@
-:VERSION 4       # -------------------------
+:VERSION 1       # -------------------------
 
 BEGIN;
 
-CREATE TABLE IF NOT EXISTS `Friends` (
-  `PrincipalID` varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `Friend` varchar(255) NOT NULL,
-  `Flags` varchar(16) NOT NULL DEFAULT '0',
-  `Offered` varchar(32) NOT NULL DEFAULT '0',
-  PRIMARY KEY (`PrincipalID`(36),`Friend`(36)),
-  KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE `Friends` (
+	`PrincipalID` CHAR(36) NOT NULL, 
+	`Friend` VARCHAR(255) NOT NULL, 
+	`Flags` VARCHAR(16) NOT NULL DEFAULT 0, 
+	`Offered` VARCHAR(32) NOT NULL DEFAULT 0, 
+	PRIMARY KEY(`PrincipalID`, `Friend`), 
+	KEY(`PrincipalID`)
+) ENGINE=InnoDB;
+
+COMMIT;
+
+:VERSION 2       # -------------------------
+
+BEGIN;
+
+INSERT INTO `Friends` SELECT `ownerID`, `friendID`, `friendPerms`, 0 FROM `userfriends`;
+
+COMMIT;
+
+:VERSION 3       # -------------------------
+
+BEGIN;
+
+ALTER TABLE `Friends` MODIFY COLUMN PrincipalID varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+ALTER TABLE `Friends` DROP PRIMARY KEY;
+ALTER TABLE `Friends` ADD PRIMARY KEY(PrincipalID(36), Friend(36));
 
 COMMIT;

OpenSim/Data/MySQL/Resources/GridStore.migrations

@@ -1,52 +1,105 @@
-:VERSION 10
+:VERSION 1
 
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS `regions` (
+CREATE TABLE `regions` (
   `uuid` varchar(36) NOT NULL,
   `regionHandle` bigint(20) unsigned NOT NULL,
-  `regionName` varchar(128) DEFAULT NULL,
-  `regionRecvKey` varchar(128) DEFAULT NULL,
-  `regionSendKey` varchar(128) DEFAULT NULL,
-  `regionSecret` varchar(128) DEFAULT NULL,
-  `regionDataURI` varchar(255) DEFAULT NULL,
-  `serverIP` varchar(64) DEFAULT NULL,
-  `serverPort` int(10) unsigned DEFAULT NULL,
-  `serverURI` varchar(255) DEFAULT NULL,
-  `locX` int(10) unsigned DEFAULT NULL,
-  `locY` int(10) unsigned DEFAULT NULL,
-  `locZ` int(10) unsigned DEFAULT NULL,
-  `eastOverrideHandle` bigint(20) unsigned DEFAULT NULL,
-  `westOverrideHandle` bigint(20) unsigned DEFAULT NULL,
-  `southOverrideHandle` bigint(20) unsigned DEFAULT NULL,
-  `northOverrideHandle` bigint(20) unsigned DEFAULT NULL,
-  `regionAssetURI` varchar(255) DEFAULT NULL,
-  `regionAssetRecvKey` varchar(128) DEFAULT NULL,
-  `regionAssetSendKey` varchar(128) DEFAULT NULL,
-  `regionUserURI` varchar(255) DEFAULT NULL,
-  `regionUserRecvKey` varchar(128) DEFAULT NULL,
-  `regionUserSendKey` varchar(128) DEFAULT NULL,
-  `regionMapTexture` varchar(36) DEFAULT NULL,
-  `serverHttpPort` int(10) DEFAULT NULL,
-  `serverRemotingPort` int(10) DEFAULT NULL,
-  `owner_uuid` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `originUUID` varchar(36) DEFAULT NULL,
-  `access` int(10) unsigned DEFAULT '1',
-  `ScopeID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `sizeX` int(11) NOT NULL DEFAULT '0',
-  `sizeY` int(11) NOT NULL DEFAULT '0',
-  `flags` int(11) NOT NULL DEFAULT '0',
-  `last_seen` int(11) NOT NULL DEFAULT '0',
-  `PrincipalID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `Token` varchar(255) NOT NULL,
-  `parcelMapTexture` varchar(36) DEFAULT NULL,
+  `regionName` varchar(32) default NULL,
+  `regionRecvKey` varchar(128) default NULL,
+  `regionSendKey` varchar(128) default NULL,
+  `regionSecret` varchar(128) default NULL,
+  `regionDataURI` varchar(255) default NULL,
+  `serverIP` varchar(64) default NULL,
+  `serverPort` int(10) unsigned default NULL,
+  `serverURI` varchar(255) default NULL,
+  `locX` int(10) unsigned default NULL,
+  `locY` int(10) unsigned default NULL,
+  `locZ` int(10) unsigned default NULL,
+  `eastOverrideHandle` bigint(20) unsigned default NULL,
+  `westOverrideHandle` bigint(20) unsigned default NULL,
+  `southOverrideHandle` bigint(20) unsigned default NULL,
+  `northOverrideHandle` bigint(20) unsigned default NULL,
+  `regionAssetURI` varchar(255) default NULL,
+  `regionAssetRecvKey` varchar(128) default NULL,
+  `regionAssetSendKey` varchar(128) default NULL,
+  `regionUserURI` varchar(255) default NULL,
+  `regionUserRecvKey` varchar(128) default NULL,
+  `regionUserSendKey` varchar(128) default NULL, `regionMapTexture` varchar(36) default NULL,
+  `serverHttpPort` int(10) default NULL, `serverRemotingPort` int(10) default NULL,
+  `owner_uuid` varchar(36) default '00000000-0000-0000-0000-000000000000' not null,
+  `originUUID` varchar(36),
   PRIMARY KEY  (`uuid`),
   KEY `regionName` (`regionName`),
   KEY `regionHandle` (`regionHandle`),
-  KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`),
-  KEY `ScopeID` (`ScopeID`),
-  KEY `flags` (`flags`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Rev. 3';
+
+:VERSION 2
+
+BEGIN;
+
+ALTER TABLE regions add column access integer unsigned default 1;
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN;
+
+ALTER TABLE regions add column ScopeID char(36) not null default '00000000-0000-0000-0000-000000000000';
+
+create index ScopeID on regions(ScopeID);
+
+COMMIT;
+
+:VERSION 4
+
+BEGIN;
+
+ALTER TABLE regions add column sizeX integer not null default 0;
+ALTER TABLE regions add column sizeY integer not null default 0;
+
+COMMIT;
+
+:VERSION 5
+
+BEGIN;
+
+ALTER TABLE `regions` ADD COLUMN `flags` integer NOT NULL DEFAULT 0;
+CREATE INDEX flags ON regions(flags);
+
+COMMIT;
+
+:VERSION 6
+
+BEGIN;
+
+ALTER TABLE `regions` ADD COLUMN `last_seen` integer NOT NULL DEFAULT 0;
+
+COMMIT;
+
+:VERSION 7
+
+BEGIN;
+
+ALTER TABLE `regions` ADD COLUMN `PrincipalID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+ALTER TABLE `regions` ADD COLUMN `Token` varchar(255) NOT NULL;
+
+COMMIT;
+
+
+:VERSION 8		# ------------
+
+BEGIN;
+
+alter table regions modify column regionName varchar(128) default NULL;
+
+COMMIT;
+
+:VERSION 9      # ------------
+
+BEGIN;
+
+alter table regions add column `parcelMapTexture` varchar(36) default NULL;
 
 COMMIT;
 

OpenSim/Data/MySQL/Resources/HGTravelStore.migrations

@@ -16,9 +16,3 @@ CREATE TABLE `hg_traveling_data` (
 
 COMMIT;
 
-:VERSION 2         # -------------------------- 
-
-ALTER TABLE `hg_traveling_data` MODIFY `TMStamp` timestamp NOT NULL default CURRENT_TIMESTAMP;
-
-COMMIT;
-

OpenSim/Data/MySQL/Resources/IM_Store.migrations

@@ -1,16 +1,42 @@
-:VERSION 5         # -------------------------- 
+:VERSION 1         # -------------------------- 
 
 BEGIN;
 
-CREATE TABLE IF NOT EXISTS `im_offline` (
-  `ID` mediumint(9) NOT NULL AUTO_INCREMENT,
-  `PrincipalID` char(36) NOT NULL DEFAULT '',
-  `FromID` char(36) NOT NULL DEFAULT '',
+CREATE TABLE `im_offline` (
+  `ID` MEDIUMINT NOT NULL AUTO_INCREMENT,
+  `PrincipalID` char(36) NOT NULL default '',
   `Message` text NOT NULL,
-  `TMStamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `TMStamp` timestamp NOT NULL,
   PRIMARY KEY  (`ID`),
-  KEY `PrincipalID` (`PrincipalID`),
-  KEY `FromID` (`FromID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  KEY `PrincipalID` (`PrincipalID`)
+) ENGINE=MyISAM;
+
+COMMIT;
+
+:VERSION 2         # -------------------------- 
+
+BEGIN;
+
+INSERT INTO `im_offline` SELECT * from `diva_im_offline`;
+DROP TABLE `diva_im_offline`;
+DELETE FROM `migrations` WHERE name='diva_im_Store';
+
+COMMIT;
+
+:VERSION 3         # -------------------------- 
+
+BEGIN;
+
+ALTER TABLE `im_offline`
+  ADD `FromID` char(36) NOT NULL default '' AFTER `PrincipalID`,
+  ADD KEY `FromID` (`FromID`);
+
+COMMIT;
+
+:VERSION 4         # -------------------------- 
+
+BEGIN;
+
+ALTER TABLE im_offline CONVERT TO CHARACTER SET utf8;
 
 COMMIT;

OpenSim/Data/MySQL/Resources/InventoryStore.migrations

@@ -1,42 +1,109 @@
-:VERSION 7		# ------------
+:VERSION 1		# ------------
 BEGIN;
 
-CREATE TABLE IF NOT EXISTS `inventoryitems` (
-  `assetID` varchar(36) DEFAULT NULL,
-  `assetType` int(11) DEFAULT NULL,
-  `inventoryName` varchar(64) DEFAULT NULL,
-  `inventoryDescription` varchar(128) DEFAULT NULL,
-  `inventoryNextPermissions` int(10) unsigned DEFAULT NULL,
-  `inventoryCurrentPermissions` int(10) unsigned DEFAULT NULL,
-  `invType` int(11) DEFAULT NULL,
-  `creatorID` varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `inventoryBasePermissions` int(10) unsigned NOT NULL DEFAULT '0',
-  `inventoryEveryOnePermissions` int(10) unsigned NOT NULL DEFAULT '0',
-  `salePrice` int(11) NOT NULL DEFAULT '0',
-  `saleType` tinyint(4) NOT NULL DEFAULT '0',
-  `creationDate` int(11) NOT NULL DEFAULT '0',
-  `groupID` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `groupOwned` tinyint(4) NOT NULL DEFAULT '0',
-  `flags` int(11) unsigned NOT NULL DEFAULT '0',
-  `inventoryID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `avatarID` char(36) DEFAULT NULL,
-  `parentFolderID` char(36) DEFAULT NULL,
-  `inventoryGroupPermissions` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`inventoryID`),
-  KEY `inventoryitems_avatarid` (`avatarID`),
-  KEY `inventoryitems_parentFolderid` (`parentFolderID`)
+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  (`folderID`),
+  KEY `owner` (`agentID`),
+  KEY `parent` (`parentFolderID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `inventoryfolders` (
-  `folderName` varchar(64) DEFAULT NULL,
-  `type` smallint(6) NOT NULL DEFAULT '0',
-  `version` int(11) NOT NULL DEFAULT '0',
-  `folderID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `agentID` char(36) DEFAULT NULL,
-  `parentFolderID` char(36) DEFAULT NULL,
-  PRIMARY KEY (`folderID`),
-  KEY `inventoryfolders_agentid` (`agentID`),
-  KEY `inventoryfolders_parentFolderid` (`parentFolderID`)
+CREATE TABLE `inventoryitems` (
+  `inventoryID` varchar(36) NOT NULL default '',
+  `assetID` varchar(36) default NULL,
+  `assetType` int(11) default NULL,
+  `parentFolderID` varchar(36) default NULL,
+  `avatarID` varchar(36) default NULL,
+  `inventoryName` varchar(64) default NULL,
+  `inventoryDescription` varchar(128) default NULL,
+  `inventoryNextPermissions` int(10) unsigned default NULL,
+  `inventoryCurrentPermissions` int(10) unsigned default NULL,
+  `invType` int(11) default NULL,
+  `creatorID` varchar(36) default NULL,
+  `inventoryBasePermissions` int(10) unsigned NOT NULL default 0,
+  `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0,
+  `salePrice` int(11) NOT NULL default 0,
+  `saleType` tinyint(4) NOT NULL default 0,
+  `creationDate` int(11) NOT NULL default 0,
+  `groupID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `groupOwned` tinyint(4) NOT NULL default 0,
+  `flags` int(11) unsigned NOT NULL default 0,
+  PRIMARY KEY  (`inventoryID`),
+  KEY `owner` (`avatarID`),
+  KEY `folder` (`parentFolderID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
+
+:VERSION 2		# ------------
+
+BEGIN;
+
+ALTER TABLE inventoryfolders change folderID folderIDold varchar(36);
+ALTER TABLE inventoryfolders change agentID agentIDold varchar(36);
+ALTER TABLE inventoryfolders change parentFolderID parentFolderIDold varchar(36);
+ALTER TABLE inventoryfolders add folderID char(36) not null default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE inventoryfolders add agentID char(36) default NULL;
+ALTER TABLE inventoryfolders add parentFolderID char(36) default NULL;
+UPDATE inventoryfolders set folderID = folderIDold, agentID = agentIDold, parentFolderID = parentFolderIDold;
+ALTER TABLE inventoryfolders drop folderIDold;
+ALTER TABLE inventoryfolders drop agentIDold;
+ALTER TABLE inventoryfolders drop parentFolderIDold;
+ALTER TABLE inventoryfolders add constraint primary key(folderID);
+ALTER TABLE inventoryfolders add index inventoryfolders_agentid(agentID);
+ALTER TABLE inventoryfolders add index inventoryfolders_parentFolderid(parentFolderID);
+
+ALTER TABLE inventoryitems change inventoryID inventoryIDold varchar(36);
+ALTER TABLE inventoryitems change avatarID avatarIDold varchar(36);
+ALTER TABLE inventoryitems change parentFolderID parentFolderIDold varchar(36);
+ALTER TABLE inventoryitems add inventoryID char(36) not null default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE inventoryitems add avatarID char(36) default NULL;
+ALTER TABLE inventoryitems add parentFolderID char(36) default NULL;
+UPDATE inventoryitems set inventoryID = inventoryIDold, avatarID = avatarIDold, parentFolderID = parentFolderIDold;
+ALTER TABLE inventoryitems drop inventoryIDold;
+ALTER TABLE inventoryitems drop avatarIDold;
+ALTER TABLE inventoryitems drop parentFolderIDold;
+ALTER TABLE inventoryitems add constraint primary key(inventoryID);
+ALTER TABLE inventoryitems add index inventoryitems_avatarid(avatarID);
+ALTER TABLE inventoryitems add index inventoryitems_parentFolderid(parentFolderID);
+
+COMMIT;
+
+:VERSION 3		# ------------
+
+BEGIN;
+
+alter table inventoryitems add column inventoryGroupPermissions integer unsigned not null default 0;
+
+COMMIT;
+
+:VERSION 4		# ------------
+
+BEGIN;
+
+update inventoryitems set creatorID = '00000000-0000-0000-0000-000000000000' where creatorID is NULL;
+update inventoryitems set creatorID = '00000000-0000-0000-0000-000000000000' where creatorID = '';
+alter table inventoryitems modify column creatorID varchar(36) not NULL default '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+
+:VERSION 5		# ------------
+
+BEGIN;
+
+alter table inventoryitems modify column creatorID varchar(128) not NULL default '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+
+:VERSION 6		# ------------
+
+BEGIN;
+
+alter table inventoryitems modify column creatorID varchar(255) not NULL default '00000000-0000-0000-0000-000000000000';
+
+COMMIT;

OpenSim/Data/MySQL/Resources/MuteListStore.migrations

@@ -1,16 +0,0 @@
-:VERSION 1
-
-BEGIN;
-
-CREATE TABLE `MuteList` (
-  `AgentID` char(36) NOT NULL,
-  `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `MuteName` varchar(64) NOT NULL DEFAULT '',
-  `MuteType` int(11) NOT NULL DEFAULT '1',
-  `MuteFlags` int(11) NOT NULL DEFAULT '0',
-  `Stamp` int(11) NOT NULL,
-  UNIQUE KEY `AgentID_2` (`AgentID`,`MuteID`,`MuteName`),
-  KEY `AgentID` (`AgentID`)
-);
-
-COMMIT;

OpenSim/Data/MySQL/Resources/Presence.migrations

@@ -1,16 +1,31 @@
-:VERSION 4         # -------------------------- 
+:VERSION 1         # -------------------------- 
 
 BEGIN;
 
-CREATE TABLE IF NOT EXISTS `Presence` (
-  `UserID` varchar(255) NOT NULL,
-  `RegionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `SessionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `SecureSessionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-  `LastSeen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  UNIQUE KEY `SessionID` (`SessionID`),
-  KEY `UserID` (`UserID`),
-  KEY `RegionID` (`RegionID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE `Presence` (
+    `UserID` VARCHAR(255) NOT NULL,
+    `RegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
+) ENGINE=InnoDB;
+
+CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
+CREATE INDEX UserID ON Presence(UserID);
+
+COMMIT;
+
+:VERSION 2         # -------------------------- 
+
+BEGIN;
+
+ALTER TABLE `Presence` ADD COLUMN LastSeen timestamp;
+
+COMMIT;
+
+:VERSION 3         # -------------------------- 
+
+BEGIN;
+
+CREATE INDEX RegionID ON Presence(RegionID);
 
 COMMIT;

OpenSim/Data/MySQL/Resources/UserAccount.migrations

@@ -1,31 +1,54 @@
-:VERSION 5		# -------------------------
+:VERSION 1		# -------------------------
 
 BEGIN;
 
-CREATE TABLE IF NOT EXISTS `UserAccounts` (
-  `PrincipalID` char(36) NOT NULL,
-  `ScopeID` char(36) NOT NULL,
-  `FirstName` varchar(64) NOT NULL,
-  `LastName` varchar(64) NOT NULL,
-  `Email` varchar(64) DEFAULT NULL,
-  `ServiceURLs` text,
-  `Created` int(11) DEFAULT NULL,
-  `UserLevel` int(11) NOT NULL DEFAULT '0',
-  `UserFlags` int(11) NOT NULL DEFAULT '0',
-  `UserTitle` varchar(64) NOT NULL DEFAULT '',
-  UNIQUE KEY `PrincipalID` (`PrincipalID`),
-  KEY `Email` (`Email`),
-  KEY `FirstName` (`FirstName`),
-  KEY `LastName` (`LastName`),
-  KEY `Name` (`FirstName`,`LastName`)
+CREATE TABLE `UserAccounts` (
+    `PrincipalID` CHAR(36) NOT NULL,
+    `ScopeID` CHAR(36) NOT NULL,
+    `FirstName` VARCHAR(64) NOT NULL,
+    `LastName` VARCHAR(64) NOT NULL,
+    `Email` VARCHAR(64),
+    `ServiceURLs` TEXT,
+    `Created` INT(11)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
 
-:VERSION 6		# -------------------------
+:VERSION 2		# -------------------------
+
+BEGIN;
+
+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, CONCAT('AssetServerURI=', userAssetURI, ' InventoryServerURI=', userInventoryURI, ' GatewayURI= HomeURI=') AS ServiceURLs, created as Created FROM users;
+
+COMMIT;
+
+:VERSION 3		# -------------------------
+
+BEGIN;
+
+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;
+
+ALTER TABLE UserAccounts ADD COLUMN UserLevel integer NOT NULL DEFAULT 0;
+ALTER TABLE UserAccounts ADD COLUMN UserFlags integer NOT NULL DEFAULT 0;
+ALTER TABLE UserAccounts ADD COLUMN UserTitle varchar(64) NOT NULL DEFAULT '';
+
+COMMIT;
+
+:VERSION 5		# -------------------------
 
 BEGIN;
 
 ALTER TABLE `UserAccounts` ADD `active` INT NOT NULL DEFAULT '1';
 
 COMMIT;
+

OpenSim/Data/MySQL/Resources/UserProfiles.migrations

@@ -1,4 +1,4 @@
-:VERSION 5         # -------------------------------
+:VERSION 1         # -------------------------------
 
 begin;
 
@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS `usernotes` (
   `targetuuid` varchar(36) NOT NULL,
   `notes` text NOT NULL,
   UNIQUE KEY `useruuid` (`useruuid`,`targetuuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE IF NOT EXISTS `userpicks` (
@@ -44,9 +44,8 @@ CREATE TABLE IF NOT EXISTS `userpicks` (
   `posglobal` varchar(255) NOT NULL,
   `sortorder` int(2) NOT NULL,
   `enabled` enum('true','false') NOT NULL,
-  `gatekeeper` varchar(255),
   PRIMARY KEY (`pickuuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE IF NOT EXISTS `userprofile` (
@@ -65,22 +64,35 @@ CREATE TABLE IF NOT EXISTS `userprofile` (
   `profileFirstImage` varchar(36) NOT NULL,
   `profileFirstText` text NOT NULL,
   PRIMARY KEY (`useruuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
+commit;
+
+:VERSION 2         # -------------------------------
+ 
+begin;
 CREATE TABLE IF NOT EXISTS `userdata` (
     `UserId` char(36) NOT NULL,
     `TagId` varchar(64) NOT NULL,
     `DataKey` varchar(255),
     `DataVal` varchar(255),
     PRIMARY KEY (`UserId`,`TagId`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
+commit;
+
+:VERSION 3         # -------------------------------
+begin;
 CREATE TABLE IF NOT EXISTS `usersettings` (
   `useruuid` varchar(36) NOT NULL,
   `imviaemail` enum('true','false') NOT NULL,
   `visible` enum('true','false') NOT NULL,
   `email` varchar(254) NOT NULL,
   PRIMARY KEY (`useruuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+commit;
+
+:VERSION 4         # -------------------------------
+begin;
+ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255);
 commit;

OpenSim/Data/MySQL/Resources/UserStore.migrations

@@ -0,0 +1,168 @@
+:VERSION 1          # -----------------------------
+
+BEGIN;
+
+SET FOREIGN_KEY_CHECKS=0;
+-- ----------------------------
+-- Table structure for agents
+-- ----------------------------
+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(11) NOT NULL,
+  `agentOnline` tinyint(4) NOT NULL,
+  `loginTime` int(11) NOT NULL,
+  `logoutTime` int(11) NOT NULL,
+  `currentRegion` varchar(36) NOT NULL,
+  `currentHandle` bigint(20) unsigned NOT NULL,
+  `currentPos` varchar(64) NOT NULL,
+  PRIMARY KEY  (`UUID`),
+  UNIQUE KEY `session` (`sessionID`),
+  UNIQUE KEY `ssession` (`secureSessionID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- Create schema avatar_appearance
+--
+
+CREATE TABLE `avatarappearance` (
+  Owner char(36) NOT NULL,
+  Serial int(10) unsigned NOT NULL,
+  Visual_Params blob NOT NULL,
+  Texture blob NOT NULL,
+  Avatar_Height float NOT NULL,
+  Body_Item char(36) NOT NULL,
+  Body_Asset char(36) NOT NULL,
+  Skin_Item char(36) NOT NULL,
+  Skin_Asset char(36) NOT NULL,
+  Hair_Item char(36) NOT NULL,
+  Hair_Asset char(36) NOT NULL,
+  Eyes_Item char(36) NOT NULL,
+  Eyes_Asset char(36) NOT NULL,
+  Shirt_Item char(36) NOT NULL,
+  Shirt_Asset char(36) NOT NULL,
+  Pants_Item char(36) NOT NULL,
+  Pants_Asset char(36) NOT NULL,
+  Shoes_Item char(36) NOT NULL,
+  Shoes_Asset char(36) NOT NULL,
+  Socks_Item char(36) NOT NULL,
+  Socks_Asset char(36) NOT NULL,
+  Jacket_Item char(36) NOT NULL,
+  Jacket_Asset char(36) NOT NULL,
+  Gloves_Item char(36) NOT NULL,
+  Gloves_Asset char(36) NOT NULL,
+  Undershirt_Item char(36) NOT NULL,
+  Undershirt_Asset char(36) NOT NULL,
+  Underpants_Item char(36) NOT NULL,
+  Underpants_Asset char(36) NOT NULL,
+  Skirt_Item char(36) NOT NULL,
+  Skirt_Asset char(36) NOT NULL,
+  PRIMARY KEY  (`Owner`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+SET FOREIGN_KEY_CHECKS=0;
+-- ----------------------------
+-- Table structure for users
+-- ----------------------------
+CREATE TABLE `userfriends` (
+   `ownerID` VARCHAR(37) NOT NULL,
+   `friendID` VARCHAR(37) NOT NULL,
+   `friendPerms` INT NOT NULL,
+   `datetimestamp` INT NOT NULL,
+	 UNIQUE KEY  (`ownerID`, `friendID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+-- ----------------------------
+-- Table structure for users
+-- ----------------------------
+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(20) unsigned 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(11) NOT NULL,
+  `lastLogin` int(11) NOT NULL,
+  `userInventoryURI` varchar(255) default NULL,
+  `userAssetURI` varchar(255) default NULL,
+  `profileCanDoMask` int(10) unsigned default NULL,
+  `profileWantDoMask` int(10) unsigned default NULL,
+  `profileAboutText` text,
+  `profileFirstText` text,
+  `profileImage` varchar(36) default NULL,
+  `profileFirstImage` varchar(36) default NULL,
+  `webLoginKey` varchar(36) default NULL,
+  PRIMARY KEY  (`UUID`),
+  UNIQUE KEY `usernames` (`username`,`lastname`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------
+-- Records 
+-- ----------------------------
+COMMIT;
+
+:VERSION 2          # -----------------------------
+
+BEGIN;
+
+ALTER TABLE users add homeRegionID char(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+
+:VERSION 3          # -----------------------------
+
+BEGIN;
+
+ALTER TABLE users add userFlags integer NOT NULL default 0;
+ALTER TABLE users add godLevel integer NOT NULL default 0;
+
+COMMIT;
+
+:VERSION 4          # -----------------------------
+
+BEGIN;
+
+ALTER TABLE users add customType varchar(32) not null default '';
+ALTER TABLE users add partner char(36) not null default '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+
+:VERSION 5          # -----------------------------
+
+BEGIN;
+
+CREATE TABLE `avatarattachments` (`UUID` char(36) NOT NULL, `attachpoint` int(11) NOT NULL, `item` char(36) NOT NULL, `asset` char(36) NOT NULL) ENGINE=InnoDB;
+
+COMMIT;
+
+:VERSION 6          # -----------------------------
+
+BEGIN;
+
+ALTER TABLE agents add currentLookAt varchar(36) not null default '';
+
+COMMIT;
+
+:VERSION 7          # -----------------------------
+
+BEGIN;
+
+ALTER TABLE users add email varchar(250);
+
+COMMIT;
+
+:VERSION 8          # -----------------------------
+
+BEGIN;
+
+ALTER TABLE users add scopeID char(36) not null default '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+

OpenSim/Data/MySQL/Resources/os_groups_Store.migrations

@@ -31,7 +31,7 @@ CREATE TABLE `os_groups_membership` (
   `AccessToken` char(36) NOT NULL default '',
   PRIMARY KEY  (`GroupID`,`PrincipalID`),
   KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 
 CREATE TABLE `os_groups_roles` (
@@ -43,7 +43,7 @@ CREATE TABLE `os_groups_roles` (
   `Powers` bigint(20) unsigned NOT NULL default '0',
   PRIMARY KEY  (`GroupID`,`RoleID`),
   KEY `GroupID` (`GroupID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 
 CREATE TABLE `os_groups_rolemembership` (
@@ -52,7 +52,7 @@ CREATE TABLE `os_groups_rolemembership` (
   `PrincipalID` VARCHAR(255) NOT NULL default '',
   PRIMARY KEY  (`GroupID`,`RoleID`,`PrincipalID`),
   KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 
 CREATE TABLE `os_groups_invites` (
@@ -63,7 +63,7 @@ CREATE TABLE `os_groups_invites` (
   `TMStamp` timestamp NOT NULL,
   PRIMARY KEY  (`InviteID`),
   UNIQUE KEY `PrincipalGroup` (`GroupID`,`PrincipalID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 
 CREATE TABLE `os_groups_notices` (
@@ -81,13 +81,13 @@ CREATE TABLE `os_groups_notices` (
   PRIMARY KEY  (`NoticeID`),
   KEY  `GroupID` (`GroupID`),
   KEY `TMStamp` (`TMStamp`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 CREATE TABLE `os_groups_principals` (
   `PrincipalID` VARCHAR(255) NOT NULL default '',
   `ActiveGroupID` char(36) NOT NULL default '',
   PRIMARY KEY  (`PrincipalID`)
-) ENGINE=InnoDB;
+) ENGINE=MyISAM;
 
 COMMIT;
 
@@ -113,11 +113,3 @@ DROP TABLE `diva_groups_principals`;
 DELETE FROM `migrations` WHERE name='diva_im_Store';
 
 COMMIT;
-
-:VERSION 3         # -------------------------- 
-
-ALTER TABLE `os_groups_invites`
-
-MODIFY `TMStamp` timestamp NOT NULL default CURRENT_TIMESTAMP;
-
-COMMIT;

OpenSim/Data/Null/NullGenericDataHandler.cs

@@ -42,47 +42,6 @@ namespace OpenSim.Data.Null
     /// </summary>
     public class NullGenericDataHandler
     {
-        protected List<T> Get<T>(string field, string val, List<T> inputEntities)
-        {
-            List<T> entities = inputEntities;
-
-                entities
-                    = entities.Where(
-                        e =>
-                        {
-                            FieldInfo fi = typeof(T).GetField(field);
-                            if (fi == null)
-                                throw new NotImplementedException(string.Format("No field {0} for val {1}", field, val));
-
-                            return fi.GetValue(e).ToString() == val;
-                        }
-                    ).ToList();
-
-            return entities;
-        }
-
-        protected List<T> Get<T>(string field, string[] vals, List<T> inputEntities)
-        {
-            List<T> entities = new List<T>();
-
-            for (int i = 0; i < vals.Length; i++)
-            {
-                    entities.AddRange (inputEntities.Where(
-                        e =>
-                        {
-                            FieldInfo fi = typeof(T).GetField(field);
-                            if (fi == null)
-                                throw new NotImplementedException(string.Format("No field {0} for val {1}", field, vals[i]));
-
-                            return fi.GetValue(e).ToString() == vals[i];
-                        }
-                    ).ToList()
-                    );
-            }
-            return entities;
-        }
-
-
         protected List<T> Get<T>(string[] fields, string[] vals, List<T> inputEntities)
         {
             List<T> entities = inputEntities;

OpenSim/Data/Null/NullRegionData.cs

@@ -68,28 +68,6 @@ namespace OpenSim.Data.Null
 
         private delegate bool Matcher(string value);
 
-        public RegionData GetSpecific(string regionName, UUID scopeID)
-        {
-            if (m_useStaticInstance && Instance != this)
-                return Instance.GetSpecific(regionName, scopeID);
-
-            string cleanName = regionName.ToLower();
-            Matcher queryMatch;
-            queryMatch = delegate (string s) { return s.Equals(cleanName); };
-
-            lock (m_regionData)
-            {
-                foreach (RegionData r in m_regionData.Values)
-                {
-                    // m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower());
-                    if (queryMatch(r.RegionName.ToLower()))
-                        return(r);
-                }
-            }
-
-            return null;
-        }
-
         public List<RegionData> Get(string regionName, UUID scopeID)
         {
             if (m_useStaticInstance && Instance != this)

OpenSim/Data/Null/NullSimulationData.cs

@@ -133,7 +133,6 @@ namespace OpenSim.Data.Null
         }
 
         Dictionary<UUID, TerrainData> m_terrains = new Dictionary<UUID, TerrainData>();
-        Dictionary<UUID, TerrainData> m_bakedterrains = new Dictionary<UUID, TerrainData>();
         public void StoreTerrain(TerrainData ter, UUID regionID)
         {
             if (m_terrains.ContainsKey(regionID))
@@ -141,17 +140,10 @@ namespace OpenSim.Data.Null
             m_terrains.Add(regionID, ter);
         }
 
-        public void StoreBakedTerrain(TerrainData ter, UUID regionID)
-        {
-            if (m_bakedterrains.ContainsKey(regionID))
-                m_bakedterrains.Remove(regionID);
-            m_bakedterrains.Add(regionID, ter);
-        }
-
         // Legacy. Just don't do this.
         public void StoreTerrain(double[,] ter, UUID regionID)
         {
-            TerrainData terrData = new TerrainData(ter);
+            TerrainData terrData = new HeightmapTerrainData(ter);
             StoreTerrain(terrData, regionID);
         }
 
@@ -175,15 +167,6 @@ namespace OpenSim.Data.Null
             return null;
         }
 
-        public TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
-        {
-            if (m_bakedterrains.ContainsKey(regionID))
-            {
-                return m_bakedterrains[regionID];
-            }
-            return null;
-        }
-
         public void RemoveLandObject(UUID globalID)
         {
         }

OpenSim/Data/Null/Properties/AssemblyInfo.cs

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

OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs

@@ -44,12 +44,20 @@ namespace OpenSim.Data.PGSQL
 
         public AgentPreferencesData GetPrefs(UUID agentID)
         {
-
-            AgentPreferencesData[] ret = Get("PrincipalID", agentID.ToString());
-
-            if (ret.Length == 0)
+            // Until someone sends in a table that works
             return null;
-            return ret[0];
+            //AgentPreferencesData[] ret = Get("PrincipalID", agentID.ToString());
+
+            //if (ret.Length == 0)
+            //    return null;
+
+            //return ret[0];
+        }
+
+        public override bool Store(AgentPreferencesData row)
+        {
+            // Until someone sends in a table that works
+            return false;
         }
 
     }

OpenSim/Data/PGSQL/PGSQLEstateData.cs

@@ -286,7 +286,7 @@ namespace OpenSim.Data.PGSQL
         {
             es.ClearBans();
 
-            string sql = "select * from estateban where \"EstateID\" = :EstateID";
+            string sql = "select \"bannedUUID\" from estateban where \"EstateID\" = :EstateID";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
@@ -302,8 +302,6 @@ namespace OpenSim.Data.PGSQL
                         EstateBan eb = new EstateBan();
 
                         eb.BannedUserID = new UUID((Guid)reader["bannedUUID"]); //uuid;
-                        eb.BanningUserID = new UUID((Guid)reader["banningUUID"]); //uuid;
-                        eb.BanTime = Convert.ToInt32(reader["banTime"]);
                         eb.BannedHostAddress = "0.0.0.0";
                         eb.BannedHostIPMask = "0.0.0.0";
                         es.AddBan(eb);
@@ -348,15 +346,11 @@ namespace OpenSim.Data.PGSQL
                     cmd.ExecuteNonQuery();
 
                     //Insert after
-                    cmd.CommandText = "insert into estateban (\"EstateID\", \"bannedUUID\",\"bannedIp\", \"bannedIpHostMask\", \"bannedNameMask\", \"banningUUID\",\"banTime\" ) values ( :EstateID, :bannedUUID, '','','', :banningUUID, :banTime )";
+                    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["EstateID"].Value = b.EstateID;
                         cmd.Parameters["bannedUUID"].Value = b.BannedUserID.Guid;
-                        cmd.Parameters["banningUUID"].Value = b.BanningUserID.Guid;
-                        cmd.Parameters["banTime"].Value = b.BanTime;
-
                         cmd.ExecuteNonQuery();
                     }
                 }

OpenSim/Data/PGSQL/PGSQLFSAssetData.cs

@@ -1,316 +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.Reflection;
-using System.Collections.Generic;
-using System.Data;
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using log4net;
-using OpenMetaverse;
-using Npgsql;
-using NpgsqlTypes;
-
-namespace OpenSim.Data.PGSQL
-{
-    public class PGSQLFSAssetData : IFSAssetDataPlugin
-    {
-        private const string _migrationStore = "FSAssetStore";
-        private static string m_Table = "fsassets";
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private long m_ticksToEpoch;
-
-        private PGSQLManager m_database;
-        private string m_connectionString;
-
-        public PGSQLFSAssetData()
-        {
-        }
-
-        public void Initialise(string connect, string realm, int UpdateAccessTime)
-        {
-            DaysBetweenAccessTimeUpdates = UpdateAccessTime;
-
-            m_ticksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
-
-            m_connectionString = connect;
-            m_database = new PGSQLManager(m_connectionString);
-
-            //New migration to check for DB changes
-            m_database.CheckMigration(_migrationStore);
-        }
-
-        public void Initialise()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Number of days that must pass before we update the access time on an asset when it has been fetched
-        /// Config option to change this is "DaysBetweenAccessTimeUpdates"
-        /// </summary>
-        private int DaysBetweenAccessTimeUpdates = 0;
-
-        protected virtual Assembly Assembly
-        {
-            get { return GetType().Assembly; }
-        }
-        
-        #region IPlugin Members
-
-        public string Version { get { return "1.0.0.0"; } }
-
-        public void Dispose() { }
-
-        public string Name
-        {
-            get { return "PGSQL FSAsset storage engine"; }
-        }
-
-        #endregion
-
-        #region IFSAssetDataPlugin Members
-
-        public AssetMetadata Get(string id, out string hash)
-        {
-            hash = String.Empty;
-            AssetMetadata meta = null;
-            UUID uuid = new UUID(id);
-
-            string query = String.Format("select \"id\", \"type\", \"hash\", \"create_time\", \"access_time\", \"asset_flags\" from {0} where \"id\" = :id", m_Table);
-            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
-            using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
-            {
-                dbcon.Open();
-                cmd.Parameters.Add(m_database.CreateParameter("id", uuid));
-                using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
-                {
-                    if (reader.Read())
-                    {
-                        meta = new AssetMetadata();
-                        hash = reader["hash"].ToString();
-                        meta.ID = id;
-                        meta.FullID = uuid;
-                        meta.Name = String.Empty;
-                        meta.Description = String.Empty;
-                        meta.Type = (sbyte)Convert.ToInt32(reader["type"]);
-                        meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
-                        meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
-                        meta.Flags = (AssetFlags)Convert.ToInt32(reader["asset_flags"]);
-                        int atime = Convert.ToInt32(reader["access_time"]);
-                        UpdateAccessTime(atime, uuid);
-                    }
-                }
-            }
-
-            return meta;
-        }
-
-        private void UpdateAccessTime(int AccessTime, UUID id)
-        {
-            // Reduce DB work by only updating access time if asset hasn't recently been accessed
-            // 0 By Default, Config option is "DaysBetweenAccessTimeUpdates"
-            if (DaysBetweenAccessTimeUpdates > 0 && (DateTime.UtcNow - Utils.UnixTimeToDateTime(AccessTime)).TotalDays < DaysBetweenAccessTimeUpdates)
-                return;
-
-            string query = String.Format("UPDATE {0} SET \"access_time\" = :access_time WHERE \"id\" = :id", m_Table);
-            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
-            using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
-            {
-                dbcon.Open();
-                int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
-                cmd.Parameters.Add(m_database.CreateParameter("id", id));
-                cmd.Parameters.Add(m_database.CreateParameter("access_time", now));
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        public bool Store(AssetMetadata meta, string hash)
-        {
-            try
-            {
-                bool found = false;
-                string oldhash;
-                AssetMetadata existingAsset = Get(meta.ID, out oldhash);
-
-                string query = String.Format("UPDATE {0} SET \"access_time\" = :access_time WHERE \"id\" = :id", m_Table);
-                if (existingAsset == null)
-                {
-                   query = String.Format("insert into {0} (\"id\", \"type\", \"hash\", \"asset_flags\", \"create_time\", \"access_time\") values ( :id, :type, :hash, :asset_flags, :create_time, :access_time)", m_Table);
-                   found = true;
-                }
-
-                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
-                using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
-                {
-                    dbcon.Open();
-                    int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
-                    cmd.Parameters.Add(m_database.CreateParameter("id", meta.FullID));
-                    cmd.Parameters.Add(m_database.CreateParameter("type", meta.Type));
-                    cmd.Parameters.Add(m_database.CreateParameter("hash", hash));
-                    cmd.Parameters.Add(m_database.CreateParameter("asset_flags", Convert.ToInt32(meta.Flags)));
-                    cmd.Parameters.Add(m_database.CreateParameter("create_time", now));
-                    cmd.Parameters.Add(m_database.CreateParameter("access_time", now));
-                    cmd.ExecuteNonQuery();
-                }
-                return found;
-            }
-            catch(Exception e)
-            {
-                m_log.Error("[PGSQL FSASSETS] Failed to store asset with ID " + meta.ID);
-		        m_log.Error(e.ToString());
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Check if the assets exist in the database.
-        /// </summary>
-        /// <param name="uuids">The asset UUID's</param>
-        /// <returns>For each asset: true if it exists, false otherwise</returns>
-        public bool[] AssetsExist(UUID[] uuids)
-        {
-            if (uuids.Length == 0)
-                return new bool[0];
-
-            HashSet<UUID> exists = new HashSet<UUID>();
-
-            string ids = "'" + string.Join("','", uuids) + "'";
-            string query = string.Format("select \"id\" from {1} where id in ({0})", ids, m_Table);
-            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
-            using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
-            {
-                dbcon.Open();
-                using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
-                {
-                    while (reader.Read())
-                    {
-                        UUID id = DBGuid.FromDB(reader["id"]);;
-                        exists.Add(id);
-                    }
-                }
-            }
-
-            bool[] results = new bool[uuids.Length];
-            for (int i = 0; i < uuids.Length; i++)
-                results[i] = exists.Contains(uuids[i]);
-            return results;
-        }
-
-        public int Count()
-        {
-            int count = 0;
-            string query = String.Format("select count(*) as count from {0}", m_Table);
-            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
-            using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
-            {
-                dbcon.Open();
-                IDataReader reader = cmd.ExecuteReader();
-                reader.Read();
-                count = Convert.ToInt32(reader["count"]);
-                reader.Close();
-            }
-
-            return count;
-        }
-
-        public bool Delete(string id)
-        {
-            string query = String.Format("delete from {0} where \"id\" = :id", m_Table);
-            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
-            using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
-            {
-                dbcon.Open();
-                cmd.Parameters.Add(m_database.CreateParameter("id", new UUID(id)));
-                cmd.ExecuteNonQuery();
-            }
-
-            return true;
-        }
-
-        public void Import(string conn, string table, int start, int count, bool force, FSStoreDelegate store)
-        {
-            int imported = 0;
-            string limit = String.Empty;
-            if(count != -1)
-            {
-                limit = String.Format(" limit {0} offset {1}", start, count);
-            }
-            string query = String.Format("select * from {0}{1}", table, limit);
-            try
-            {
-                using (NpgsqlConnection remote = new NpgsqlConnection(conn))
-                using (NpgsqlCommand cmd = new NpgsqlCommand(query, remote))
-                {
-                    remote.Open();
-                    MainConsole.Instance.Output("Querying database");
-                    MainConsole.Instance.Output("Reading data");
-                    using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
-                    {
-                        while (reader.Read())
-                        {
-                            if ((imported % 100) == 0)
-                            {
-                                MainConsole.Instance.Output(String.Format("{0} assets imported so far", imported));
-                            }
-    
-                            AssetBase asset = new AssetBase();
-                            AssetMetadata meta = new AssetMetadata();
-
-                            meta.ID = reader["id"].ToString();
-                            meta.FullID = new UUID(meta.ID);
-
-                            meta.Name = String.Empty;
-                            meta.Description = String.Empty;
-                            meta.Type = (sbyte)Convert.ToInt32(reader["assetType"]);
-                            meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
-                            meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
-
-                            asset.Metadata = meta;
-                            asset.Data = (byte[])reader["data"];
-
-                            store(asset, force);
-
-                            imported++;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[PGSQL FSASSETS]: Error importing assets: {0}",
-                        e.Message.ToString());
-                return;
-            }
-
-            MainConsole.Instance.Output(String.Format("Import done, {0} assets imported", imported));
-        }
-
-        #endregion
-    }
-}

OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs

@@ -145,21 +145,26 @@ namespace OpenSim.Data.PGSQL
         private List<string> GetConstraints()
         {
             List<string> constraints = new List<string>();
-            string query = string.Format(@"select
-                    a.attname as column_name
-                from
-                    pg_class t,
-                    pg_class i,
-                    pg_index ix,
-                    pg_attribute a
-                where
-                    t.oid = ix.indrelid
-                    and i.oid = ix.indexrelid
-                    and a.attrelid = t.oid
-                    and a.attnum = ANY(ix.indkey)
-                    and t.relkind = 'r'
-                    and ix.indisunique = true
-                    and t.relname = lower('{0}')
+            string query = string.Format(@"SELECT kcu.column_name
+                        FROM information_schema.table_constraints tc
+                        LEFT JOIN information_schema.key_column_usage kcu
+                        ON tc.constraint_catalog = kcu.constraint_catalog
+                        AND tc.constraint_schema = kcu.constraint_schema
+                        AND tc.constraint_name = kcu.constraint_name
+
+                        LEFT JOIN information_schema.referential_constraints rc
+                        ON tc.constraint_catalog = rc.constraint_catalog
+                        AND tc.constraint_schema = rc.constraint_schema
+                        AND tc.constraint_name = rc.constraint_name
+
+                        LEFT JOIN information_schema.constraint_column_usage ccu
+                        ON rc.unique_constraint_catalog = ccu.constraint_catalog
+                        AND rc.unique_constraint_schema = ccu.constraint_schema
+                        AND rc.unique_constraint_name = ccu.constraint_name
+
+                        where tc.table_name = lower('{0}') 
+                        and lower(tc.constraint_type) in ('primary key')
+                        and kcu.column_name is not null
                         ;", m_Realm);
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
@@ -180,54 +185,7 @@ namespace OpenSim.Data.PGSQL
 
         public virtual T[] Get(string field, string key)
         {
-            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (NpgsqlCommand cmd = new NpgsqlCommand())
-            {
-                if ( m_FieldTypes.ContainsKey(field) )
-                    cmd.Parameters.Add(m_database.CreateParameter(field, key, m_FieldTypes[field]));
-                else
-                    cmd.Parameters.Add(m_database.CreateParameter(field, key));
-
-                string query = String.Format("SELECT * FROM {0} WHERE \"{1}\" = :{1}", m_Realm, field, field);
-
-                cmd.Connection = conn;
-                cmd.CommandText = query;
-                conn.Open();
-                return DoQuery(cmd);
-            }
-        }
-
-        public virtual T[] Get(string field, string[] keys)
-        {
-
-            int flen = keys.Length;
-            if(flen == 0)
-                return new T[0];
-
-            int flast = flen - 1;
-            StringBuilder sb = new StringBuilder(1024);
-            sb.AppendFormat("select * from {0} where {1} IN ('", m_Realm, field);
-
-            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (NpgsqlCommand cmd = new NpgsqlCommand())
-            {
-
-                for (int i = 0 ; i < flen ; i++)
-                {
-                    sb.Append(keys[i]);
-                    if(i < flast)
-                        sb.Append("','");
-                    else
-                        sb.Append("')");
-                }
-
-                string query = sb.ToString();
-
-                cmd.Connection = conn;
-                cmd.CommandText = query;
-                conn.Open();
-                return DoQuery(cmd);
-            }
+            return Get(new string[] { field }, new string[] { key });
         }
 
         public virtual T[] Get(string[] fields, string[] keys)

OpenSim/Data/PGSQL/PGSQLGroupsData.cs

@@ -86,13 +86,13 @@ namespace OpenSim.Data.PGSQL
                        
             if (string.IsNullOrEmpty(pattern)) // True for where clause
             {
-                pattern = "1";
+                pattern = " 1 ORDER BY lower(\"Name\") LIMIT 100";
                 
                 return m_Groups.Get(pattern);
             }
             else   
             {             
-                pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%')";
+                pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%') ORDER BY lower(\"Name\") LIMIT 100";
         
                 return m_Groups.Get(pattern, new NpgsqlParameter("pattern", pattern));
             }
@@ -435,7 +435,7 @@ namespace OpenSim.Data.PGSQL
 
             using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
-                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\"::abstime::timestamp < now() - INTERVAL '2 week'", m_Realm);
+                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
                 
                 ExecuteNonQuery(cmd);
             }
@@ -461,7 +461,7 @@ namespace OpenSim.Data.PGSQL
 
             using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
-                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\"::abstime::timestamp < now() - INTERVAL '2 week'", m_Realm);
+                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
                 
                 ExecuteNonQuery(cmd);
             }

OpenSim/Data/PGSQL/PGSQLManager.cs

@@ -251,7 +251,7 @@ namespace OpenSim.Data.PGSQL
             }
             if (PGFieldType == "double precision")
             {
-                return Convert.ToDouble(value);
+                return (Double)value;
             }
             return CreateParameterValue(value);
         }

OpenSim/Data/PGSQL/PGSQLRegionData.cs

@@ -26,14 +26,16 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing;
+using System.IO;
 using System.Reflection;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Data;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using RegionFlags = OpenSim.Framework.RegionFlags;
 using Npgsql;
 
@@ -114,16 +116,17 @@ namespace OpenSim.Data.PGSQL
             }
         }
 
-        public RegionData GetSpecific(string regionName, UUID scopeID)
+        public RegionData Get(int posX, int posY, UUID scopeID)
         {
-            string sql = "select * from " + m_Realm + " where lower(\"regionName\") = lower(:regionName) ";
+            string sql = "select * from "+m_Realm+" where \"locX\" = :posX and \"locY\" = :posY";
             if (scopeID != UUID.Zero)
                 sql += " and \"ScopeID\" = :scopeID";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(m_database.CreateParameter("regionName", regionName));
+                cmd.Parameters.Add(m_database.CreateParameter("posX", posX));
+                cmd.Parameters.Add(m_database.CreateParameter("posY", posY));
                 if (scopeID != UUID.Zero) 
                     cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                 conn.Open();
@@ -135,50 +138,6 @@ namespace OpenSim.Data.PGSQL
             }
         }
 
-        public RegionData Get(int posX, int posY, UUID scopeID)
-        {
-            // extend database search for maximum region size area
-            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";
-
-            int startX = posX - (int)Constants.MaximumRegionSize;
-            int startY = posY - (int)Constants.MaximumRegionSize;
-            int endX = posX;
-            int endY = posY;
-
-            List<RegionData> ret;
-            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (NpgsqlCommand cmd = new NpgsqlCommand(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));
-                if (scopeID != UUID.Zero)
-                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
-                conn.Open();
-                ret = RunCommand(cmd);
-            }
-
-            if (ret.Count == 0)
-                return null;
-
-            // Find the first that contains pos
-            RegionData rg = null;
-            foreach (RegionData r in ret)
-            {
-                if (posX >= r.posX && posX < r.posX + r.sizeX
-                    && posY >= r.posY && posY < r.posY + r.sizeY)
-                {
-                    rg = r;
-                    break;
-                }
-            }
-
-            return rg;
-        }
-
         public RegionData Get(UUID regionID, UUID scopeID)
         {
             string sql = "select * from "+m_Realm+" where uuid = :regionID";
@@ -201,41 +160,21 @@ namespace OpenSim.Data.PGSQL
 
         public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
         {
-            // extend database search for maximum region size area
             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";
 
-            int qstartX = startX - (int)Constants.MaximumRegionSize;
-            int qstartY = startY - (int)Constants.MaximumRegionSize;
-
-            List<RegionData> dbret;
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(m_database.CreateParameter("startX", qstartX));
-                cmd.Parameters.Add(m_database.CreateParameter("startY", qstartY));
+                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));
-                if (scopeID != UUID.Zero)
                 cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                 conn.Open();
-
-                dbret = RunCommand(cmd);
+                return RunCommand(cmd);
             }
-
-            List<RegionData> ret = new List<RegionData>();
-
-            if(dbret.Count == 0)
-                return ret;
-
-            foreach (RegionData r in dbret)
-            {
-                if (r.posX + r.sizeX > startX && r.posX <= endX
-                    && r.posY + r.sizeY > startY && r.posY <= endY)
-                    ret.Add(r);
-            }
-            return ret;
         }
 
         public List<RegionData> RunCommand(NpgsqlCommand cmd)

OpenSim/Data/PGSQL/PGSQLSimulationData.cs

@@ -31,13 +31,11 @@ using System.Data;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
-using System.Threading;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Data;
 using Npgsql;
 
 namespace OpenSim.Data.PGSQL
@@ -350,13 +348,10 @@ namespace OpenSim.Data.PGSQL
             ""CameraEyeOffsetY"" = :CameraEyeOffsetY, ""CameraEyeOffsetZ"" = :CameraEyeOffsetZ, ""CameraAtOffsetX"" = :CameraAtOffsetX, 
             ""CameraAtOffsetY"" = :CameraAtOffsetY, ""CameraAtOffsetZ"" = :CameraAtOffsetZ, ""ForceMouselook"" = :ForceMouselook, 
             ""ScriptAccessPin"" = :ScriptAccessPin, ""AllowedDrop"" = :AllowedDrop, ""DieAtEdge"" = :DieAtEdge, ""SalePrice"" = :SalePrice, 
-            ""PhysicsShapeType"" = :PhysicsShapeType, ""Density"" = :Density, ""GravityModifier"" = :GravityModifier, ""Friction"" = :Friction, ""Restitution"" = :Restitution, 
-            ""PassCollisions"" = :PassCollisions, ""RotationAxisLocks"" = :RotationAxisLocks, ""RezzerID"" = :RezzerID,
+            ""SaleType"" = :SaleType, ""ColorR"" = :ColorR, ""ColorG"" = :ColorG, ""ColorB"" = :ColorB, ""ColorA"" = :ColorA, ""ParticleSystem"" = :ParticleSystem, 
             ""ClickAction"" = :ClickAction, ""Material"" = :Material, ""CollisionSound"" = :CollisionSound, ""CollisionSoundVolume"" = :CollisionSoundVolume, ""PassTouches"" = :PassTouches,
-            ""LinkNumber"" = :LinkNumber, ""MediaURL"" = :MediaURL, ""DynAttrs"" = :DynAttrs, ""Vehicle"" = :Vehicle,
-            ""PhysInertia"" = :PhysInertia, ""standtargetx"" =:standtargetx, ""standtargety"" =:standtargety, ""standtargetz"" =:standtargetz,
-            ""sitactrange"" =:sitactrange, ""pseudocrc"" = :pseudocrc
-
+            ""LinkNumber"" = :LinkNumber, ""MediaURL"" = :MediaURL, ""DynAttrs"" = :DynAttrs,
+            ""PhysicsShapeType"" = :PhysicsShapeType, ""Density"" = :Density, ""GravityModifier"" = :GravityModifier, ""Friction"" = :Friction, ""Restitution"" = :Restitution
         WHERE ""UUID"" = :UUID ;
 
         INSERT INTO 
@@ -370,8 +365,7 @@ namespace OpenSim.Data.PGSQL
             ""OmegaY"", ""OmegaZ"", ""CameraEyeOffsetX"", ""CameraEyeOffsetY"", ""CameraEyeOffsetZ"", ""CameraAtOffsetX"", ""CameraAtOffsetY"", ""CameraAtOffsetZ"", 
             ""ForceMouselook"", ""ScriptAccessPin"", ""AllowedDrop"", ""DieAtEdge"", ""SalePrice"", ""SaleType"", ""ColorR"", ""ColorG"", ""ColorB"", ""ColorA"", 
             ""ParticleSystem"", ""ClickAction"", ""Material"", ""CollisionSound"", ""CollisionSoundVolume"", ""PassTouches"", ""LinkNumber"", ""MediaURL"", ""DynAttrs"",
-            ""PhysicsShapeType"", ""Density"", ""GravityModifier"", ""Friction"", ""Restitution"", ""PassCollisions"", ""RotationAxisLocks"", ""RezzerID"" , ""Vehicle"", ""PhysInertia"",
-            ""standtargetx"", ""standtargety"", ""standtargetz"", ""sitactrange"", ""pseudocrc""
+            ""PhysicsShapeType"", ""Density"", ""GravityModifier"", ""Friction"", ""Restitution""
             ) Select 
             :UUID, :CreationDate, :Name, :Text, :Description, :SitName, :TouchName, :ObjectFlags, :OwnerMask, :NextOwnerMask, :GroupMask, 
             :EveryoneMask, :BaseMask, :PositionX, :PositionY, :PositionZ, :GroupPositionX, :GroupPositionY, :GroupPositionZ, :VelocityX, 
@@ -382,8 +376,7 @@ namespace OpenSim.Data.PGSQL
             :OmegaY, :OmegaZ, :CameraEyeOffsetX, :CameraEyeOffsetY, :CameraEyeOffsetZ, :CameraAtOffsetX, :CameraAtOffsetY, :CameraAtOffsetZ, 
             :ForceMouselook, :ScriptAccessPin, :AllowedDrop, :DieAtEdge, :SalePrice, :SaleType, :ColorR, :ColorG, :ColorB, :ColorA, 
             :ParticleSystem, :ClickAction, :Material, :CollisionSound, :CollisionSoundVolume, :PassTouches, :LinkNumber, :MediaURL, :DynAttrs,
-            :PhysicsShapeType, :Density, :GravityModifier, :Friction, :Restitution, :PassCollisions, :RotationAxisLocks, :RezzerID, :Vehicle, :PhysInertia,
-            :standtargetx, :standtargety, :standtargetz,:sitactrange, :pseudocrc 
+            :PhysicsShapeType, :Density, :GravityModifier, :Friction, :Restitution
             where not EXISTS (SELECT ""UUID"" FROM prims WHERE ""UUID"" = :UUID);
         ";
 
@@ -559,12 +552,9 @@ namespace OpenSim.Data.PGSQL
                         if (reader.Read())
                         {
                             rev = Convert.ToInt32(reader["Revision"]);
-                            if ((reader["Heightfield"] != DBNull.Value))
-                            {
                             byte[] blob = (byte[])reader["Heightfield"];
                             terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
                         }
-                        }
                         else
                         {
                             _Log.Info("[REGION DB]: No terrain found for region");
@@ -578,43 +568,10 @@ namespace OpenSim.Data.PGSQL
             return terrData;
         }
 
-        public TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
-        {
-            TerrainData terrData = null;
-
-            string sql = @"select ""RegionUUID"", ""Revision"", ""Heightfield"" from bakedterrain
-                            where ""RegionUUID"" = :RegionUUID; ";
-
-            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            {
-                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
-                {
-                    // PGSqlParameter param = new PGSqlParameter();
-                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
-                    conn.Open();
-                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
-                    {
-                        int rev;
-                        if (reader.Read())
-                        {
-                            rev = Convert.ToInt32(reader["Revision"]);
-                            if ((reader["Heightfield"] != DBNull.Value))
-                            {
-                                byte[] blob = (byte[])reader["Heightfield"];
-                                terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
-                            }
-                        }
-                    }
-                }
-            }
-
-            return terrData;
-        }
-
         // Legacy entry point for when terrain was always a 256x256 heightmap
         public void StoreTerrain(double[,] terrain, UUID regionID)
         {
-            StoreTerrain(new TerrainData(terrain), regionID);
+            StoreTerrain(new HeightmapTerrainData(terrain), regionID);
         }
 
         /// <summary>
@@ -661,49 +618,6 @@ namespace OpenSim.Data.PGSQL
 
         }
 
-        /// <summary>
-        /// Stores the baked terrain map to DB.
-        /// </summary>
-        /// <param name="terrain">terrain map data.</param>
-        /// <param name="regionID">regionID.</param>
-        public void StoreBakedTerrain(TerrainData terrData, UUID regionID)
-        {
-            //Delete old terrain map
-            string sql = @"delete from bakedterrain where ""RegionUUID""=:RegionUUID";
-            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            {
-                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
-
-                    _Log.InfoFormat("{0} Deleted bakedterrain id = {1}", LogHeader, regionID);
-                }
-            }
-
-            int terrainDBRevision;
-            Array terrainDBblob;
-            terrData.GetDatabaseBlob(out terrainDBRevision, out terrainDBblob);
-
-            sql = @"insert into bakedterrain(""RegionUUID"", ""Revision"", ""Heightfield"") values(:RegionUUID, :Revision, :Heightfield)";
-
-            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            {
-                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
-                    cmd.Parameters.Add(_Database.CreateParameter("Revision", terrainDBRevision));
-                    cmd.Parameters.Add(_Database.CreateParameter("Heightfield", terrainDBblob));
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
-
-                    _Log.InfoFormat("{0} Stored bakedterrain id = {1}, terrainSize = <{2},{3}>",
-                                    LogHeader, regionID, terrData.SizeX, terrData.SizeY);
-                }
-            }
-        }
-
         /// <summary>
         /// Loads all the land objects of a region.
         /// </summary>
@@ -769,15 +683,11 @@ namespace OpenSim.Data.PGSQL
             string sql = @"INSERT INTO land
                 (""UUID"",""RegionUUID"",""LocalLandID"",""Bitmap"",""Name"",""Description"",""OwnerUUID"",""IsGroupOwned"",""Area"",""AuctionID"",""Category"",""ClaimDate"",""ClaimPrice"",
                  ""GroupUUID"",""SalePrice"",""LandStatus"",""LandFlags"",""LandingType"",""MediaAutoScale"",""MediaTextureUUID"",""MediaURL"",""MusicURL"",""PassHours"",""PassPrice"",
-                 ""SnapshotUUID"",""UserLocationX"",""UserLocationY"",""UserLocationZ"",""UserLookAtX"",""UserLookAtY"",""UserLookAtZ"",""AuthbuyerID"",""OtherCleanTime"",""Dwell"",
-                 ""MediaType"",""MediaDescription"",""MediaSize"",""MediaLoop"",""ObscureMusic"",""ObscureMedia"",""SeeAVs"",""AnyAVSounds"",""GroupAVSounds"",
-                 ""environment"")
+                 ""SnapshotUUID"",""UserLocationX"",""UserLocationY"",""UserLocationZ"",""UserLookAtX"",""UserLookAtY"",""UserLookAtZ"",""AuthbuyerID"",""OtherCleanTime"")
                 VALUES
                 (:UUID,:RegionUUID,:LocalLandID,:Bitmap,:Name,:Description,:OwnerUUID,:IsGroupOwned,:Area,:AuctionID,:Category,:ClaimDate,:ClaimPrice,
                  :GroupUUID,:SalePrice,:LandStatus,:LandFlags,:LandingType,:MediaAutoScale,:MediaTextureUUID,:MediaURL,:MusicURL,:PassHours,:PassPrice,
-                 :SnapshotUUID,:UserLocationX,:UserLocationY,:UserLocationZ,:UserLookAtX,:UserLookAtY,:UserLookAtZ,:AuthbuyerID,:OtherCleanTime,:Dwell,
-                 :MediaType,:MediaDescription,:MediaWidth::text || ',' || :MediaHeight::text,:MediaLoop,:ObscureMusic,:ObscureMedia,:SeeAVs::int::smallint,
-                 :AnyAVSounds::int::smallint,:GroupAVSounds::int::smallint,:environment)";
+                 :SnapshotUUID,:UserLocationX,:UserLocationY,:UserLocationZ,:UserLookAtX,:UserLookAtY,:UserLookAtZ,:AuthbuyerID,:OtherCleanTime)";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
@@ -826,6 +736,477 @@ namespace OpenSim.Data.PGSQL
                 cmd.ExecuteNonQuery();
             }
         }
+        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
+        {
+            RegionLightShareData nWP = new RegionLightShareData();
+            nWP.OnSave += StoreRegionWindlightSettings;
+
+            string sql = @"select * from regionwindlight where ""region_id"" = :regionID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("regionID", regionUUID.ToString() ));
+                conn.Open();
+                using (NpgsqlDataReader result = cmd.ExecuteReader())
+                {
+                    if (!result.Read())
+                    {
+                        //No result, so store our default windlight profile and return it
+                        nWP.regionID = regionUUID;
+                        StoreRegionWindlightSettings(nWP);
+                        return nWP;
+                    }
+                    else
+                    {
+                        nWP.regionID = DBGuid.FromDB(result["region_id"]);
+                        nWP.waterColor.X = Convert.ToSingle(result["water_color_r"]);
+                        nWP.waterColor.Y = Convert.ToSingle(result["water_color_g"]);
+                        nWP.waterColor.Z = Convert.ToSingle(result["water_color_b"]);
+                        nWP.waterFogDensityExponent = Convert.ToSingle(result["water_fog_density_exponent"]);
+                        nWP.underwaterFogModifier = Convert.ToSingle(result["underwater_fog_modifier"]);
+                        nWP.reflectionWaveletScale.X = Convert.ToSingle(result["reflection_wavelet_scale_1"]);
+                        nWP.reflectionWaveletScale.Y = Convert.ToSingle(result["reflection_wavelet_scale_2"]);
+                        nWP.reflectionWaveletScale.Z = Convert.ToSingle(result["reflection_wavelet_scale_3"]);
+                        nWP.fresnelScale = Convert.ToSingle(result["fresnel_scale"]);
+                        nWP.fresnelOffset = Convert.ToSingle(result["fresnel_offset"]);
+                        nWP.refractScaleAbove = Convert.ToSingle(result["refract_scale_above"]);
+                        nWP.refractScaleBelow = Convert.ToSingle(result["refract_scale_below"]);
+                        nWP.blurMultiplier = Convert.ToSingle(result["blur_multiplier"]);
+                        nWP.bigWaveDirection.X = Convert.ToSingle(result["big_wave_direction_x"]);
+                        nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]);
+                        nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]);
+                        nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]);
+                        UUID.TryParse(result["normal_map_texture"].ToString(), out nWP.normalMapTexture);
+                        nWP.horizon.X = Convert.ToSingle(result["horizon_r"]);
+                        nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]);
+                        nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]);
+                        nWP.horizon.W = Convert.ToSingle(result["horizon_i"]);
+                        nWP.hazeHorizon = Convert.ToSingle(result["haze_horizon"]);
+                        nWP.blueDensity.X = Convert.ToSingle(result["blue_density_r"]);
+                        nWP.blueDensity.Y = Convert.ToSingle(result["blue_density_g"]);
+                        nWP.blueDensity.Z = Convert.ToSingle(result["blue_density_b"]);
+                        nWP.blueDensity.W = Convert.ToSingle(result["blue_density_i"]);
+                        nWP.hazeDensity = Convert.ToSingle(result["haze_density"]);
+                        nWP.densityMultiplier = Convert.ToSingle(result["density_multiplier"]);
+                        nWP.distanceMultiplier = Convert.ToSingle(result["distance_multiplier"]);
+                        nWP.maxAltitude = Convert.ToUInt16(result["max_altitude"]);
+                        nWP.sunMoonColor.X = Convert.ToSingle(result["sun_moon_color_r"]);
+                        nWP.sunMoonColor.Y = Convert.ToSingle(result["sun_moon_color_g"]);
+                        nWP.sunMoonColor.Z = Convert.ToSingle(result["sun_moon_color_b"]);
+                        nWP.sunMoonColor.W = Convert.ToSingle(result["sun_moon_color_i"]);
+                        nWP.sunMoonPosition = Convert.ToSingle(result["sun_moon_position"]);
+                        nWP.ambient.X = Convert.ToSingle(result["ambient_r"]);
+                        nWP.ambient.Y = Convert.ToSingle(result["ambient_g"]);
+                        nWP.ambient.Z = Convert.ToSingle(result["ambient_b"]);
+                        nWP.ambient.W = Convert.ToSingle(result["ambient_i"]);
+                        nWP.eastAngle = Convert.ToSingle(result["east_angle"]);
+                        nWP.sunGlowFocus = Convert.ToSingle(result["sun_glow_focus"]);
+                        nWP.sunGlowSize = Convert.ToSingle(result["sun_glow_size"]);
+                        nWP.sceneGamma = Convert.ToSingle(result["scene_gamma"]);
+                        nWP.starBrightness = Convert.ToSingle(result["star_brightness"]);
+                        nWP.cloudColor.X = Convert.ToSingle(result["cloud_color_r"]);
+                        nWP.cloudColor.Y = Convert.ToSingle(result["cloud_color_g"]);
+                        nWP.cloudColor.Z = Convert.ToSingle(result["cloud_color_b"]);
+                        nWP.cloudColor.W = Convert.ToSingle(result["cloud_color_i"]);
+                        nWP.cloudXYDensity.X = Convert.ToSingle(result["cloud_x"]);
+                        nWP.cloudXYDensity.Y = Convert.ToSingle(result["cloud_y"]);
+                        nWP.cloudXYDensity.Z = Convert.ToSingle(result["cloud_density"]);
+                        nWP.cloudCoverage = Convert.ToSingle(result["cloud_coverage"]);
+                        nWP.cloudScale = Convert.ToSingle(result["cloud_scale"]);
+                        nWP.cloudDetailXYDensity.X = Convert.ToSingle(result["cloud_detail_x"]);
+                        nWP.cloudDetailXYDensity.Y = Convert.ToSingle(result["cloud_detail_y"]);
+                        nWP.cloudDetailXYDensity.Z = Convert.ToSingle(result["cloud_detail_density"]);
+                        nWP.cloudScrollX = Convert.ToSingle(result["cloud_scroll_x"]);
+                        nWP.cloudScrollXLock = Convert.ToBoolean(result["cloud_scroll_x_lock"]);
+                        nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
+                        nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
+                        nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
+                        nWP.valid = true;
+                    }
+                }
+            }
+            return nWP;
+        }
+
+        public void RemoveRegionWindlightSettings(UUID regionID)
+        {
+            string sql = @"delete from regionwindlight where ""region_id"" = :region_id";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                conn.Open();
+                cmd.Parameters.Add(_Database.CreateParameter("region_id", regionID.ToString()));
+                cmd.ExecuteNonQuery();
+            }
+        }
+
+        public void StoreRegionWindlightSettings(RegionLightShareData wl)
+        {
+            string sql = @"select region_id from regionwindlight where ""region_id"" = :region_id limit 1;";
+            bool exists = false;
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString() ));
+                    NpgsqlDataReader dr = cmd.ExecuteReader();
+                    exists = dr.Read();
+                }
+            }
+            if (exists)
+            {
+                RemoveRegionWindlightSettings(wl.regionID);
+            }
+
+            // sql insert
+            sql = @"INSERT INTO regionwindlight
+                       (region_id
+                       ,water_color_r
+                       ,water_color_g
+                       ,water_color_b
+                       ,water_fog_density_exponent
+                       ,underwater_fog_modifier
+                       ,reflection_wavelet_scale_1
+                       ,reflection_wavelet_scale_2
+                       ,reflection_wavelet_scale_3
+                       ,fresnel_scale
+                       ,fresnel_offset
+                       ,refract_scale_above
+                       ,refract_scale_below
+                       ,blur_multiplier
+                       ,big_wave_direction_x
+                       ,big_wave_direction_y
+                       ,little_wave_direction_x
+                       ,little_wave_direction_y
+                       ,normal_map_texture
+                       ,horizon_r
+                       ,horizon_g
+                       ,horizon_b
+                       ,horizon_i
+                       ,haze_horizon
+                       ,blue_density_r
+                       ,blue_density_g
+                       ,blue_density_b
+                       ,blue_density_i
+                       ,haze_density
+                       ,density_multiplier
+                       ,distance_multiplier
+                       ,max_altitude
+                       ,sun_moon_color_r
+                       ,sun_moon_color_g
+                       ,sun_moon_color_b
+                       ,sun_moon_color_i
+                       ,sun_moon_position
+                       ,ambient_r
+                       ,ambient_g
+                       ,ambient_b
+                       ,ambient_i
+                       ,east_angle
+                       ,sun_glow_focus
+                       ,sun_glow_size
+                       ,scene_gamma
+                       ,star_brightness
+                       ,cloud_color_r
+                       ,cloud_color_g
+                       ,cloud_color_b
+                       ,cloud_color_i
+                       ,cloud_x
+                       ,cloud_y
+                       ,cloud_density
+                       ,cloud_coverage
+                       ,cloud_scale
+                       ,cloud_detail_x
+                       ,cloud_detail_y
+                       ,cloud_detail_density
+                       ,cloud_scroll_x
+                       ,cloud_scroll_x_lock
+                       ,cloud_scroll_y
+                       ,cloud_scroll_y_lock
+                       ,draw_classic_clouds)
+                 VALUES
+                       (:region_id
+                       ,:water_color_r
+                       ,:water_color_g
+                       ,:water_color_b
+                       ,:water_fog_density_exponent
+                       ,:underwater_fog_modifier
+                       ,:reflection_wavelet_scale_1
+                       ,:reflection_wavelet_scale_2
+                       ,:reflection_wavelet_scale_3
+                       ,:fresnel_scale
+                       ,:fresnel_offset
+                       ,:refract_scale_above
+                       ,:refract_scale_below
+                       ,:blur_multiplier
+                       ,:big_wave_direction_x
+                       ,:big_wave_direction_y
+                       ,:little_wave_direction_x
+                       ,:little_wave_direction_y
+                       ,:normal_map_texture
+                       ,:horizon_r
+                       ,:horizon_g
+                       ,:horizon_b
+                       ,:horizon_i
+                       ,:haze_horizon
+                       ,:blue_density_r
+                       ,:blue_density_g
+                       ,:blue_density_b
+                       ,:blue_density_i
+                       ,:haze_density
+                       ,:density_multiplier
+                       ,:distance_multiplier
+                       ,:max_altitude
+                       ,:sun_moon_color_r
+                       ,:sun_moon_color_g
+                       ,:sun_moon_color_b
+                       ,:sun_moon_color_i
+                       ,:sun_moon_position
+                       ,:ambient_r
+                       ,:ambient_g
+                       ,:ambient_b
+                       ,:ambient_i
+                       ,:east_angle
+                       ,:sun_glow_focus
+                       ,:sun_glow_size
+                       ,:scene_gamma
+                       ,:star_brightness
+                       ,:cloud_color_r
+                       ,:cloud_color_g
+                       ,:cloud_color_b
+                       ,:cloud_color_i
+                       ,:cloud_x
+                       ,:cloud_y
+                       ,:cloud_density
+                       ,:cloud_coverage
+                       ,:cloud_scale
+                       ,:cloud_detail_x
+                       ,:cloud_detail_y
+                       ,:cloud_detail_density
+                       ,:cloud_scroll_x
+                       ,:cloud_scroll_x_lock
+                       ,:cloud_scroll_y
+                       ,:cloud_scroll_y_lock
+                       ,:draw_classic_clouds);";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString()));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_color_r", wl.waterColor.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_color_g", wl.waterColor.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_color_b", wl.waterColor.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("water_fog_density_exponent", wl.waterFogDensityExponent));
+                    cmd.Parameters.Add(_Database.CreateParameter("underwater_fog_modifier", wl.underwaterFogModifier));
+                    cmd.Parameters.Add(_Database.CreateParameter("reflection_wavelet_scale_1", wl.reflectionWaveletScale.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("reflection_wavelet_scale_2", wl.reflectionWaveletScale.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("reflection_wavelet_scale_3", wl.reflectionWaveletScale.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("fresnel_scale", wl.fresnelScale));
+                    cmd.Parameters.Add(_Database.CreateParameter("fresnel_offset", wl.fresnelOffset));
+                    cmd.Parameters.Add(_Database.CreateParameter("refract_scale_above", wl.refractScaleAbove));
+                    cmd.Parameters.Add(_Database.CreateParameter("refract_scale_below", wl.refractScaleBelow));
+                    cmd.Parameters.Add(_Database.CreateParameter("blur_multiplier", wl.blurMultiplier));
+                    cmd.Parameters.Add(_Database.CreateParameter("big_wave_direction_x", wl.bigWaveDirection.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("big_wave_direction_y", wl.bigWaveDirection.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_x", wl.littleWaveDirection.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_y", wl.littleWaveDirection.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("normal_map_texture", wl.normalMapTexture.ToString()));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_r", wl.horizon.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_g", wl.horizon.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_b", wl.horizon.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("horizon_i", wl.horizon.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("haze_horizon", wl.hazeHorizon));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_r", wl.blueDensity.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_g", wl.blueDensity.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_b", wl.blueDensity.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("blue_density_i", wl.blueDensity.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("haze_density", wl.hazeDensity));
+                    cmd.Parameters.Add(_Database.CreateParameter("density_multiplier", wl.densityMultiplier));
+                    cmd.Parameters.Add(_Database.CreateParameter("distance_multiplier", wl.distanceMultiplier));
+                    cmd.Parameters.Add(_Database.CreateParameter("max_altitude", wl.maxAltitude));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_r", wl.sunMoonColor.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_g", wl.sunMoonColor.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_b", wl.sunMoonColor.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_color_i", wl.sunMoonColor.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_moon_position", wl.sunMoonPosition));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_r", wl.ambient.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_g", wl.ambient.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_b", wl.ambient.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("ambient_i", wl.ambient.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("east_angle", wl.eastAngle));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_glow_focus", wl.sunGlowFocus));
+                    cmd.Parameters.Add(_Database.CreateParameter("sun_glow_size", wl.sunGlowSize));
+                    cmd.Parameters.Add(_Database.CreateParameter("scene_gamma", wl.sceneGamma));
+                    cmd.Parameters.Add(_Database.CreateParameter("star_brightness", wl.starBrightness));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_r", wl.cloudColor.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_g", wl.cloudColor.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_b", wl.cloudColor.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_color_i", wl.cloudColor.W));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_x", wl.cloudXYDensity.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_y", wl.cloudXYDensity.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_density", wl.cloudXYDensity.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_coverage", wl.cloudCoverage));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scale", wl.cloudScale));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_detail_x", wl.cloudDetailXYDensity.X));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_detail_y", wl.cloudDetailXYDensity.Y));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_detail_density", wl.cloudDetailXYDensity.Z));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_x", wl.cloudScrollX));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_x_lock", wl.cloudScrollXLock));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_y", wl.cloudScrollY));
+                    cmd.Parameters.Add(_Database.CreateParameter("cloud_scroll_y_lock", wl.cloudScrollYLock));
+                    cmd.Parameters.Add(_Database.CreateParameter("draw_classic_clouds", wl.drawClassicClouds));
+
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            #region update
+            //            }
+            //            else
+            //            {
+            //                // sql update
+            //                sql = @"UPDATE [OpenSim].[dbo].[regionwindlight]
+            //   SET [region_id] =                   @region_id
+            //      ,[water_color_r] =               @water_color_r
+            //      ,[water_color_g] =               @water_color_g
+            //      ,[water_color_b] =               @water_color_b
+            //      ,[water_fog_density_exponent] =  @water_fog_density_exponent
+            //      ,[underwater_fog_modifier] =     @underwater_fog_modifier
+            //      ,[reflection_wavelet_scale_1] =  @reflection_wavelet_scale_1
+            //      ,[reflection_wavelet_scale_2] =  @reflection_wavelet_scale_2
+            //      ,[reflection_wavelet_scale_3] =  @reflection_wavelet_scale_3
+            //      ,[fresnel_scale] =               @fresnel_scale
+            //      ,[fresnel_offset] =              @fresnel_offset
+            //      ,[refract_scale_above] =         @refract_scale_above
+            //      ,[refract_scale_below] =         @refract_scale_below
+            //      ,[blur_multiplier] =             @blur_multiplier
+            //      ,[big_wave_direction_x] =        @big_wave_direction_x
+            //      ,[big_wave_direction_y] =        @big_wave_direction_y
+            //      ,[little_wave_direction_x] =     @little_wave_direction_x
+            //      ,[little_wave_direction_y] =     @little_wave_direction_y
+            //      ,[normal_map_texture] =          @normal_map_texture
+            //      ,[horizon_r] =                   @horizon_r
+            //      ,[horizon_g] =                   @horizon_g
+            //      ,[horizon_b] =                   @horizon_b
+            //      ,[horizon_i] =                   @horizon_i
+            //      ,[haze_horizon] =                @haze_horizon
+            //      ,[blue_density_r] =              @blue_density_r
+            //      ,[blue_density_g] =              @blue_density_g
+            //      ,[blue_density_b] =              @blue_density_b
+            //      ,[blue_density_i] =              @blue_density_i
+            //      ,[haze_density] =                @haze_density
+            //      ,[density_multiplier] =          @density_multiplier
+            //      ,[distance_multiplier] =         @distance_multiplier
+            //      ,[max_altitude] =                @max_altitude
+            //      ,[sun_moon_color_r] =            @sun_moon_color_r
+            //      ,[sun_moon_color_g] =            @sun_moon_color_g
+            //      ,[sun_moon_color_b] =            @sun_moon_color_b
+            //      ,[sun_moon_color_i] =            @sun_moon_color_i
+            //      ,[sun_moon_position] =           @sun_moon_position
+            //      ,[ambient_r] =                   @ambient_r
+            //      ,[ambient_g] =                   @ambient_g
+            //      ,[ambient_b] =                   @ambient_b
+            //      ,[ambient_i] =                   @ambient_i
+            //      ,[east_angle] =                  @east_angle
+            //      ,[sun_glow_focus] =              @sun_glow_focus
+            //      ,[sun_glow_size] =               @sun_glow_size
+            //      ,[scene_gamma] =                 @scene_gamma
+            //      ,[star_brightness] =             @star_brightness
+            //      ,[cloud_color_r] =               @cloud_color_r
+            //      ,[cloud_color_g] =               @cloud_color_g
+            //      ,[cloud_color_b] =               @cloud_color_b
+            //      ,[cloud_color_i] =               @cloud_color_i
+            //      ,[cloud_x] =                     @cloud_x
+            //      ,[cloud_y] =                     @cloud_y
+            //      ,[cloud_density] =               @cloud_density
+            //      ,[cloud_coverage] =              @cloud_coverage
+            //      ,[cloud_scale] =                 @cloud_scale
+            //      ,[cloud_detail_x] =              @cloud_detail_x
+            //      ,[cloud_detail_y] =              @cloud_detail_y
+            //      ,[cloud_detail_density] =        @cloud_detail_density
+            //      ,[cloud_scroll_x] =              @cloud_scroll_x
+            //      ,[cloud_scroll_x_lock] =         @cloud_scroll_x_lock
+            //      ,[cloud_scroll_y] =              @cloud_scroll_y
+            //      ,[cloud_scroll_y_lock] =         @cloud_scroll_y_lock
+            //      ,[draw_classic_clouds] =         @draw_classic_clouds
+            // WHERE region_id = @region_id";
+            //                using (SqlConnection conn = new SqlConnection(m_connectionString))
+            //                {
+            //                    conn.Open();
+            //                    using (SqlCommand cmd = new SqlCommand(sql, conn))
+            //                    {
+            //                        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);
+
+            //                        cmd.ExecuteNonQuery();
+            //                    }
+            //                }
+            //            }
+            #endregion
+        }
 
         #region Environment Settings
         public string LoadRegionEnvironmentSettings(UUID regionUUID)
@@ -966,7 +1347,7 @@ namespace OpenSim.Data.PGSQL
 ,terrain_lower_limit = :terrain_lower_limit ,use_estate_sun = :use_estate_sun ,fixed_sun = :fixed_sun ,sun_position = :sun_position 
 ,covenant = :covenant ,covenant_datetime = :covenant_datetime, sunvectorx = :sunvectorx, sunvectory = :sunvectory, sunvectorz = :sunvectorz,  
 ""Sandbox"" = :Sandbox, loaded_creation_datetime = :loaded_creation_datetime, loaded_creation_id = :loaded_creation_id, ""map_tile_ID"" = :TerrainImageID, 
-""TelehubObject"" = :telehubobject, ""parcel_tile_ID"" = :ParcelImageID, ""cacheID"" = :cacheID
+""TelehubObject"" = :telehubobject, ""parcel_tile_ID"" = :ParcelImageID
  WHERE ""regionUUID"" = :regionUUID";
 
                 using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
@@ -1081,8 +1462,6 @@ namespace OpenSim.Data.PGSQL
             newSettings.ParcelImageID = new UUID((Guid)row["parcel_tile_ID"]);
             newSettings.TelehubObject = new UUID((Guid)row["TelehubObject"]);
 
-            if (!(row["cacheID"] is DBNull))
-                newSettings.CacheID = new UUID((Guid)row["cacheID"]);
             return newSettings;
         }
 
@@ -1136,7 +1515,6 @@ namespace OpenSim.Data.PGSQL
             newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]);
 
             newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
-            newData.Dwell = Convert.ToSingle(row["Dwell"]);
 
             try
             {
@@ -1163,39 +1541,6 @@ namespace OpenSim.Data.PGSQL
             newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
             newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
 
-            newData.SeeAVs = Convert.ToBoolean(row["SeeAVs"]);
-            newData.AnyAVSounds = Convert.ToBoolean(row["AnyAVSounds"]);
-            newData.GroupAVSounds = Convert.ToBoolean(row["GroupAVSounds"]);
-
-            if (row["environment"] is DBNull)
-            {
-                newData.Environment = null;
-                newData.EnvironmentVersion = -1;
-            }
-            else
-            {
-                string env = (string)row["environment"];
-                if (string.IsNullOrEmpty(env))
-                {
-                    newData.Environment = null;
-                    newData.EnvironmentVersion = -1;
-                }
-                else
-                {
-                    try
-                    {
-                        ViewerEnvironment VEnv = ViewerEnvironment.FromOSDString(env);
-                        newData.Environment = VEnv;
-                        newData.EnvironmentVersion = VEnv.version;
-                    }
-                    catch
-                    {
-                        newData.Environment = null;
-                        newData.EnvironmentVersion = -1;
-                    }
-                }
-            }
-
             return newData;
         }
 
@@ -1243,12 +1588,6 @@ namespace OpenSim.Data.PGSQL
             prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);
             prim.GroupID = new UUID((Guid)primRow["GroupID"]);
             prim.LastOwnerID = new UUID((Guid)primRow["LastOwnerID"]);
-            
-            if (primRow["RezzerID"] != DBNull.Value)
-                prim.RezzerID = new UUID((Guid)primRow["RezzerID"]);
-            else
-                prim.RezzerID = UUID.Zero;
-                
             prim.OwnerMask = Convert.ToUInt32(primRow["OwnerMask"]);
             prim.NextOwnerMask = Convert.ToUInt32(primRow["NextOwnerMask"]);
             prim.GroupMask = Convert.ToUInt32(primRow["GroupMask"]);
@@ -1292,20 +1631,12 @@ namespace OpenSim.Data.PGSQL
                                 Convert.ToSingle(primRow["SitTargetOffsetY"]),
                                 Convert.ToSingle(primRow["SitTargetOffsetZ"]));
 
-
             prim.SitTargetOrientationLL = new Quaternion(
                                 Convert.ToSingle(primRow["SitTargetOrientX"]),
                                 Convert.ToSingle(primRow["SitTargetOrientY"]),
                                 Convert.ToSingle(primRow["SitTargetOrientZ"]),
                                 Convert.ToSingle(primRow["SitTargetOrientW"]));
 
-            prim.StandOffset = new Vector3(
-                               Convert.ToSingle(primRow["standtargetx"]),
-                               Convert.ToSingle(primRow["standtargety"]),
-                               Convert.ToSingle(primRow["standtargetz"]));
-
-            prim.SitActiveRange = Convert.ToSingle(primRow["sitactrange"]);
-
             prim.PayPrice[0] = Convert.ToInt32(primRow["PayPrice"]);
             prim.PayPrice[1] = Convert.ToInt32(primRow["PayButton1"]);
             prim.PayPrice[2] = Convert.ToInt32(primRow["PayButton2"]);
@@ -1314,10 +1645,7 @@ namespace OpenSim.Data.PGSQL
 
             prim.Sound = new UUID((Guid)primRow["LoopedSound"]);
             prim.SoundGain = Convert.ToSingle(primRow["LoopedSoundGain"]);
-            if (prim.Sound != UUID.Zero)
             prim.SoundFlags = 1; // If it's persisted at all, it's looped
-            else
-                prim.SoundFlags = 0;
 
             if (!(primRow["TextureAnimation"] is DBNull))
                 prim.TextureAnimation = (Byte[])primRow["TextureAnimation"];
@@ -1364,7 +1692,6 @@ namespace OpenSim.Data.PGSQL
             prim.CollisionSoundVolume = Convert.ToSingle(primRow["CollisionSoundVolume"]);
 
             prim.PassTouches = (bool)primRow["PassTouches"];
-            prim.PassCollisions = (bool)primRow["PassCollisions"];
 
             if (!(primRow["MediaURL"] is System.DBNull))
                 prim.MediaUrl = (string)primRow["MediaURL"];
@@ -1372,31 +1699,13 @@ namespace OpenSim.Data.PGSQL
             if (!(primRow["DynAttrs"] is System.DBNull) && (string)primRow["DynAttrs"] != "")
                 prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
             else
-                prim.DynAttrs = null;
+                prim.DynAttrs = new DAMap();             
 
             prim.PhysicsShapeType = Convert.ToByte(primRow["PhysicsShapeType"]);
             prim.Density = Convert.ToSingle(primRow["Density"]);
             prim.GravityModifier = Convert.ToSingle(primRow["GravityModifier"]);
             prim.Friction = Convert.ToSingle(primRow["Friction"]);
             prim.Restitution = Convert.ToSingle(primRow["Restitution"]);
-            prim.RotationAxisLocks = Convert.ToByte(primRow["RotationAxisLocks"]);
-
-            SOPVehicle vehicle = null;
-            if (!(primRow["Vehicle"] is System.DBNull))
-            {
-                vehicle = SOPVehicle.FromXml2(primRow["Vehicle"].ToString());
-                if (vehicle != null)
-                    prim.VehicleParams = vehicle;
-            }
-
-            PhysicsInertiaData pdata = null;
-            if (!(primRow["PhysInertia"] is System.DBNull))
-                pdata = PhysicsInertiaData.FromXml2(primRow["PhysInertia"].ToString());
-            prim.PhysicsInertia = pdata;
-
-            int pseudocrc = Convert.ToInt32(primRow["pseudocrc"]);
-            if(pseudocrc != 0)
-                prim.PseudoCRC = pseudocrc;
 
             return prim;
         }
@@ -1584,8 +1893,6 @@ namespace OpenSim.Data.PGSQL
             parameters.Add(_Database.CreateParameter("ParcelImageID", settings.ParcelImageID));
             parameters.Add(_Database.CreateParameter("TelehubObject", settings.TelehubObject));
 
-            parameters.Add(_Database.CreateParameter("cacheID", settings.CacheID));
-
             return parameters.ToArray();
         }
 
@@ -1635,31 +1942,6 @@ namespace OpenSim.Data.PGSQL
             parameters.Add(_Database.CreateParameter("UserLookAtZ", land.UserLookAt.Z));
             parameters.Add(_Database.CreateParameter("AuthBuyerID", land.AuthBuyerID));
             parameters.Add(_Database.CreateParameter("OtherCleanTime", land.OtherCleanTime));
-            parameters.Add(_Database.CreateParameter("Dwell", land.Dwell));
-            parameters.Add(_Database.CreateParameter("MediaDescription", land.MediaDescription));
-            parameters.Add(_Database.CreateParameter("MediaType", land.MediaType));
-            parameters.Add(_Database.CreateParameter("MediaWidth", land.MediaWidth));
-            parameters.Add(_Database.CreateParameter("MediaHeight", land.MediaHeight));
-            parameters.Add(_Database.CreateParameter("MediaLoop", land.MediaLoop));
-            parameters.Add(_Database.CreateParameter("ObscureMusic", land.ObscureMusic));
-            parameters.Add(_Database.CreateParameter("ObscureMedia", land.ObscureMedia));
-            parameters.Add(_Database.CreateParameter("SeeAVs", land.SeeAVs));
-            parameters.Add(_Database.CreateParameter("AnyAVSounds", land.AnyAVSounds));
-            parameters.Add(_Database.CreateParameter("GroupAVSounds", land.GroupAVSounds));
-
-            if (land.Environment == null)
-                parameters.Add(_Database.CreateParameter("environment", ""));
-            else
-            {
-                try
-                {
-                    parameters.Add(_Database.CreateParameter("environment", ViewerEnvironment.ToOSDString(land.Environment)));
-                }
-                catch
-                {
-                    parameters.Add(_Database.CreateParameter("environment", ""));
-                }
-            }
 
             return parameters.ToArray();
         }
@@ -1714,7 +1996,6 @@ namespace OpenSim.Data.PGSQL
             parameters.Add(_Database.CreateParameter("OwnerID", prim.OwnerID));
             parameters.Add(_Database.CreateParameter("GroupID", prim.GroupID));
             parameters.Add(_Database.CreateParameter("LastOwnerID", prim.LastOwnerID));
-            parameters.Add(_Database.CreateParameter("RezzerID", prim.RezzerID));
             parameters.Add(_Database.CreateParameter("OwnerMask", prim.OwnerMask));
             parameters.Add(_Database.CreateParameter("NextOwnerMask", prim.NextOwnerMask));
             parameters.Add(_Database.CreateParameter("GroupMask", prim.GroupMask));
@@ -1754,13 +2035,6 @@ namespace OpenSim.Data.PGSQL
             parameters.Add(_Database.CreateParameter("SitTargetOrientY", sitTargetOrient.Y));
             parameters.Add(_Database.CreateParameter("SitTargetOrientZ", sitTargetOrient.Z));
 
-            Vector3 standTargetPos = prim.StandOffset;
-            parameters.Add(_Database.CreateParameter("standtargetx", standTargetPos.X));
-            parameters.Add(_Database.CreateParameter("standtargety", standTargetPos.Y));
-            parameters.Add(_Database.CreateParameter("standtargetz", standTargetPos.Z));
-
-            parameters.Add(_Database.CreateParameter("sitactrange", prim.SitActiveRange));
-
             parameters.Add(_Database.CreateParameter("PayPrice", prim.PayPrice[0]));
             parameters.Add(_Database.CreateParameter("PayButton1", prim.PayPrice[1]));
             parameters.Add(_Database.CreateParameter("PayButton2", prim.PayPrice[2]));
@@ -1821,33 +2095,12 @@ namespace OpenSim.Data.PGSQL
             parameters.Add(_Database.CreateParameter("CollisionSound", prim.CollisionSound));
             parameters.Add(_Database.CreateParameter("CollisionSoundVolume", prim.CollisionSoundVolume));
             
-            parameters.Add(_Database.CreateParameter("PassTouches", (bool)prim.PassTouches));
-            parameters.Add(_Database.CreateParameter("PassCollisions", (bool)prim.PassCollisions));
-
-            if (prim.PassTouches)
-                parameters.Add(_Database.CreateParameter("PassTouches", true));
-            else
-                parameters.Add(_Database.CreateParameter("PassTouches", false));
-
-            if (prim.PassCollisions)
-                parameters.Add(_Database.CreateParameter("PassCollisions", true));
-            else
-                parameters.Add(_Database.CreateParameter("PassCollisions", false));
+            parameters.Add(_Database.CreateParameter("PassTouches", prim.PassTouches));
 
             parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
             parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
             
-            if (prim.VehicleParams != null)
-                parameters.Add(_Database.CreateParameter("Vehicle", prim.VehicleParams.ToXml2()));
-            else
-                parameters.Add(_Database.CreateParameter("Vehicle", String.Empty));
-
-            if (prim.PhysicsInertia != null)
-                parameters.Add(_Database.CreateParameter("PhysInertia", prim.PhysicsInertia.ToXml2()));
-            else
-                parameters.Add(_Database.CreateParameter("PhysInertia", String.Empty));
-
-            if (prim.DynAttrs != null && prim.DynAttrs.CountNamespaces > 0)
+            if (prim.DynAttrs.CountNamespaces > 0)
                 parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
             else
                 parameters.Add(_Database.CreateParameter("DynAttrs", null));
@@ -1857,15 +2110,12 @@ namespace OpenSim.Data.PGSQL
             parameters.Add(_Database.CreateParameter("GravityModifier", (double)prim.GravityModifier));
             parameters.Add(_Database.CreateParameter("Friction", (double)prim.Friction));
             parameters.Add(_Database.CreateParameter("Restitution", (double)prim.Restitution));
-            parameters.Add(_Database.CreateParameter("RotationAxisLocks", prim.RotationAxisLocks));
-
-            parameters.Add(_Database.CreateParameter("pseudocrc", prim.PseudoCRC));
 
             return parameters.ToArray();
         }
 
         /// <summary>
-        /// Creates the primshape parameters for storing in DB.
+        /// Creates the primshape parameters for stroing in DB.
         /// </summary>
         /// <param name="prim">Basic data of SceneObjectpart prim.</param>
         /// <param name="sceneGroupID">The scene group ID.</param>

OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs

@@ -845,7 +845,7 @@ namespace OpenSim.Data.PGSQL
 
                     query = "SELECT \"profileImage\", \"profileFirstImage\" FROM \"userprofile\" WHERE \"useruuid\" = :Id";
 
-                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format(query, "\"userpicks\""), dbcon))
                     {
                         cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
 

OpenSim/Data/PGSQL/PGSQLXAssetData.cs

@@ -173,15 +173,13 @@ namespace OpenSim.Data.PGSQL
 
                                     if (m_enableCompression)
                                     {
-                                        using(MemoryStream ms = new MemoryStream(asset.Data))
-                                        using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress))
+                                        using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress))
                                         {
-                                            using(MemoryStream outputStream = new MemoryStream())
-                                            {
-                                                decompressionStream.CopyTo(outputStream,int.MaxValue);
+                                            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);
@@ -520,10 +518,9 @@ namespace OpenSim.Data.PGSQL
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
                 {
                     dbcon.Open();
-                    using(NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
+                    NpgsqlCommand cmd = new NpgsqlCommand( @"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
                                             FROM XAssetsMeta 
-                                            LIMIT :start, :count",dbcon))
-                    {
+                                            LIMIT :start, :count", dbcon);
                     cmd.Parameters.Add(m_database.CreateParameter("start", start));
                     cmd.Parameters.Add(m_database.CreateParameter("count", count));
 
@@ -557,7 +554,6 @@ namespace OpenSim.Data.PGSQL
                     }
                 }
             }
-            }
 
             return retList;
         }