flotsam: minor log message change

# Conflicts:
#	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
#	bin/OpenMetaverse.Rendering.Meshmerizer.dll
#	bin/OpenMetaverse.StructuredData.dll
#	bin/OpenMetaverse.dll
#	bin/OpenMetaverseTypes.dll

BUILDING.md

@@ -1,38 +1,35 @@
 # 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
+# Building on Linux / Mac
 
 Prereqs:
-*	Mono >= 2.4.3
-*	Nant >= 0.85
-*	On some Linux distributions you may need to install additional packages.
-	See http://opensimulator.org/wiki/Dependencies for more information.
-*	May also use xbuild (included in mono distributions)
-*	May use Monodevelop, a cross-platform IDE
+
+ *	Mono > 5.0
+ *	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.
 
 From the distribution type:
+
  * ./runprebuild.sh
- * nant (or !* xbuild)
+ * type msbuild or xbuild
  * cd bin 
  * copy OpenSim.ini.example to OpenSim.ini and other appropriate files in bin/config-include
- * 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
+ * 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
 
 # References
  

CONTRIBUTORS.txt

@@ -4,14 +4,9 @@ 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)
 
@@ -20,11 +15,8 @@ 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. 
 
-* Teravus (w3z)
-* Arthur Rodrigo S Valadares (IBM)
-* Dan Lake 
-* Marck
-* Mic Bowman
+* Nebadon Izumi (Michael Cerquoni, OSgrid)
+* Alicia Raven
 
 = Past Open Sim Developers =
 These folks are alumns of the OpenSim core group, but are now
@@ -57,7 +49,15 @@ 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
@@ -131,6 +131,7 @@ what it is today.
 * KittyLiu
 * Kurt Taylor (IBM)
 * Lani Global
+* lickx
 * lillith_xue
 * lkalif
 * LuciusSirnah
@@ -142,6 +143,7 @@ what it is today.
 * Mandarinka Tasty
 * MarcelEdward
 * Matt Lehmann
+* mewtwo0641
 * Mic Bowman
 * Michelle Argus
 * Michael Cortez (The Flotsam Project, http://osflotsam.org/)
@@ -149,6 +151,7 @@ what it is today.
 * Micheil Merlin
 * Mike Osias (IBM)
 * Mike Pitman (IBM)
+* Mike Rieker (Dreamnation)
 * mikemig
 * mikkopa/_someone - RealXtend
 * Misterblue
@@ -182,16 +185,20 @@ 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.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled);
+            MainConsole.Instance.Output("{0} verbose logging set to {1}", Name, m_debugEnabled);
         }
 
         /// <summary>
@@ -599,36 +599,34 @@ 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>();
-                    eq.ChatterboxInvitation(
-                        GroupID
-                        , groupInfo.GroupName
-                        , new UUID(msg.fromAgentID)
-                        , msg.message
-                        , AgentID
-                        , msg.fromAgentName
-                        , msg.dialog
-                        , msg.timestamp
-                        , msg.offline == 1
-                        , (int)msg.ParentEstateID
-                        , msg.Position
-                        , 1
-                        , new UUID(msg.imSessionID)
-                        , msg.fromGroup
-                        , OpenMetaverse.Utils.StringToBytes(groupInfo.GroupName)
-                        );
+                    if (eq != null)
+                    {
+                        eq.ChatterboxInvitation(
+                            GroupID
+                            , groupInfo.GroupName
+                            , fromAgent
+                            , msg.message
+                            , AgentID
+                            , msg.fromAgentName
+                            , msg.dialog
+                            , msg.timestamp
+                            , msg.offline == 1
+                            , (int)msg.ParentEstateID
+                            , msg.Position
+                            , 1
+                            , new UUID(msg.imSessionID)
+                            , msg.fromGroup
+                            , OpenMetaverse.Utils.StringToBytes(groupInfo.GroupName)
+                            );
 
-                    eq.ChatterBoxSessionAgentListUpdates(
-                        new UUID(GroupID)
-                        , AgentID
-                        , new UUID(msg.toAgentID)
-                        , false //canVoiceChat
-                        , false //isModerator
-                        , false //text mute
-                        , true // Enter
-                        );
+                        var update = new GroupChatListAgentUpdateData(AgentID);
+                        var updates = new List<GroupChatListAgentUpdateData> { update };
+                        eq.ChatterBoxSessionAgentListUpdates(GroupID, new UUID(msg.toAgentID), updates);
+                    }
                 }
             }
         }
@@ -663,15 +661,12 @@ namespace OpenSim.Groups
                     ChatterBoxSessionStartReplyViaCaps(remoteClient, groupInfo.GroupName, GroupID);
 
                     IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
-                    queue.ChatterBoxSessionAgentListUpdates(
-                        GroupID
-                        , AgentID
-                        , new UUID(im.toAgentID)
-                        , false //canVoiceChat
-                        , false //isModerator
-                        , false //text mute
-                        , true
-                        );
+                    if (queue != null)
+                    {
+                        var update = new GroupChatListAgentUpdateData(AgentID);
+                        var updates = new List<GroupChatListAgentUpdateData> { update };
+                        queue.ChatterBoxSessionAgentListUpdates(GroupID, remoteClient.AgentId, updates);
+                    }
                 }
             }
 
@@ -713,11 +708,7 @@ namespace OpenSim.Groups
             bodyMap.Add("session_info", sessionMap);
 
             IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
-
-            if (queue != null)
-            {
-                queue.Enqueue(queue.BuildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId);
-            }
+            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 DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags;
+using PermissionMask = OpenSim.Framework.PermissionMask;
 
 namespace OpenSim.Groups
 {
@@ -127,7 +127,7 @@ namespace OpenSim.Groups
 
             m_debugEnabled = verbose;
 
-            MainConsole.Instance.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled);
+            MainConsole.Instance.Output("{0} verbose logging set to {1}", Name, m_debugEnabled);
         }
 
         public void RegionLoaded(Scene scene)
@@ -233,7 +233,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;
         }
 
 
@@ -249,7 +249,7 @@ namespace OpenSim.Groups
             // 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.haveGroupInformation)
+            if(!sp.m_haveGroupInformation)
                 SendAgentGroupDataUpdate(sp.ControllingClient, false);
         }
 
@@ -261,7 +261,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 +269,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 +281,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;
@@ -344,14 +344,24 @@ namespace OpenSim.Groups
 
         private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im)
         {
-            if (m_debugEnabled) m_log.DebugFormat("[Groups]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
+            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();
 
             //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(GetRequestingAgentIDStr(remoteClient), inviteID);
+                GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(remoteAgentIDstr, inviteID);
 
                 if (inviteInfo == null)
                 {
@@ -374,7 +384,7 @@ namespace OpenSim.Groups
 
                         // and the sessionid is the role
                         string reason = string.Empty;
-                        if (!m_groupData.AddAgentToGroup(GetRequestingAgentIDStr(remoteClient), invitee.ToString(), inviteInfo.GroupID, inviteInfo.RoleID, string.Empty, out reason))
+                        if (!m_groupData.AddAgentToGroup(remoteAgentIDstr, invitee.ToString(), inviteInfo.GroupID, inviteInfo.RoleID, string.Empty, out reason))
                             remoteClient.SendAgentAlertMessage("Unable to add you to the group: " + reason, false);
                         else
                         {
@@ -401,121 +411,237 @@ namespace OpenSim.Groups
                             }
                         }
 
-                        m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentIDStr(remoteClient), inviteID);
+                        m_groupData.RemoveAgentToGroupInvite(remoteAgentIDstr, inviteID);
                     }
 
                     // Reject
                     if (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)
                     {
-                        if (m_debugEnabled) m_log.DebugFormat("[Groups]: Received a reject invite notice.");
-                        m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentIDStr(remoteClient), inviteID);
+                        if (m_debugEnabled)
+                            m_log.DebugFormat("[Groups]: Received a reject invite notice.");
 
-                        m_groupData.RemoveAgentFromGroup(GetRequestingAgentIDStr(remoteClient), inviteInfo.AgentID, inviteInfo.GroupID);
+                        m_groupData.RemoveAgentToGroupInvite(remoteAgentIDstr, inviteID);
+                        m_groupData.RemoveAgentFromGroup(remoteAgentIDstr, inviteInfo.AgentID, inviteInfo.GroupID);
                     }
                 }
             }
 
             // Group notices
-            if ((im.dialog == (byte)InstantMessageDialog.GroupNotice))
+            else 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)
                 {
+                    remoteClient.SendAgentAlertMessage("Group membership not found", false);
                     return;
                 }
 
-                UUID GroupID = new UUID(im.toAgentID);
-                if (m_groupData.GetGroupRecord(GetRequestingAgentIDStr(remoteClient), GroupID, null) != null)
+                if ((grpMemberData.GroupPowers & (ulong)GroupPowers.SendNotices) == 0)
                 {
-                    UUID NoticeID = UUID.Random();
-                    string Subject = im.message.Substring(0, im.message.IndexOf('|'));
-                    string Message = im.message.Substring(Subject.Length + 1);
+                    remoteClient.SendAgentAlertMessage("No permission to send notice to group", false);
+                    return;
+                }
 
-                    InventoryItemBase item = null;
-                    bool hasAttachment = false;
+                int index = im.message.IndexOf('|');
+                if (index < 0)
+                    return;
 
-                    if (im.binaryBucket.Length >= 1 && im.binaryBucket[0] > 0)
+                string Subject = im.message.Substring(0, index);
+                string Message = im.message.Substring(index + 1);
+
+                UUID NoticeID = UUID.Random();
+
+                InventoryItemBase item = null;
+                bool hasAttachment = false;
+
+                if (im.binaryBucket.Length >= 1 && im.binaryBucket[0] > 0)
+                {
+                    UUID itemID = UUID.Zero;
+                    UUID ownerID = UUID.Zero;
+                    try
                     {
-                        hasAttachment = true;
-                        string binBucket = OpenMetaverse.Utils.BytesToString(im.binaryBucket);
-                        binBucket = binBucket.Remove(0, 14).Trim();
+                        string binBucket = Utils.BytesToString(im.binaryBucket);
+                        binBucket = binBucket.Substring(15); // remove extra LLSD pre header
 
-                        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 = m_sceneList[0].InventoryService.GetItem(ownerID, itemID);
-                        }
-                        else
-                            m_log.DebugFormat("[Groups]: Received OSD with unexpected type: {0}", binBucketOSD.GetType());
+                        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 (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()))
+                    if (itemID != UUID.Zero && ownerID != UUID.Zero)
                     {
-                        if (OnNewGroupNotice != null)
+                        item = scene.InventoryService.GetItem(ownerID, itemID);
+                        if(item != null)
                         {
-                            OnNewGroupNotice(GroupID, NoticeID);
-                        }
-
-                        // Send notice out to everyone that wants notices
-                        foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentIDStr(remoteClient), GroupID))
-                        {
-                            if (member.AcceptNotices)
+                            if ((item.CurrentPermissions & (uint)(PermissionMask.Transfer | PermissionMask.Copy)) !=
+                                    (uint)(PermissionMask.Transfer | PermissionMask.Copy))
                             {
-                                // 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);
+                                remoteClient.SendAgentAlertMessage("Item must be have Copy and Transfer rights to attach to group notice", false);
+                                return;
                             }
                         }
+                        hasAttachment = true;
+                    }
+                }
+
+                if (m_groupData.AddGroupNotice(remoteAgentIDstr, 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);
+
+                    // Send notice out to everyone that wants notices
+                    foreach (GroupMembersData member in m_groupData.GetGroupMembers(remoteAgentIDstr, 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
+                            msg.toAgentID = member.AgentID.Guid;
+                            OutgoingInstantMessage(msg, member.AgentID);
+                        }
                     }
                 }
             }
 
             if (im.dialog == (byte)InstantMessageDialog.GroupNoticeInventoryAccepted)
             {
-                if (im.binaryBucket.Length < 16) // Invalid
+                if (!m_groupNoticesEnabled)
                     return;
 
-                //// 16 bytes are the UUID. Maybe.
-//                UUID folderID = new UUID(im.binaryBucket, 0);
                 UUID noticeID = new UUID(im.imSessionID);
 
-                GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteClient.AgentId.ToString(), noticeID);
-                if (notice != null)
+                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
                 {
-                    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;
-                    InventoryItemBase itemCopy = ((Scene)(remoteClient.Scene)).GiveInventoryItem(remoteClient.AgentId,
-                        giver, notice.noticeData.AttachmentItemID, out message);
-
-                    if (itemCopy == null)
-                    {
-                        remoteClient.SendAgentAlertMessage(message, false);
-                        return;
-                    }
-
-                    remoteClient.SendInventoryItemCreateUpdate(itemCopy, 0);
+                    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);
+                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);
+
+                if (itemCopy == null)
+                {
+                    remoteClient.SendAgentAlertMessage(message, false);
+                    return;
+                }
+
+                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
-            if ((im.dialog == 210))
+            else 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
@@ -949,6 +1075,7 @@ 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
@@ -959,7 +1086,6 @@ namespace OpenSim.Groups
                     bucket[18] = 0; // null terminated
                 }
 
-                info.GroupID.ToBytes(bucket, 2);
                 msg.binaryBucket = bucket;
             }
             else
@@ -1208,7 +1334,7 @@ namespace OpenSim.Groups
 
         public List<DirGroupsReplyData> FindGroups(IClientAPI remoteClient, string query)
         {
-            return m_groupData.FindGroups(GetRequestingAgentIDStr(remoteClient), query);
+            return m_groupData.FindGroups(remoteClient.AgentId.ToString(), query);
         }
 
         #endregion

OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs

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

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 RequestingAgentID, string search);
+        List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, 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 RequestingAgentID, string search)
+        public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string search)
         {
-            return m_GroupsService.FindGroups(RequestingAgentID, search);
+            return m_GroupsService.FindGroups(RequestingAgentIDstr, search);
         }
 
         public List<GroupMembersData> GetGroupMembers(string RequestingAgentID, UUID GroupID)

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 RequestingAgentID, string query)
+        public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, 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"] = RequestingAgentID;
+            sendData["RequestingAgentID"] = RequestingAgentIDstr;
 
             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 RequestingAgentID, string search)
+        public List<DirGroupsReplyData> FindGroups(string RequestingAgentIDstr, string search)
         {
             // TODO!
-            return m_GroupsService.FindGroups(RequestingAgentID, search);
+            return m_GroupsService.FindGroups(RequestingAgentIDstr, search);
         }
 
         public bool AddAgentToGroup(string RequestingAgentID, string AgentID, UUID GroupID, UUID RoleID, string token, out string reason)

OpenSim/Addons/Groups/Service/GroupsService.cs

@@ -43,60 +43,63 @@ namespace OpenSim.Groups
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public const GroupPowers DefaultEveryonePowers = GroupPowers.AllowSetHome |
-                                                         GroupPowers.Accountable |
-                                                         GroupPowers.JoinChat |
-                                                         GroupPowers.AllowVoiceChat |
-                                                         GroupPowers.ReceiveNotices |
-                                                         GroupPowers.StartProposal |
-                                                         GroupPowers.VoteOnProposal;
+        public const GroupPowers DefaultEveryonePowers =
+            GroupPowers.AllowSetHome |
+            GroupPowers.Accountable |
+            GroupPowers.JoinChat |
+            GroupPowers.AllowVoiceChat |
+            GroupPowers.ReceiveNotices |
+            GroupPowers.StartProposal |
+            GroupPowers.VoteOnProposal;
 
-        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.LandEjectAndFreeze |
-                                                GroupPowers.LandGardening |
-                                                GroupPowers.LandManageAllowed |
-                                                GroupPowers.LandManageBanned |
-                                                GroupPowers.LandManagePasses |
-                                                GroupPowers.LandOptions |
-                                                GroupPowers.LandRelease |
-                                                GroupPowers.LandSetSale |
-                                                GroupPowers.ModerateChat |
-                                                GroupPowers.ObjectManipulate |
-                                                GroupPowers.ObjectSetForSale |
-                                                GroupPowers.ReceiveNotices |
-                                                GroupPowers.RemoveMember |
-                                                GroupPowers.ReturnGroupOwned |
-                                                GroupPowers.ReturnGroupSet |
-                                                GroupPowers.ReturnNonGroup |
-                                                GroupPowers.RoleProperties |
-                                                GroupPowers.SendNotices |
-                                                GroupPowers.SetLandingPoint |
-                                                GroupPowers.StartProposal |
-                                                GroupPowers.VoteOnProposal;
+        public const GroupPowers OfficersPowers = DefaultEveryonePowers |
+            GroupPowers.AllowFly |
+            GroupPowers.AllowLandmark |
+            GroupPowers.AllowRez |
+            GroupPowers.AssignMemberLimited |
+            GroupPowers.ChangeIdentity |
+            GroupPowers.ChangeMedia |
+            GroupPowers.ChangeOptions |
+            GroupPowers.DeedObject |
+            GroupPowers.Eject |
+            GroupPowers.FindPlaces |
+            GroupPowers.Invite |
+            GroupPowers.LandChangeIdentity |
+            GroupPowers.LandDeed |
+            GroupPowers.LandDivideJoin |
+            GroupPowers.LandEdit |
+            GroupPowers.AllowEnvironment |
+            GroupPowers.LandEjectAndFreeze |
+            GroupPowers.LandGardening |
+            GroupPowers.LandManageAllowed |
+            GroupPowers.LandManageBanned |
+            GroupPowers.LandManagePasses |
+            GroupPowers.LandOptions |
+            GroupPowers.LandRelease |
+            GroupPowers.LandSetSale |
+            GroupPowers.MemberVisible |
+            GroupPowers.ModerateChat |
+            GroupPowers.ObjectManipulate |
+            GroupPowers.ObjectSetForSale |
+            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;
 
         #region Daily Cleanup
 
@@ -151,20 +154,25 @@ namespace OpenSim.Groups
             data.Data["ShowInList"] = showInList ? "1" : "0";
             data.Data["AllowPublish"] = allowPublish ? "1" : "0";
             data.Data["MaturePublish"] = maturePublish ? "1" : "0";
-            UUID roleID = UUID.Random();
-            data.Data["OwnerRoleID"] = roleID.ToString();
+            UUID ownerRoleID = UUID.Random();
+            data.Data["OwnerRoleID"] = ownerRoleID.ToString();
 
             if (!m_Database.StoreGroup(data))
                 return UUID.Zero;
 
             // Create Everyone role
-            _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, UUID.Zero, "Everyone", "Everyone in the group", "Member of " + name, (ulong)DefaultEveryonePowers, true);
+            _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);
 
             // Create Owner role
-            _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, roleID, "Owners", "Owners of the group", "Owner of " + name, (ulong)OwnerPowers, true);
+            _AddOrUpdateGroupRole(RequestingAgentID, data.GroupID, ownerRoleID, "Owners", "Owners of the group", "Owner of " + name, (ulong)OwnerPowers, true);
 
             // Add founder to group
-            _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, roleID);
+            _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, ownerRoleID);
+            _AddAgentToGroup(RequestingAgentID, founderID.ToString(), data.GroupID, officersRoleID);
 
             return data.GroupID;
         }
@@ -223,15 +231,22 @@ 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.members = m_Database.MemberCount(d.GroupID);
+                    g.groupID = d.GroupID;
+                    g.members = nmembers;
 
                     groups.Add(g);
                 }
@@ -485,7 +500,7 @@ namespace OpenSim.Groups
 
             // check permissions
             bool limited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMemberLimited);
-            bool unlimited = HasPower(RequestingAgentID, GroupID, GroupPowers.AssignMember) | IsOwner(RequestingAgentID, GroupID);
+            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);
@@ -843,7 +858,7 @@ namespace OpenSim.Groups
                 return false;
             }
 
-            if (!add && data == null) // it deosn't exist, can't update
+            if (!add && data == null) // it doesn'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,7 +114,6 @@ namespace OpenSim.OfflineIM
             scene.ForEachClient(delegate(IClientAPI client)
             {
                 client.OnRetrieveInstantMessages -= RetrieveInstantMessages;
-                client.OnMuteListRequest -= OnMuteListRequest;
             });
         }
 
@@ -162,7 +161,6 @@ namespace OpenSim.OfflineIM
         private void OnNewClient(IClientAPI client)
         {
             client.OnRetrieveInstantMessages += RetrieveInstantMessages;
-            client.OnMuteListRequest += OnMuteListRequest;
         }
 
         private void RetrieveInstantMessages(IClientAPI client)
@@ -194,20 +192,6 @@ 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/Service/OfflineIMService.cs

@@ -110,9 +110,8 @@ 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/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/RemoteController/RemoteAdminPlugin.cs

@@ -1934,7 +1934,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 GetSceneFromRegionParams(requestData, responseData, out scene);
                 health = scene.GetHealth(out flags, out text);
             }
-            catch (Exception e)
+            catch
             {
                 responseData["error"] = null;
             }

OpenSim/Capabilities/Caps.cs

@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.IO;
 using System.Reflection;
 using System.Threading;
@@ -49,9 +50,9 @@ namespace OpenSim.Framework.Capabilities
     /// </summary>
     public delegate IClientAPI GetClientDelegate(UUID agentID);
 
-    public class Caps
+    public class Caps : IDisposable
     {
-//        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;
@@ -64,8 +65,8 @@ namespace OpenSim.Framework.Capabilities
 
         private CapsHandlers m_capsHandlers;
 
-        private Dictionary<string, PollServiceEventArgs> m_pollServiceHandlers
-            = new Dictionary<string, PollServiceEventArgs>();
+        private ConcurrentDictionary<string, PollServiceEventArgs> m_pollServiceHandlers
+            = new ConcurrentDictionary<string, PollServiceEventArgs>();
 
         private Dictionary<string, string> m_externalCapsHandlers = new Dictionary<string, string>();
 
@@ -119,6 +120,19 @@ 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)
         {
@@ -138,12 +152,35 @@ namespace OpenSim.Framework.Capabilities
             m_agentID = agent;
             m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort);
             m_regionName = regionName;
+            Flags = CapsFlags.None;
             m_capsActive.Reset();
         }
 
         ~Caps()
         {
-            m_capsActive.Dispose();
+            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>
@@ -157,15 +194,27 @@ 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);
 
-            m_pollServiceHandlers.Add(capName, pollServiceHandler);
+            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_httpListener.AddPollServiceHTTPHandler(pollServiceHandler.Url, pollServiceHandler);
+            m_httpListener.AddPollServiceHTTPHandler(pollServiceHandler);
 
 //            uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
 //            string protocol = "http";
@@ -205,8 +254,9 @@ 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)
@@ -245,9 +295,6 @@ 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);
                 }
             }
@@ -261,6 +308,7 @@ namespace OpenSim.Framework.Capabilities
                 caps[kvp.Key] = kvp.Value;
             }
 
+
             return caps;
         }
 

OpenSim/Capabilities/CapsHandlers.cs

@@ -27,6 +27,7 @@
 
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 
@@ -40,6 +41,7 @@ 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;
@@ -73,17 +75,35 @@ namespace OpenSim.Framework.Capabilities
         {
             lock (m_capsHandlers)
             {
-                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_capsHandlers.Remove(capsName);
+                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)
-                return m_capsHandlers.ContainsKey(cap);
+                if (m_capsHandlers.ContainsKey(cap))
+                    return true;
+            return m_capsSimpleHandlers.ContainsKey(cap);
         }
 
         /// <summary>
@@ -110,6 +130,9 @@ 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);
                     }
 
@@ -131,8 +154,9 @@ namespace OpenSim.Framework.Capabilities
             {
                 lock (m_capsHandlers)
                 {
-                    string[] __keys = new string[m_capsHandlers.Keys.Count];
+                    string[] __keys = new string[m_capsHandlers.Keys.Count + m_capsSimpleHandlers.Keys.Count];
                     m_capsHandlers.Keys.CopyTo(__keys, 0);
+                    m_capsSimpleHandlers.Keys.CopyTo(__keys, m_capsHandlers.Keys.Count);
                     return __keys;
                 }
             }
@@ -146,24 +170,39 @@ 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 (requestedCaps != null && !requestedCaps.Contains(capsName))
+                    if (m_capsSimpleHandlers.TryGetValue(capsName, out ISimpleStreamHandler shdr))
+                    {
+                        caps[capsName] = baseUrl + shdr.Path;
                         continue;
-
-                    caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;
+                    }
+                    if (m_capsHandlers.TryGetValue(capsName, out IRequestHandler chdr))
+                    {
+                        caps[capsName] = baseUrl + chdr.Path;
+                    }
                 }
             }
 

OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs

@@ -1,116 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.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,9 +29,12 @@ 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
 {
@@ -67,16 +70,16 @@ namespace OpenSim.Capabilities.Handlers
             m_LibraryService =
                     ServerUtils.LoadPlugin<ILibraryService>(libService, args);
 
-            FetchInvDescHandler webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService, null);
-            IRequestHandler reqHandler
-                = new RestStreamHandler(
-                    "POST",
-                    "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
-                    webFetchHandler.FetchInventoryDescendentsRequest,
-                    "FetchInvDescendents",
-                    null);
-            server.AddStreamHandler(reqHandler);
-        }
+            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);
+                });
+
+            server.AddSimpleStreamHandler(reqHandler);
+        }
     }
 }

OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs

@@ -25,11 +25,12 @@
  * 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;
@@ -59,9 +60,6 @@ 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;
 
@@ -75,15 +73,6 @@ 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];
-                    foreach (UUID id in itemIDs)
-                        items[i++] = m_inventoryService.GetItem(m_agentID, id);
-                }
             }
             else
             {
@@ -92,55 +81,86 @@ namespace OpenSim.Capabilities.Handlers
                     items[i++] = m_inventoryService.GetItem(UUID.Zero, id);
             }
 
-            foreach (InventoryItemBase item in items)
+            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)
             {
-                if (item != null)
-                {
-                    // 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));
-                }
+                LLSDxmlEncode.AddEmptyArray("items", lsl);
             }
+            else
+            {
+                LLSDxmlEncode.AddArray("items", lsl);
+                foreach (InventoryItemBase item in items)
+                {
+                    if (item != null)
+                        item.ToLLSDxml(lsl, 0xff);
+                }
+                LLSDxmlEncode.AddEndArray(lsl);
+            }            
 
-            reply = LLSDHelpers.SerialiseLLSDReply(llsdReply);
-
-            return reply;
+            LLSDxmlEncode.AddEndMap(lsl);
+            return LLSDxmlEncode.End(lsl);
         }
 
-        /// <summary>
-        /// Convert an internal inventory item object into an LLSD object.
-        /// </summary>
-        /// <param name="invItem"></param>
-        /// <returns></returns>
-        private LLSDInventoryItem ConvertInventoryItem(InventoryItemBase invItem)
+        public void FetchInventorySimpleRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, OSDMap requestmap, ExpiringKey<UUID> BadRequests)
         {
-            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;
+            //m_log.DebugFormat("[FETCH INVENTORY HANDLER]: Received FetchInventory capability request {0}", request);
 
-            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;
+            if(BadRequests == null)
+            {
+                httpResponse.StatusCode = (int)HttpStatusCode.NotFound;
+                return;
+            }
 
-            return llsdItem;
+            OSDArray itemsRequested = (OSDArray)requestmap["items"];
+
+            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;
         }
     }
 }
+

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

@@ -28,7 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
+using System.IO;
 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 = UUID.Zero;
+        private UUID m_userID = new UUID("00000000-0000-0000-0000-000000000001");
         private Scene m_scene;
         private UUID m_rootFolderID;
         private int m_rootDescendents;
@@ -103,6 +103,7 @@ 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
@@ -126,6 +127,19 @@ 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()
         {
@@ -134,18 +148,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>00000000-0000-0000-0000-000000000000</uuid><key>sort_order</key><integer>1</integer></map></array></map></llsd>";
+            request += "</uuid><key>owner_id</key><uuid>";
+            request += m_userID.ToString();
+            request += "</uuid><key>sort_order</key><integer>1</integer></map></array></map></llsd>";
 
-            string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
+            string llsdresponse = dorequest(handler, request);
 
             Assert.That(llsdresponse != null, Is.True, "Incorrect null response");
             Assert.That(llsdresponse != string.Empty, Is.True, "Incorrect empty response");
-            Assert.That(llsdresponse.Contains("00000000-0000-0000-0000-000000000000"), Is.True, "Response should contain userID");
+            Assert.That(llsdresponse.Contains(m_userID.ToString()), 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");
@@ -158,19 +172,17 @@ 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-000000000000</uuid><key>sort_order</key><integer>1</integer></map>";
+            request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000001</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-000000000000</uuid><key>sort_order</key><integer>1</integer></map>";
+            request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000001</uuid><key>sort_order</key><integer>1</integer></map>";
             request += "</array></map></llsd>";
 
-            string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
+            string llsdresponse = dorequest(handler, request);
             Console.WriteLine(llsdresponse);
 
             string descendents = "descendents</key><integer>" + m_rootDescendents + "</integer>";
@@ -188,14 +200,12 @@ 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-000000000000</uuid><key>sort_order</key><integer>1</integer></map></array></map></llsd>";
+            request += "</uuid><key>owner_id</key><uuid>00000000-0000-0000-0000-000000000001</uuid><key>sort_order</key><integer>1</integer></map></array></map></llsd>";
 
-            string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
+            string llsdresponse = dorequest(handler, request);
             Console.WriteLine(llsdresponse);
 
             string descendents = "descendents</key><integer>2</integer>";
@@ -232,8 +242,6 @@ 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>";
@@ -250,7 +258,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 = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
+            string llsdresponse = dorequest(handler, request);
             Console.WriteLine(llsdresponse);
 
             string root_folder = "<key>folder_id</key><uuid>" + m_rootFolderID + "</uuid>";
@@ -267,27 +275,26 @@ 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 = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
+            string llsdresponse = dorequest(handler, request);
 
             Assert.That(llsdresponse != null, Is.True, "Incorrect null response");
             Assert.That(llsdresponse != string.Empty, Is.True, "Incorrect empty response");
-            Assert.That(llsdresponse.Contains("bad_folders</key><array><uuid>00000000-0000-0000-0000-000000000000"), Is.True, "Folder Zero should be a bad folder");
+            // 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");
 
             Console.WriteLine(llsdresponse);
         }
-
     }
 
 }

OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs

@@ -0,0 +1,190 @@
+/*
+ * 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

@@ -1,117 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Reflection;
-using System.IO;
-using System.Web;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenSim.Framework.Servers.HttpServer;
-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);
-        protected 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];
-            }
-
-            Dictionary<UUID,string> names = m_UserManagement.GetUsersNames(ids);
-
-            OSDMap osdReply = new OSDMap();
-            OSDArray agents = new OSDArray();
-
-            osdReply["agents"] = agents;
-            foreach (KeyValuePair<UUID,string> kvp in names)
-            {
-                if (string.IsNullOrEmpty(kvp.Value))
-                    continue;
-                if(kvp.Key == UUID.Zero)
-                    continue;
-
-                string[] parts = kvp.Value.Split(new char[] {' '});
-                OSDMap osdname = new OSDMap();
-                if(parts[0] == "Unknown")
-                {
-                    osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1));
-                    osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddHours(2));
-                }
-                else
-                {
-                    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(kvp.Value);
-                osdname["legacy_first_name"] = parts[0];
-                osdname["legacy_last_name"] = parts[1];
-                osdname["username"] = OSD.FromString(kvp.Value);
-                osdname["id"] = OSD.FromUUID(kvp.Key);
-                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/GetMesh/GetMeshHandler.cs

@@ -41,9 +41,6 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Services.Interfaces;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 
-
-
-
 namespace OpenSim.Capabilities.Handlers
 {
     public class GetMeshHandler
@@ -61,211 +58,98 @@ namespace OpenSim.Capabilities.Handlers
         }
         public Hashtable Handle(Hashtable request)
         {
-            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;
+            return ProcessGetMesh(request, UUID.Zero, null); ;
         }
+
         public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap)
         {
             Hashtable responsedata = new Hashtable();
-            responsedata["int_response_code"] = 400; //501; //410; //404;
+            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["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 (!String.IsNullOrEmpty(meshStr) && UUID.TryParse(meshStr, out meshID))
+            if(!UUID.TryParse(meshStr, out meshID))
+                return responsedata;
+
+            AssetBase mesh = m_assetService.Get(meshID.ToString());
+            if(mesh == null)
             {
-                if (m_assetService == null)
-                {
-                    responsedata["int_response_code"] = 404; //501; //410; //404;
-                    responsedata["content_type"] = "text/plain";
-                    responsedata["keepalive"] = false;
-                    responsedata["str_response_string"] = "The asset service is unavailable.  So is your mesh.";
-                    responsedata["reusecontext"] = false;
-                    return responsedata;
-                }
-
-                AssetBase mesh = m_assetService.Get(meshID.ToString());
-
-                if (mesh != null)
-                {
-                    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"];
-
-                        if (!String.IsNullOrEmpty(range)) // Mesh Asset LOD // Physics
-                        {
-                            // Range request
-                            int start, end;
-                            if (TryParseRange(range, out start, out end))
-                            {
-                                // Before clamping start make sure we can satisfy it in order to avoid
-                                // sending back the last byte instead of an error status
-                                if (start >= 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);
-
-                                    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;
-                                        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["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;
-                }
+                responsedata["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound;
+                responsedata["str_response_string"] = "Mesh not found.";
+                return responsedata;
             }
 
+            if (mesh.Type != (SByte)AssetType.Mesh)
+            {
+                responsedata["str_response_string"] = "Asset isn't a mesh.";
+                return responsedata;
+            }
+
+            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))
+            {
+                // full mesh
+                responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
+                responsedata["int_response_code"] = (int)System.Net.HttpStatusCode.OK;
+                return responsedata;
+            }
+
+            // 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 >= mesh.Data.Length)
+                {
+                    responsedata["str_response_string"] = "This range doesnt exist.";
+                    return responsedata;
+                }
+
+                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;
+
+                byte[] d = new byte[len];
+                Array.Copy(mesh.Data, start, d, 0, len);
+                responsedata["bin_response_data"] = d;
+                responsedata["int_bytes"] = len;
+                return responsedata;
+            }
+
+            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;
             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",
-                    "/CAPS/" + UUID.Random(),
+                    "/" + UUID.Random(),
                     httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
                     "GetMesh",
                     null);

OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs

@@ -66,8 +66,6 @@ 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"];
@@ -112,8 +110,6 @@ 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;
                 }
             }
@@ -214,7 +210,7 @@ namespace OpenSim.Capabilities.Handlers
             {
                 // Range request
                 int start, end;
-                if (TryParseRange(range, out start, out 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
@@ -253,24 +249,13 @@ 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;
+                        response["int_response_code"] = (int)System.Net.HttpStatusCode.PartialContent;
+                        headers["Content-Range"] = String.Format("bytes {0}-{1}/{2}", start, end, texture.Data.Length);
 
-                        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);
-
-                            byte[] d = new byte[len];
-                            Array.Copy(texture.Data, start, d, 0, len);
-                            response["bin_response_data"] = d;
-                            response["int_bytes"] = len;
-                        }
-//                        response.Body.Write(texture.Data, start, len);
+                        byte[] d = new byte[len];
+                        Array.Copy(texture.Data, start, d, 0, len);
+                        response["bin_response_data"] = d;
+                        response["int_bytes"] = len;
                     }
                 }
                 else
@@ -304,50 +289,6 @@ 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);

OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs

@@ -32,6 +32,7 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Reflection;
 using System.IO;
+using System.Net;
 using System.Web;
 using log4net;
 using Nini.Config;
@@ -131,87 +132,46 @@ namespace OpenSim.Capabilities.Handlers
         /// <returns>False for "caller try another codec"; true otherwise</returns>
         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))
+            // m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
+            if(!String.IsNullOrEmpty(m_RedirectURL))
             {
-                // Only try to fetch locally cached textures. Misses are redirected
-                texture = m_assetService.GetCached(fullID);
+                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);
+                return true;
+            }
 
-                if (texture != null)
+            // Fetch,  Misses or invalid return a 404
+            AssetBase texture = m_assetService.Get(textureID.ToString());
+            if (texture != null)
+            {
+                if (texture.Type != (sbyte)AssetType.Texture)
+                {
+                    httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                    return true;
+                }
+                if (format == DefaultFormat)
                 {
-                    if (texture.Type != (sbyte)AssetType.Texture)
-                    {
-                        httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
-                        return true;
-                    }
                     WriteTextureData(httpRequest, httpResponse, texture, format);
                     return true;
                 }
-                else
-                {
-                    string textureUrl = m_RedirectURL + "?texture_id="+ textureID.ToString();
-                    m_log.Debug("[GETTEXTURE]: Redirecting texture request to " + 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");
+                // need to convert format
+                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)
+                    return false; // !!! Caller try another codec, please!
 
-                    // Fetch locally or remotely. Misses return a 404
-                    texture = m_assetService.Get(textureID.ToString());
-
-                    if (texture != null)
-                    {
-                        if (texture.Type != (sbyte)AssetType.Texture)
-                        {
-                            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
-                            return true;
-                        }
-                        if (format == DefaultFormat)
-                        {
-                            WriteTextureData(httpRequest, httpResponse, texture, format);
-                            return true;
-                        }
-                        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)
-                                return false; // !!! Caller try another codec, please!
-
-                            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;
-               }
+                newTexture.Flags = AssetFlags.Collectable;
+                newTexture.Temporary = true;
+                newTexture.Local = true;
+                WriteTextureData(httpRequest, httpResponse, newTexture, format);
+                return true;
             }
 
             // not found
-//            m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
+            // m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
             httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
             return true;
         }
@@ -279,8 +239,9 @@ 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.Body.Write(texture.Data, start, len);
+                        response.RawBuffer = texture.Data;
+                        response.RawBufferStart = start;
+                        response.RawBufferLen = len;
                     }
                 }
                 else
@@ -298,17 +259,19 @@ namespace OpenSim.Capabilities.Handlers
                     response.ContentType = texture.Metadata.ContentType;
                 else
                     response.ContentType = "image/" + format;
-                response.Body.Write(texture.Data, 0, texture.Data.Length);
+                response.RawBuffer = texture.Data;
+                response.RawBufferStart = 0;
+                response.RawBufferLen = texture.Data.Length;
             }
 
-//            if (response.StatusCode < 200 || response.StatusCode > 299)
-//                m_log.WarnFormat(
-//                    "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})",
-//                    texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length);
-//            else
-//                m_log.DebugFormat(
-//                    "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})",
-//                    texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length);
+            //            if (response.StatusCode < 200 || response.StatusCode > 299)
+            //                m_log.WarnFormat(
+            //                    "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})",
+            //                    texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length);
+            //            else
+            //                m_log.DebugFormat(
+            //                    "[GETTEXTURE]: For texture {0} requested range {1} responded {2} with content length {3} (actual {4})",
+            //                    texture.FullID, range, response.StatusCode, response.ContentLength, texture.Data.Length);
         }
 
         /// <summary>

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/UploadBakedTexture/UploadBakedTextureHandler.cs

@@ -1,171 +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 log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Capabilities;
-using OpenSim.Framework.Servers.HttpServer;
-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;
-
-        public UploadBakedTextureHandler(Caps caps, IAssetService assetService)
-        {
-            m_HostCapsObj = caps;
-            m_assetService = assetService;
-        }
-
-        /// <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 = true;
-            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

@@ -1,76 +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 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).UploadBakedTexture,
-                        "UploadBakedTexture",
-                        "Upload Baked Texture Capability"));
-
-         }
-    }
-}

OpenSim/Capabilities/LLSD.cs

@@ -107,17 +107,17 @@ namespace OpenSim.Framework.Capabilities
         /// <returns></returns>
         public static byte[] LLSDSerialize(object obj)
         {
-            StringWriter sw = new StringWriter();
-            XmlTextWriter writer = new XmlTextWriter(sw);
-            writer.Formatting = Formatting.None;
+            using(StringWriter sw = new StringWriter())
+            using(XmlTextWriter writer = new XmlTextWriter(sw))
+            {
+                writer.Formatting = Formatting.None;
 
-            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
-            LLSDWriteOne(writer, obj);
-            writer.WriteEndElement();
-
-            writer.Close();
-
-            return Util.UTF8.GetBytes(sw.ToString());
+                writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+                LLSDWriteOne(writer, obj);
+                writer.WriteEndElement();
+                writer.Flush();
+                return Util.UTF8.GetBytes(sw.ToString());
+            }           
         }
 
         /// <summary>

OpenSim/Capabilities/LLSDEnvironmentSettings.cs

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

OpenSim/Capabilities/LLSDHelpers.cs

@@ -30,6 +30,7 @@ using System.Collections;
 using System.IO;
 using System.Reflection;
 using System.Xml;
+using OpenMetaverse;
 
 namespace OpenSim.Framework.Capabilities
 {
@@ -40,17 +41,32 @@ namespace OpenSim.Framework.Capabilities
 
         public static string SerialiseLLSDReply(object obj)
         {
-            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.Close();
-
+            using(StringWriter sw = new StringWriter())
+            using(XmlTextWriter writer = new XmlTextWriter(sw))
+            {
+                writer.Formatting = Formatting.None;
+                writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+                SerializeOSDType(writer, obj);
+                writer.WriteEndElement();
+                writer.Flush();
             //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString());
 
-            return 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)
@@ -160,7 +176,18 @@ namespace OpenSim.Framework.Capabilities
                                 else if(enumerator.Value is Boolean && field.FieldType == typeof(int) )
                                 {
                                     int i = (bool)enumerator.Value ? 1 : 0;
-                                    field.SetValue(obj, (object)i);
+                                    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
                                 {

OpenSim/Capabilities/LLSDInventoryFolder.cs

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

OpenSim/Capabilities/LLSDItemUpdate.cs

@@ -1,41 +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 OpenMetaverse;
-
-namespace OpenSim.Framework.Capabilities
-{
-    [OSDMap]
-    public class LLSDItemUpdate
-    {
-        public UUID item_id;
-
-        public LLSDItemUpdate()
-        {
-        }
-    }
-}

OpenSim/Capabilities/LLSDParcelVoiceInfoResponse.cs

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

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

OpenSim/Capabilities/LLSDTaskScriptUpdate.cs

@@ -1,50 +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 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

@@ -1,57 +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.
-*
-*/
-
-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,24 +47,25 @@ namespace OpenSim.Data
             if ((id == null) || (id == DBNull.Value))
                 return UUID.Zero;
 
-            if (id.GetType() == typeof(Guid))
+            Type idtype = id.GetType();
+
+            if (idtype == typeof(Guid))
                 return new UUID((Guid)id);
 
-            if (id.GetType() == typeof(byte[]))
+            if (id.GetType() == typeof(string))
             {
-                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);
+                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)
+                    return UUID.Zero;
+                return new UUID((byte[])id, 0);
+            }
             throw new Exception("Failed to convert db value to UUID: " + id.ToString());
         }
     }

OpenSim/Data/IMuteListData.cs

@@ -27,16 +27,18 @@
 
 using System;
 using System.Collections.Generic;
-
 using OpenMetaverse;
+using OpenSim.Framework;
 
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule.Object
+namespace OpenSim.Data
 {
-    /// <summary>
-    /// This implements the methods neccesary to operate on the inventory of an object
+     /// <summary>
+    /// An interface for connecting to the Mute List datastore
     /// </summary>
-    public interface IObjectInventory : IDictionary<UUID, IInventoryItem>
+    public interface IMuteListData
     {
-        IInventoryItem this[string name] { get; }
+        bool Store(MuteData data);
+        MuteData[] Get(UUID agentID);
+        bool Delete(UUID agentID, UUID muteID, string muteName);
     }
 }

OpenSim/Data/IRegionData.cs

@@ -71,6 +71,8 @@ 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/MySQLEstateData.cs

@@ -285,7 +285,7 @@ namespace OpenSim.Data.MySQL
 
                 using (MySqlCommand cmd = dbcon.CreateCommand())
                 {
-                    cmd.CommandText = "select bannedUUID from estateban where EstateID = ?EstateID";
+                    cmd.CommandText = "select *  from estateban where EstateID = ?EstateID";
                     cmd.Parameters.AddWithValue("?EstateID", es.EstateID);
 
                     using (IDataReader r = cmd.ExecuteReader())
@@ -293,13 +293,11 @@ namespace OpenSim.Data.MySQL
                         while (r.Read())
                         {
                             EstateBan eb = new EstateBan();
-
-                            UUID uuid = new UUID();
-                            UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
-
-                            eb.BannedUserID = uuid;
+                            eb.BannedUserID = DBGuid.FromDB(r["bannedUUID"]); ;
                             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);
                         }
                     }
@@ -323,12 +321,14 @@ namespace OpenSim.Data.MySQL
 
                     cmd.Parameters.Clear();
 
-                    cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( ?EstateID, ?bannedUUID, '', '', '' )";
+                    cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask, banningUUID, banTime) values ( ?EstateID, ?bannedUUID, '', '', '', ?banningUUID, ?banTime)";
 
                     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();

OpenSim/Data/MySQL/MySQLGenericTableHandler.cs

@@ -29,11 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using log4net;
+using System.Text;
 using MySql.Data.MySqlClient;
 using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Data.MySQL
 {
@@ -118,8 +116,40 @@ 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)
         {
-            return Get(new string[] { field }, new string[] { key });
+            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);
+            }
         }
 
         public virtual T[] Get(string[] fields, string[] keys)
@@ -129,25 +159,27 @@ namespace OpenSim.Data.MySQL
 
         public virtual T[] Get(string[] fields, string[] keys, string options)
         {
-            if (fields.Length != keys.Length)
+            int flen = fields.Length;
+            if (flen == 0 || flen != keys.Length)
                 return new T[0];
 
-            List<string> terms = new List<string>();
+            int flast = flen - 1;
+            StringBuilder sb = new StringBuilder(1024);
+            sb.AppendFormat("select * from {0} where ", m_Realm);
 
             using (MySqlCommand cmd = new MySqlCommand())
             {
-                for (int i = 0 ; i < fields.Length ; i++)
+                for (int i = 0 ; i < flen ; i++)
                 {
                     cmd.Parameters.AddWithValue(fields[i], keys[i]);
-                    terms.Add("`" + fields[i] + "` = ?" + fields[i]);
+                    if(i < flast)
+                        sb.AppendFormat("`{0}` = ?{0} and ", fields[i]);
+                    else
+                        sb.AppendFormat("`{0}` = ?{0} ", fields[i]);
                 }
 
-                string where = String.Join(" and ", terms.ToArray());
-
-                string query = String.Format("select * from {0} where {1} {2}",
-                                             m_Realm, where, options);
-
-                cmd.CommandText = query;
+                sb.Append(options);
+                cmd.CommandText = sb.ToString();
 
                 return DoQuery(cmd);
             }
@@ -204,7 +236,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 ? true : false);
+                            m_Fields[name].SetValue(row, v != 0);
                         }
                         else if (m_Fields[name].FieldType == typeof(UUID))
                         {
@@ -323,25 +355,26 @@ namespace OpenSim.Data.MySQL
 //                "[MYSQL GENERIC TABLE HANDLER]: Delete(string[] fields, string[] keys) invoked with {0}:{1}",
 //                string.Join(",", fields), string.Join(",", keys));
 
-            if (fields.Length != keys.Length)
+            int flen = fields.Length;
+            if (flen == 0 || flen != keys.Length)
                 return false;
 
-            List<string> terms = new List<string>();
+            int flast = flen - 1;
+            StringBuilder sb = new StringBuilder(1024);
+            sb.AppendFormat("delete from {0} where ", m_Realm);
 
             using (MySqlCommand cmd = new MySqlCommand())
             {
-                for (int i = 0 ; i < fields.Length ; i++)
+                for (int i = 0 ; i < flen ; i++)
                 {
                     cmd.Parameters.AddWithValue(fields[i], keys[i]);
-                    terms.Add("`" + fields[i] + "` = ?" + fields[i]);
+                    if(i < flast)
+                        sb.AppendFormat("`{0}` = ?{0} and ", fields[i]);
+                    else
+                        sb.AppendFormat("`{0}` = ?{0}", fields[i]);
                 }
 
-                string where = String.Join(" and ", terms.ToArray());
-
-                string query = String.Format("delete from {0} where {1}", m_Realm, where);
-
-                cmd.CommandText = query;
-
+                cmd.CommandText = sb.ToString();
                 return ExecuteNonQuery(cmd) > 0;
             }
         }
@@ -353,27 +386,27 @@ namespace OpenSim.Data.MySQL
 
         public long GetCount(string[] fields, string[] keys)
         {
-            if (fields.Length != keys.Length)
+            int flen = fields.Length;
+            if (flen == 0 || flen != keys.Length)
                 return 0;
 
-            List<string> terms = new List<string>();
+            int flast = flen - 1;
+            StringBuilder sb = new StringBuilder(1024);
+            sb.AppendFormat("select count(*) from {0} where ", m_Realm);
 
             using (MySqlCommand cmd = new MySqlCommand())
             {
-                for (int i = 0; i < fields.Length; i++)
+                for (int i = 0 ; i < flen ; i++)
                 {
                     cmd.Parameters.AddWithValue(fields[i], keys[i]);
-                    terms.Add("`" + fields[i] + "` = ?" + fields[i]);
+                    if(i < flast)
+                        sb.AppendFormat("`{0}` = ?{0} and ", fields[i]);
+                    else
+                        sb.AppendFormat("`{0}` = ?{0}", fields[i]);
                 }
 
-                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);
+                cmd.CommandText = sb.ToString();
+                object result = DoQueryScalar(cmd);
 
                 return Convert.ToInt64(result);
             }
@@ -403,7 +436,7 @@ namespace OpenSim.Data.MySQL
                     dbcon.Open();
                     cmd.Connection = dbcon;
 
-                    Object ret = cmd.ExecuteScalar();
+                    object ret = cmd.ExecuteScalar();
                     cmd.Connection = null;
                     dbcon.Close();
                     return ret;

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}) ORDER BY Name LIMIT 100", pattern));
+            return m_Groups.Get(string.Format("ShowInList=1 AND ({0})", pattern));
         }
 
         public bool DeleteGroup(UUID groupID)

OpenSim/Data/MySQL/MySQLMuteListData.cs

@@ -26,41 +26,42 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
 
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
+namespace OpenSim.Data.MySQL
 {
-    class ExtensionHandler : IExtension
+    public class MySqlMuteListData : MySQLGenericTableHandler<MuteData>, IMuteListData
     {
-        private readonly Dictionary<Type, object> m_instances;
-
-        public ExtensionHandler(Dictionary<Type, object> instances)
+        public MySqlMuteListData(string connectionString)
+                : base(connectionString, "MuteList", "MuteListStore")
         {
-            m_instances = instances;
         }
 
-        public T Get<T>()
+        public MuteData[] Get(UUID agentID)
         {
-            return (T) m_instances[typeof (T)];
+            MuteData[] data = base.Get("AgentID", agentID.ToString());
+            return data;
         }
 
-        public bool TryGet<T>(out T extension)
+        public bool Delete(UUID agentID, UUID muteID, string muteName)
         {
-            if (!m_instances.ContainsKey(typeof(T)))
+            string cmnd ="delete from MuteList where AgentID = ?AgentID and MuteID = ?MuteID and MuteName = ?MuteName";
+
+            using (MySqlCommand cmd = new MySqlCommand(cmnd))
             {
-                extension = default(T);
+                cmd.Parameters.AddWithValue("?AgentID", agentID.ToString());
+                cmd.Parameters.AddWithValue("?MuteID", muteID.ToString());
+                cmd.Parameters.AddWithValue("?MuteName", muteName);
+
+                if (ExecuteNonQuery(cmd) > 0)
+                    return true;
                 return false;
             }
-
-            extension = Get<T>();
-            return true;
-        }
-
-        public bool Has<T>()
-        {
-            return m_instances.ContainsKey(typeof (T));
         }
     }
-}
+}

OpenSim/Data/MySQL/MySQLRegionData.cs

@@ -81,17 +81,15 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public RegionData Get(int posX, int posY, UUID scopeID)
+        public RegionData GetSpecific(string regionName, UUID scopeID)
         {
-/* fixed size regions
-            string command = "select * from `"+m_Realm+"` where locX = ?posX and locY = ?posY";
+            string command = "select * from `" + m_Realm + "` where regionName = ?regionName";
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
             using (MySqlCommand cmd = new MySqlCommand(command))
             {
-                cmd.Parameters.AddWithValue("?posX", posX.ToString());
-                cmd.Parameters.AddWithValue("?posY", posY.ToString());
+                cmd.Parameters.AddWithValue("?regionName", regionName);
                 cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
 
                 List<RegionData> ret = RunCommand(cmd);
@@ -100,8 +98,11 @@ namespace OpenSim.Data.MySQL
 
                 return ret[0];
             }
-*/
-            // extend database search for maximum region size area
+
+        }
+
+        public RegionData Get(int posX, int posY, UUID scopeID)
+        {
             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";

OpenSim/Data/MySQL/MySQLSimulationData.cs

@@ -29,16 +29,13 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
-using System.IO;
 using System.Reflection;
-using System.Threading;
 using log4net;
 using MySql.Data.MySqlClient;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Data;
 
 namespace OpenSim.Data.MySQL
 {
@@ -130,10 +127,6 @@ namespace OpenSim.Data.MySQL
 
             // Eligibility check
             //
-            // PrimFlags.Temporary is not used in OpenSim code and cannot
-            // be guaranteed to always be clear. Don't check it.
-//            if ((flags & (uint)PrimFlags.Temporary) != 0)
-//                return;
             if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
                 return;
 
@@ -154,16 +147,15 @@ namespace OpenSim.Data.MySQL
                                     "Name, Text, Description, " +
                                     "SitName, TouchName, ObjectFlags, " +
                                     "OwnerMask, NextOwnerMask, GroupMask, " +
-                                    "EveryoneMask, BaseMask, PositionX, " +
-                                    "PositionY, PositionZ, GroupPositionX, " +
-                                    "GroupPositionY, GroupPositionZ, VelocityX, " +
-                                    "VelocityY, VelocityZ, AngularVelocityX, " +
-                                    "AngularVelocityY, AngularVelocityZ, " +
-                                    "AccelerationX, AccelerationY, " +
-                                    "AccelerationZ, RotationX, " +
-                                    "RotationY, RotationZ, " +
-                                    "RotationW, SitTargetOffsetX, " +
-                                    "SitTargetOffsetY, SitTargetOffsetZ, " +
+                                    "EveryoneMask, BaseMask, " +
+                                    "PositionX, PositionY, PositionZ, " +
+                                    "GroupPositionX, GroupPositionY, GroupPositionZ, " +
+                                    "VelocityX, VelocityY, VelocityZ, " +
+                                    "AngularVelocityX, AngularVelocityY, AngularVelocityZ, " +
+                                    "AccelerationX, AccelerationY, AccelerationZ, " +
+                                    "standtargetx, standtargety, standtargetz, " +
+                                    "RotationX, RotationY, RotationZ, RotationW, " +
+                                    "SitTargetOffsetX, SitTargetOffsetY, SitTargetOffsetZ, " +
                                     "SitTargetOrientW, SitTargetOrientX, " +
                                     "SitTargetOrientY, SitTargetOrientZ, " +
                                     "RegionUUID, CreatorID, " +
@@ -189,20 +181,19 @@ namespace OpenSim.Data.MySQL
                                     "AttachedPosY, AttachedPosZ, " +
                                     "PhysicsShapeType, Density, GravityModifier, " +
                                     "Friction, Restitution, Vehicle, PhysInertia, DynAttrs, " +
-                                    "RotationAxisLocks" +
+                                    "RotationAxisLocks, sopanims, sitactrange, pseudocrc" + 
                                     ") values (" + "?UUID, " +
                                     "?CreationDate, ?Name, ?Text, " +
                                     "?Description, ?SitName, ?TouchName, " +
                                     "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, " +
                                     "?GroupMask, ?EveryoneMask, ?BaseMask, " +
                                     "?PositionX, ?PositionY, ?PositionZ, " +
-                                    "?GroupPositionX, ?GroupPositionY, " +
-                                    "?GroupPositionZ, ?VelocityX, " +
-                                    "?VelocityY, ?VelocityZ, ?AngularVelocityX, " +
-                                    "?AngularVelocityY, ?AngularVelocityZ, " +
-                                    "?AccelerationX, ?AccelerationY, " +
-                                    "?AccelerationZ, ?RotationX, " +
-                                    "?RotationY, ?RotationZ, " +
+                                    "?GroupPositionX, ?GroupPositionY, ?GroupPositionZ, " +
+                                    "?VelocityX, ?VelocityY, ?VelocityZ, "+
+                                    "?AngularVelocityX, ?AngularVelocityY, ?AngularVelocityZ, " +
+                                    "?AccelerationX, ?AccelerationY, ?AccelerationZ, " +
+                                    "?standtargetx, ?standtargety, ?standtargetz, " +
+                                    "?RotationX, ?RotationY, ?RotationZ, " +
                                     "?RotationW, ?SitTargetOffsetX, " +
                                     "?SitTargetOffsetY, ?SitTargetOffsetZ, " +
                                     "?SitTargetOrientW, ?SitTargetOrientX, " +
@@ -226,7 +217,7 @@ namespace OpenSim.Data.MySQL
                                     "?AttachedPosY, ?AttachedPosZ, " +
                                     "?PhysicsShapeType, ?Density, ?GravityModifier, " +
                                     "?Friction, ?Restitution, ?Vehicle, ?PhysInertia, ?DynAttrs," +
-                                    "?RotationAxisLocks)";
+                                    "?RotationAxisLocks, ?sopanims, ?sitactrange, ?pseudocrc)";
 
                             FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
 
@@ -598,7 +589,7 @@ namespace OpenSim.Data.MySQL
         // Legacy entry point for when terrain was always a 256x256 hieghtmap
         public void StoreTerrain(double[,] ter, UUID regionID)
         {
-            StoreTerrain(new HeightmapTerrainData(ter), regionID);
+            StoreTerrain(new TerrainData(ter), regionID);
         }
 
         public void StoreTerrain(TerrainData terrData, UUID regionID)
@@ -830,7 +821,7 @@ namespace OpenSim.Data.MySQL
                             "UserLookAtX, UserLookAtY, UserLookAtZ, " +
                             "AuthbuyerID, OtherCleanTime, Dwell, MediaType, MediaDescription, " +
                             "MediaSize, MediaLoop, ObscureMusic, ObscureMedia, " +
-                            "SeeAVs, AnyAVSounds, GroupAVSounds) values (" +
+                            "SeeAVs, AnyAVSounds, GroupAVSounds, environment) values (" +
                             "?UUID, ?RegionUUID, " +
                             "?LocalLandID, ?Bitmap, ?Name, ?Description, " +
                             "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " +
@@ -842,7 +833,7 @@ namespace OpenSim.Data.MySQL
                             "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " +
                             "?AuthbuyerID, ?OtherCleanTime, ?Dwell, ?MediaType, ?MediaDescription, "+
                             "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia, " +
-                            "?SeeAVs, ?AnyAVSounds, ?GroupAVSounds)";
+                            "?SeeAVs, ?AnyAVSounds, ?GroupAVSounds, ?environment)";
 
                         FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID);
 
@@ -869,107 +860,6 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
-        {
-            RegionLightShareData nWP = new RegionLightShareData();
-            nWP.OnSave += StoreRegionWindlightSettings;
-
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-
-                string command = "select * from `regionwindlight` where region_id = ?regionID";
-
-                using (MySqlCommand cmd = new MySqlCommand(command))
-                {
-                    cmd.Connection = dbcon;
-
-                    cmd.Parameters.AddWithValue("?regionID", regionUUID.ToString());
-
-                    using(IDataReader result = ExecuteReader(cmd))
-                    {
-                        if(!result.Read())
-                        {
-                            //No result, so store our default windlight profile and return it
-                            nWP.regionID = regionUUID;
-                            //                            StoreRegionWindlightSettings(nWP);
-                            return nWP;
-                        }
-                        else
-                        {
-                            nWP.regionID = DBGuid.FromDB(result["region_id"]);
-                            nWP.waterColor.X = Convert.ToSingle(result["water_color_r"]);
-                            nWP.waterColor.Y = Convert.ToSingle(result["water_color_g"]);
-                            nWP.waterColor.Z = Convert.ToSingle(result["water_color_b"]);
-                            nWP.waterFogDensityExponent = Convert.ToSingle(result["water_fog_density_exponent"]);
-                            nWP.underwaterFogModifier = Convert.ToSingle(result["underwater_fog_modifier"]);
-                            nWP.reflectionWaveletScale.X = Convert.ToSingle(result["reflection_wavelet_scale_1"]);
-                            nWP.reflectionWaveletScale.Y = Convert.ToSingle(result["reflection_wavelet_scale_2"]);
-                            nWP.reflectionWaveletScale.Z = Convert.ToSingle(result["reflection_wavelet_scale_3"]);
-                            nWP.fresnelScale = Convert.ToSingle(result["fresnel_scale"]);
-                            nWP.fresnelOffset = Convert.ToSingle(result["fresnel_offset"]);
-                            nWP.refractScaleAbove = Convert.ToSingle(result["refract_scale_above"]);
-                            nWP.refractScaleBelow = Convert.ToSingle(result["refract_scale_below"]);
-                            nWP.blurMultiplier = Convert.ToSingle(result["blur_multiplier"]);
-                            nWP.bigWaveDirection.X = Convert.ToSingle(result["big_wave_direction_x"]);
-                            nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]);
-                            nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]);
-                            nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]);
-                            UUID.TryParse(result["normal_map_texture"].ToString(),out nWP.normalMapTexture);
-                            nWP.horizon.X = Convert.ToSingle(result["horizon_r"]);
-                            nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]);
-                            nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]);
-                            nWP.horizon.W = Convert.ToSingle(result["horizon_i"]);
-                            nWP.hazeHorizon = Convert.ToSingle(result["haze_horizon"]);
-                            nWP.blueDensity.X = Convert.ToSingle(result["blue_density_r"]);
-                            nWP.blueDensity.Y = Convert.ToSingle(result["blue_density_g"]);
-                            nWP.blueDensity.Z = Convert.ToSingle(result["blue_density_b"]);
-                            nWP.blueDensity.W = Convert.ToSingle(result["blue_density_i"]);
-                            nWP.hazeDensity = Convert.ToSingle(result["haze_density"]);
-                            nWP.densityMultiplier = Convert.ToSingle(result["density_multiplier"]);
-                            nWP.distanceMultiplier = Convert.ToSingle(result["distance_multiplier"]);
-                            nWP.maxAltitude = Convert.ToUInt16(result["max_altitude"]);
-                            nWP.sunMoonColor.X = Convert.ToSingle(result["sun_moon_color_r"]);
-                            nWP.sunMoonColor.Y = Convert.ToSingle(result["sun_moon_color_g"]);
-                            nWP.sunMoonColor.Z = Convert.ToSingle(result["sun_moon_color_b"]);
-                            nWP.sunMoonColor.W = Convert.ToSingle(result["sun_moon_color_i"]);
-                            nWP.sunMoonPosition = Convert.ToSingle(result["sun_moon_position"]);
-                            nWP.ambient.X = Convert.ToSingle(result["ambient_r"]);
-                            nWP.ambient.Y = Convert.ToSingle(result["ambient_g"]);
-                            nWP.ambient.Z = Convert.ToSingle(result["ambient_b"]);
-                            nWP.ambient.W = Convert.ToSingle(result["ambient_i"]);
-                            nWP.eastAngle = Convert.ToSingle(result["east_angle"]);
-                            nWP.sunGlowFocus = Convert.ToSingle(result["sun_glow_focus"]);
-                            nWP.sunGlowSize = Convert.ToSingle(result["sun_glow_size"]);
-                            nWP.sceneGamma = Convert.ToSingle(result["scene_gamma"]);
-                            nWP.starBrightness = Convert.ToSingle(result["star_brightness"]);
-                            nWP.cloudColor.X = Convert.ToSingle(result["cloud_color_r"]);
-                            nWP.cloudColor.Y = Convert.ToSingle(result["cloud_color_g"]);
-                            nWP.cloudColor.Z = Convert.ToSingle(result["cloud_color_b"]);
-                            nWP.cloudColor.W = Convert.ToSingle(result["cloud_color_i"]);
-                            nWP.cloudXYDensity.X = Convert.ToSingle(result["cloud_x"]);
-                            nWP.cloudXYDensity.Y = Convert.ToSingle(result["cloud_y"]);
-                            nWP.cloudXYDensity.Z = Convert.ToSingle(result["cloud_density"]);
-                            nWP.cloudCoverage = Convert.ToSingle(result["cloud_coverage"]);
-                            nWP.cloudScale = Convert.ToSingle(result["cloud_scale"]);
-                            nWP.cloudDetailXYDensity.X = Convert.ToSingle(result["cloud_detail_x"]);
-                            nWP.cloudDetailXYDensity.Y = Convert.ToSingle(result["cloud_detail_y"]);
-                            nWP.cloudDetailXYDensity.Z = Convert.ToSingle(result["cloud_detail_density"]);
-                            nWP.cloudScrollX = Convert.ToSingle(result["cloud_scroll_x"]);
-                            nWP.cloudScrollXLock = Convert.ToBoolean(result["cloud_scroll_x_lock"]);
-                            nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
-                            nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
-                            nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
-                            nWP.valid = true;
-                        }
-                    }
-                }
-                dbcon.Close();
-            }
-
-            return nWP;
-        }
-
         public virtual RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             RegionSettings rs = null;
@@ -1015,127 +905,6 @@ namespace OpenSim.Data.MySQL
             return rs;
         }
 
-        public virtual void StoreRegionWindlightSettings(RegionLightShareData wl)
-        {
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-
-                using (MySqlCommand cmd = dbcon.CreateCommand())
-                {
-                    cmd.CommandText = "REPLACE 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)"
-                            ;
-
-                    cmd.Parameters.AddWithValue("region_id", wl.regionID);
-                    cmd.Parameters.AddWithValue("water_color_r", wl.waterColor.X);
-                    cmd.Parameters.AddWithValue("water_color_g", wl.waterColor.Y);
-                    cmd.Parameters.AddWithValue("water_color_b", wl.waterColor.Z);
-                    cmd.Parameters.AddWithValue("water_fog_density_exponent", wl.waterFogDensityExponent);
-                    cmd.Parameters.AddWithValue("underwater_fog_modifier", wl.underwaterFogModifier);
-                    cmd.Parameters.AddWithValue("reflection_wavelet_scale_1", wl.reflectionWaveletScale.X);
-                    cmd.Parameters.AddWithValue("reflection_wavelet_scale_2", wl.reflectionWaveletScale.Y);
-                    cmd.Parameters.AddWithValue("reflection_wavelet_scale_3", wl.reflectionWaveletScale.Z);
-                    cmd.Parameters.AddWithValue("fresnel_scale", wl.fresnelScale);
-                    cmd.Parameters.AddWithValue("fresnel_offset", wl.fresnelOffset);
-                    cmd.Parameters.AddWithValue("refract_scale_above", wl.refractScaleAbove);
-                    cmd.Parameters.AddWithValue("refract_scale_below", wl.refractScaleBelow);
-                    cmd.Parameters.AddWithValue("blur_multiplier", wl.blurMultiplier);
-                    cmd.Parameters.AddWithValue("big_wave_direction_x", wl.bigWaveDirection.X);
-                    cmd.Parameters.AddWithValue("big_wave_direction_y", wl.bigWaveDirection.Y);
-                    cmd.Parameters.AddWithValue("little_wave_direction_x", wl.littleWaveDirection.X);
-                    cmd.Parameters.AddWithValue("little_wave_direction_y", wl.littleWaveDirection.Y);
-                    cmd.Parameters.AddWithValue("normal_map_texture", wl.normalMapTexture);
-                    cmd.Parameters.AddWithValue("horizon_r", wl.horizon.X);
-                    cmd.Parameters.AddWithValue("horizon_g", wl.horizon.Y);
-                    cmd.Parameters.AddWithValue("horizon_b", wl.horizon.Z);
-                    cmd.Parameters.AddWithValue("horizon_i", wl.horizon.W);
-                    cmd.Parameters.AddWithValue("haze_horizon", wl.hazeHorizon);
-                    cmd.Parameters.AddWithValue("blue_density_r", wl.blueDensity.X);
-                    cmd.Parameters.AddWithValue("blue_density_g", wl.blueDensity.Y);
-                    cmd.Parameters.AddWithValue("blue_density_b", wl.blueDensity.Z);
-                    cmd.Parameters.AddWithValue("blue_density_i", wl.blueDensity.W);
-                    cmd.Parameters.AddWithValue("haze_density", wl.hazeDensity);
-                    cmd.Parameters.AddWithValue("density_multiplier", wl.densityMultiplier);
-                    cmd.Parameters.AddWithValue("distance_multiplier", wl.distanceMultiplier);
-                    cmd.Parameters.AddWithValue("max_altitude", wl.maxAltitude);
-                    cmd.Parameters.AddWithValue("sun_moon_color_r", wl.sunMoonColor.X);
-                    cmd.Parameters.AddWithValue("sun_moon_color_g", wl.sunMoonColor.Y);
-                    cmd.Parameters.AddWithValue("sun_moon_color_b", wl.sunMoonColor.Z);
-                    cmd.Parameters.AddWithValue("sun_moon_color_i", wl.sunMoonColor.W);
-                    cmd.Parameters.AddWithValue("sun_moon_position", wl.sunMoonPosition);
-                    cmd.Parameters.AddWithValue("ambient_r", wl.ambient.X);
-                    cmd.Parameters.AddWithValue("ambient_g", wl.ambient.Y);
-                    cmd.Parameters.AddWithValue("ambient_b", wl.ambient.Z);
-                    cmd.Parameters.AddWithValue("ambient_i", wl.ambient.W);
-                    cmd.Parameters.AddWithValue("east_angle", wl.eastAngle);
-                    cmd.Parameters.AddWithValue("sun_glow_focus", wl.sunGlowFocus);
-                    cmd.Parameters.AddWithValue("sun_glow_size", wl.sunGlowSize);
-                    cmd.Parameters.AddWithValue("scene_gamma", wl.sceneGamma);
-                    cmd.Parameters.AddWithValue("star_brightness", wl.starBrightness);
-                    cmd.Parameters.AddWithValue("cloud_color_r", wl.cloudColor.X);
-                    cmd.Parameters.AddWithValue("cloud_color_g", wl.cloudColor.Y);
-                    cmd.Parameters.AddWithValue("cloud_color_b", wl.cloudColor.Z);
-                    cmd.Parameters.AddWithValue("cloud_color_i", wl.cloudColor.W);
-                    cmd.Parameters.AddWithValue("cloud_x", wl.cloudXYDensity.X);
-                    cmd.Parameters.AddWithValue("cloud_y", wl.cloudXYDensity.Y);
-                    cmd.Parameters.AddWithValue("cloud_density", wl.cloudXYDensity.Z);
-                    cmd.Parameters.AddWithValue("cloud_coverage", wl.cloudCoverage);
-                    cmd.Parameters.AddWithValue("cloud_scale", wl.cloudScale);
-                    cmd.Parameters.AddWithValue("cloud_detail_x", wl.cloudDetailXYDensity.X);
-                    cmd.Parameters.AddWithValue("cloud_detail_y", wl.cloudDetailXYDensity.Y);
-                    cmd.Parameters.AddWithValue("cloud_detail_density", wl.cloudDetailXYDensity.Z);
-                    cmd.Parameters.AddWithValue("cloud_scroll_x", wl.cloudScrollX);
-                    cmd.Parameters.AddWithValue("cloud_scroll_x_lock", wl.cloudScrollXLock);
-                    cmd.Parameters.AddWithValue("cloud_scroll_y", wl.cloudScrollY);
-                    cmd.Parameters.AddWithValue("cloud_scroll_y_lock", wl.cloudScrollYLock);
-                    cmd.Parameters.AddWithValue("draw_classic_clouds", wl.drawClassicClouds);
-
-                    ExecuteNonQuery(cmd);
-                }
-                dbcon.Close();
-            }
-        }
-
-        public virtual void RemoveRegionWindlightSettings(UUID regionID)
-        {
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-
-                using (MySqlCommand cmd = dbcon.CreateCommand())
-                {
-                    cmd.CommandText = "delete from `regionwindlight` where `region_id`=?regionID";
-                    cmd.Parameters.AddWithValue("?regionID", regionID.ToString());
-                    ExecuteNonQuery(cmd);
-                }
-                dbcon.Close();
-            }
-        }
-
         #region RegionEnvironmentSettings
         public string LoadRegionEnvironmentSettings(UUID regionUUID)
         {
@@ -1231,7 +1000,7 @@ namespace OpenSim.Data.MySQL
                          "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
                          "sunvectorz, loaded_creation_datetime, " +
                          "loaded_creation_id, map_tile_ID, block_search, casino, " +
-                         "TelehubObject, parcel_tile_ID) " +
+                         "TelehubObject, parcel_tile_ID, cacheID) " +
                           "values (?RegionUUID, ?BlockTerraform, " +
                          "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
                          "?AllowLandResell, ?AllowLandJoinDivide, " +
@@ -1248,7 +1017,7 @@ namespace OpenSim.Data.MySQL
                          "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                          "?LoadedCreationDateTime, ?LoadedCreationID, " +
                          "?TerrainImageID, ?block_search, ?casino, " +
-                         "?TelehubObject, ?ParcelImageID)";
+                         "?TelehubObject, ?ParcelImageID, ?cacheID)";
 
                     FillRegionSettingsCommand(cmd, rs);
                     ExecuteNonQuery(cmd);
@@ -1352,49 +1121,57 @@ namespace OpenSim.Data.MySQL
 
             // Vectors
             prim.OffsetPosition = new Vector3(
-                (float)(double)row["PositionX"],
-                (float)(double)row["PositionY"],
-                (float)(double)row["PositionZ"]
+                (float)row["PositionX"],
+                (float)row["PositionY"],
+                (float)row["PositionZ"]
                 );
             prim.GroupPosition = new Vector3(
-                (float)(double)row["GroupPositionX"],
-                (float)(double)row["GroupPositionY"],
-                (float)(double)row["GroupPositionZ"]
+                (float)row["GroupPositionX"],
+                (float)row["GroupPositionY"],
+                (float)row["GroupPositionZ"]
                 );
             prim.Velocity = new Vector3(
-                (float)(double)row["VelocityX"],
-                (float)(double)row["VelocityY"],
-                (float)(double)row["VelocityZ"]
+                (float)row["VelocityX"],
+                (float)row["VelocityY"],
+                (float)row["VelocityZ"]
                 );
             prim.AngularVelocity = new Vector3(
-                (float)(double)row["AngularVelocityX"],
-                (float)(double)row["AngularVelocityY"],
-                (float)(double)row["AngularVelocityZ"]
+                (float)row["AngularVelocityX"],
+                (float)row["AngularVelocityY"],
+                (float)row["AngularVelocityZ"]
                 );
             prim.Acceleration = new Vector3(
-                (float)(double)row["AccelerationX"],
-                (float)(double)row["AccelerationY"],
-                (float)(double)row["AccelerationZ"]
+                (float)row["AccelerationX"],
+                (float)row["AccelerationY"],
+                (float)row["AccelerationZ"]
                 );
             // quaternions
             prim.RotationOffset = new Quaternion(
-                (float)(double)row["RotationX"],
-                (float)(double)row["RotationY"],
-                (float)(double)row["RotationZ"],
-                (float)(double)row["RotationW"]
+                (float)row["RotationX"],
+                (float)row["RotationY"],
+                (float)row["RotationZ"],
+                (float)row["RotationW"]
                 );
             prim.SitTargetPositionLL = new Vector3(
-                (float)(double)row["SitTargetOffsetX"],
-                (float)(double)row["SitTargetOffsetY"],
-                (float)(double)row["SitTargetOffsetZ"]
+                (float)row["SitTargetOffsetX"],
+                (float)row["SitTargetOffsetY"],
+                (float)row["SitTargetOffsetZ"]
                 );
             prim.SitTargetOrientationLL = new Quaternion(
-                (float)(double)row["SitTargetOrientX"],
-                (float)(double)row["SitTargetOrientY"],
-                (float)(double)row["SitTargetOrientZ"],
-                (float)(double)row["SitTargetOrientW"]
+                (float)row["SitTargetOrientX"],
+                (float)row["SitTargetOrientY"],
+                (float)row["SitTargetOrientZ"],
+                (float)row["SitTargetOrientW"]
                 );
 
+            prim.StandOffset = new Vector3(
+                (float)row["standtargetx"],
+                (float)row["standtargety"],
+                (float)row["standtargetz"]
+                );
+
+            prim.SitActiveRange = (float)row["sitactrange"];
+
             prim.PayPrice[0] = (int)row["PayPrice"];
             prim.PayPrice[1] = (int)row["PayButton1"];
             prim.PayPrice[2] = (int)row["PayButton2"];
@@ -1402,8 +1179,11 @@ namespace OpenSim.Data.MySQL
             prim.PayPrice[4] = (int)row["PayButton4"];
 
             prim.Sound = DBGuid.FromDB(row["LoopedSound"].ToString());
-            prim.SoundGain = (float)(double)row["LoopedSoundGain"];
-            prim.SoundFlags = 1; // If it's persisted at all, it's looped
+            prim.SoundGain = (float)row["LoopedSoundGain"];
+            if (prim.Sound != UUID.Zero)
+                prim.SoundFlags = 1; // If it's persisted at all, it's looped
+            else
+                prim.SoundFlags = 0;
 
             if (!(row["TextureAnimation"] is DBNull))
                 prim.TextureAnimation = (byte[])row["TextureAnimation"];
@@ -1411,21 +1191,21 @@ namespace OpenSim.Data.MySQL
                 prim.ParticleSystem = (byte[])row["ParticleSystem"];
 
             prim.AngularVelocity = new Vector3(
-                (float)(double)row["OmegaX"],
-                (float)(double)row["OmegaY"],
-                (float)(double)row["OmegaZ"]
+                (float)row["OmegaX"],
+                (float)row["OmegaY"],
+                (float)row["OmegaZ"]
                 );
 
             prim.SetCameraEyeOffset(new Vector3(
-                (float)(double)row["CameraEyeOffsetX"],
-                (float)(double)row["CameraEyeOffsetY"],
-                (float)(double)row["CameraEyeOffsetZ"]
+                (float)row["CameraEyeOffsetX"],
+                (float)row["CameraEyeOffsetY"],
+                (float)row["CameraEyeOffsetZ"]
                 ));
 
             prim.SetCameraAtOffset(new Vector3(
-                (float)(double)row["CameraAtOffsetX"],
-                (float)(double)row["CameraAtOffsetY"],
-                (float)(double)row["CameraAtOffsetZ"]
+                (float)row["CameraAtOffsetX"],
+                (float)row["CameraAtOffsetY"],
+                (float)row["CameraAtOffsetZ"]
                 ));
 
             prim.SetForceMouselook((sbyte)row["ForceMouselook"] != 0);
@@ -1454,16 +1234,16 @@ namespace OpenSim.Data.MySQL
             if (!(row["AttachedPosX"] is System.DBNull))
             {
                 prim.AttachedPos = new Vector3(
-                    (float)(double)row["AttachedPosX"],
-                    (float)(double)row["AttachedPosY"],
-                    (float)(double)row["AttachedPosZ"]
+                    (float)row["AttachedPosX"],
+                    (float)row["AttachedPosY"],
+                    (float)row["AttachedPosZ"]
                     );
             }
 
             if (!(row["DynAttrs"] is System.DBNull))
                 prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
             else
-                prim.DynAttrs = new DAMap();
+                prim.DynAttrs = null;
 
             if (!(row["KeyframeMotion"] is DBNull))
             {
@@ -1479,10 +1259,10 @@ namespace OpenSim.Data.MySQL
             }
 
             prim.PhysicsShapeType = (byte)Convert.ToInt32(row["PhysicsShapeType"].ToString());
-            prim.Density = (float)(double)row["Density"];
-            prim.GravityModifier = (float)(double)row["GravityModifier"];
-            prim.Friction = (float)(double)row["Friction"];
-            prim.Restitution = (float)(double)row["Restitution"];
+            prim.Density = (float)row["Density"];
+            prim.GravityModifier = (float)row["GravityModifier"];
+            prim.Friction = (float)row["Friction"];
+            prim.Restitution = (float)row["Restitution"];
             prim.RotationAxisLocks = (byte)Convert.ToInt32(row["RotationAxisLocks"].ToString());
 
             SOPVehicle vehicle = null;
@@ -1499,6 +1279,25 @@ namespace OpenSim.Data.MySQL
                 pdata = PhysicsInertiaData.FromXml2(row["PhysInertia"].ToString());
             prim.PhysicsInertia = pdata;
 
+            if (!(row["sopanims"] is DBNull))
+            {
+                Byte[] data = (byte[])row["sopanims"];
+                if (data.Length > 0)
+                    prim.DeSerializeAnimations(data);
+                else
+                    prim.Animations = null;
+            }
+            else
+            {
+                prim.Animations = null;
+            }
+
+            prim.SitActiveRange = (float)row["sitactrange"];
+
+            int pseudocrc = (int)row["pseudocrc"];
+            if(pseudocrc != 0)
+                prim.PseudoCRC = pseudocrc;
+
             return prim;
         }
 
@@ -1603,6 +1402,10 @@ namespace OpenSim.Data.MySQL
             newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
             newSettings.Casino = Convert.ToBoolean(row["casino"]);
 
+            if (!(row["cacheID"] is DBNull))
+                newSettings.CacheID = DBGuid.FromDB(row["cacheID"]);
+
+
             return newSettings;
         }
 
@@ -1686,6 +1489,34 @@ namespace OpenSim.Data.MySQL
             if (!(row["GroupAVSounds"] is System.DBNull))
                 newData.GroupAVSounds = Convert.ToInt32(row["GroupAVSounds"]) != 0 ? true : false;
 
+            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;
         }
 
@@ -1740,38 +1571,43 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("EveryoneMask", prim.EveryoneMask);
             cmd.Parameters.AddWithValue("BaseMask", prim.BaseMask);
             // vectors
-            cmd.Parameters.AddWithValue("PositionX", (double)prim.OffsetPosition.X);
-            cmd.Parameters.AddWithValue("PositionY", (double)prim.OffsetPosition.Y);
-            cmd.Parameters.AddWithValue("PositionZ", (double)prim.OffsetPosition.Z);
-            cmd.Parameters.AddWithValue("GroupPositionX", (double)prim.GroupPosition.X);
-            cmd.Parameters.AddWithValue("GroupPositionY", (double)prim.GroupPosition.Y);
-            cmd.Parameters.AddWithValue("GroupPositionZ", (double)prim.GroupPosition.Z);
-            cmd.Parameters.AddWithValue("VelocityX", (double)prim.Velocity.X);
-            cmd.Parameters.AddWithValue("VelocityY", (double)prim.Velocity.Y);
-            cmd.Parameters.AddWithValue("VelocityZ", (double)prim.Velocity.Z);
-            cmd.Parameters.AddWithValue("AngularVelocityX", (double)prim.AngularVelocity.X);
-            cmd.Parameters.AddWithValue("AngularVelocityY", (double)prim.AngularVelocity.Y);
-            cmd.Parameters.AddWithValue("AngularVelocityZ", (double)prim.AngularVelocity.Z);
-            cmd.Parameters.AddWithValue("AccelerationX", (double)prim.Acceleration.X);
-            cmd.Parameters.AddWithValue("AccelerationY", (double)prim.Acceleration.Y);
-            cmd.Parameters.AddWithValue("AccelerationZ", (double)prim.Acceleration.Z);
+            cmd.Parameters.AddWithValue("PositionX", prim.OffsetPosition.X);
+            cmd.Parameters.AddWithValue("PositionY", prim.OffsetPosition.Y);
+            cmd.Parameters.AddWithValue("PositionZ", prim.OffsetPosition.Z);
+            cmd.Parameters.AddWithValue("GroupPositionX", prim.GroupPosition.X);
+            cmd.Parameters.AddWithValue("GroupPositionY", prim.GroupPosition.Y);
+            cmd.Parameters.AddWithValue("GroupPositionZ", prim.GroupPosition.Z);
+            cmd.Parameters.AddWithValue("VelocityX", prim.Velocity.X);
+            cmd.Parameters.AddWithValue("VelocityY", prim.Velocity.Y);
+            cmd.Parameters.AddWithValue("VelocityZ", prim.Velocity.Z);
+            cmd.Parameters.AddWithValue("AngularVelocityX", prim.AngularVelocity.X);
+            cmd.Parameters.AddWithValue("AngularVelocityY", prim.AngularVelocity.Y);
+            cmd.Parameters.AddWithValue("AngularVelocityZ", prim.AngularVelocity.Z);
+            cmd.Parameters.AddWithValue("AccelerationX", prim.Acceleration.X);
+            cmd.Parameters.AddWithValue("AccelerationY", prim.Acceleration.Y);
+            cmd.Parameters.AddWithValue("AccelerationZ", prim.Acceleration.Z);
+
+            cmd.Parameters.AddWithValue("standtargetx", prim.StandOffset.X);
+            cmd.Parameters.AddWithValue("standtargety", prim.StandOffset.Y);
+            cmd.Parameters.AddWithValue("standtargetz", prim.StandOffset.Z);
+
             // quaternions
-            cmd.Parameters.AddWithValue("RotationX", (double)prim.RotationOffset.X);
-            cmd.Parameters.AddWithValue("RotationY", (double)prim.RotationOffset.Y);
-            cmd.Parameters.AddWithValue("RotationZ", (double)prim.RotationOffset.Z);
-            cmd.Parameters.AddWithValue("RotationW", (double)prim.RotationOffset.W);
+            cmd.Parameters.AddWithValue("RotationX", prim.RotationOffset.X);
+            cmd.Parameters.AddWithValue("RotationY", prim.RotationOffset.Y);
+            cmd.Parameters.AddWithValue("RotationZ", prim.RotationOffset.Z);
+            cmd.Parameters.AddWithValue("RotationW", prim.RotationOffset.W);
 
             // Sit target
             Vector3 sitTargetPos = prim.SitTargetPositionLL;
-            cmd.Parameters.AddWithValue("SitTargetOffsetX", (double)sitTargetPos.X);
-            cmd.Parameters.AddWithValue("SitTargetOffsetY", (double)sitTargetPos.Y);
-            cmd.Parameters.AddWithValue("SitTargetOffsetZ", (double)sitTargetPos.Z);
+            cmd.Parameters.AddWithValue("SitTargetOffsetX", sitTargetPos.X);
+            cmd.Parameters.AddWithValue("SitTargetOffsetY", sitTargetPos.Y);
+            cmd.Parameters.AddWithValue("SitTargetOffsetZ", sitTargetPos.Z);
 
             Quaternion sitTargetOrient = prim.SitTargetOrientationLL;
-            cmd.Parameters.AddWithValue("SitTargetOrientW", (double)sitTargetOrient.W);
-            cmd.Parameters.AddWithValue("SitTargetOrientX", (double)sitTargetOrient.X);
-            cmd.Parameters.AddWithValue("SitTargetOrientY", (double)sitTargetOrient.Y);
-            cmd.Parameters.AddWithValue("SitTargetOrientZ", (double)sitTargetOrient.Z);
+            cmd.Parameters.AddWithValue("SitTargetOrientW", sitTargetOrient.W);
+            cmd.Parameters.AddWithValue("SitTargetOrientX", sitTargetOrient.X);
+            cmd.Parameters.AddWithValue("SitTargetOrientY", sitTargetOrient.Y);
+            cmd.Parameters.AddWithValue("SitTargetOrientZ", sitTargetOrient.Z);
 
             cmd.Parameters.AddWithValue("PayPrice", prim.PayPrice[0]);
             cmd.Parameters.AddWithValue("PayButton1", prim.PayPrice[1]);
@@ -1782,7 +1618,7 @@ namespace OpenSim.Data.MySQL
             if ((prim.SoundFlags & 1) != 0) // Looped
             {
                 cmd.Parameters.AddWithValue("LoopedSound", prim.Sound.ToString());
-                cmd.Parameters.AddWithValue("LoopedSoundGain", prim.SoundGain);
+                cmd.Parameters.AddWithValue("LoopedSoundGain", (float)prim.SoundGain);
             }
             else
             {
@@ -1793,17 +1629,17 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("TextureAnimation", prim.TextureAnimation);
             cmd.Parameters.AddWithValue("ParticleSystem", prim.ParticleSystem);
 
-            cmd.Parameters.AddWithValue("OmegaX", (double)prim.AngularVelocity.X);
-            cmd.Parameters.AddWithValue("OmegaY", (double)prim.AngularVelocity.Y);
-            cmd.Parameters.AddWithValue("OmegaZ", (double)prim.AngularVelocity.Z);
+            cmd.Parameters.AddWithValue("OmegaX", prim.AngularVelocity.X);
+            cmd.Parameters.AddWithValue("OmegaY", prim.AngularVelocity.Y);
+            cmd.Parameters.AddWithValue("OmegaZ", prim.AngularVelocity.Z);
 
-            cmd.Parameters.AddWithValue("CameraEyeOffsetX", (double)prim.GetCameraEyeOffset().X);
-            cmd.Parameters.AddWithValue("CameraEyeOffsetY", (double)prim.GetCameraEyeOffset().Y);
-            cmd.Parameters.AddWithValue("CameraEyeOffsetZ", (double)prim.GetCameraEyeOffset().Z);
+            cmd.Parameters.AddWithValue("CameraEyeOffsetX", prim.GetCameraEyeOffset().X);
+            cmd.Parameters.AddWithValue("CameraEyeOffsetY", prim.GetCameraEyeOffset().Y);
+            cmd.Parameters.AddWithValue("CameraEyeOffsetZ", prim.GetCameraEyeOffset().Z);
 
-            cmd.Parameters.AddWithValue("CameraAtOffsetX", (double)prim.GetCameraAtOffset().X);
-            cmd.Parameters.AddWithValue("CameraAtOffsetY", (double)prim.GetCameraAtOffset().Y);
-            cmd.Parameters.AddWithValue("CameraAtOffsetZ", (double)prim.GetCameraAtOffset().Z);
+            cmd.Parameters.AddWithValue("CameraAtOffsetX", prim.GetCameraAtOffset().X);
+            cmd.Parameters.AddWithValue("CameraAtOffsetY", prim.GetCameraAtOffset().Y);
+            cmd.Parameters.AddWithValue("CameraAtOffsetZ", prim.GetCameraAtOffset().Z);
 
             if (prim.GetForceMouselook())
                 cmd.Parameters.AddWithValue("ForceMouselook", 1);
@@ -1847,9 +1683,9 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
             if (prim.AttachedPos != null)
             {
-                cmd.Parameters.AddWithValue("AttachedPosX", (double)prim.AttachedPos.X);
-                cmd.Parameters.AddWithValue("AttachedPosY", (double)prim.AttachedPos.Y);
-                cmd.Parameters.AddWithValue("AttachedPosZ", (double)prim.AttachedPos.Z);
+                cmd.Parameters.AddWithValue("AttachedPosX", prim.AttachedPos.X);
+                cmd.Parameters.AddWithValue("AttachedPosY", prim.AttachedPos.Y);
+                cmd.Parameters.AddWithValue("AttachedPosZ", prim.AttachedPos.Z);
             }
 
             if (prim.KeyframeMotion != null)
@@ -1867,17 +1703,25 @@ namespace OpenSim.Data.MySQL
             else
                 cmd.Parameters.AddWithValue("Vehicle", String.Empty);
 
-            if (prim.DynAttrs.CountNamespaces > 0)
+            if (prim.DynAttrs != null && prim.DynAttrs.CountNamespaces > 0)
                 cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
             else
                 cmd.Parameters.AddWithValue("DynAttrs", null);
 
             cmd.Parameters.AddWithValue("PhysicsShapeType", prim.PhysicsShapeType);
-            cmd.Parameters.AddWithValue("Density", (double)prim.Density);
-            cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier);
-            cmd.Parameters.AddWithValue("Friction", (double)prim.Friction);
-            cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution);
+            cmd.Parameters.AddWithValue("Density", prim.Density);
+            cmd.Parameters.AddWithValue("GravityModifier", prim.GravityModifier);
+            cmd.Parameters.AddWithValue("Friction", prim.Friction);
+            cmd.Parameters.AddWithValue("Restitution", prim.Restitution);
             cmd.Parameters.AddWithValue("RotationAxisLocks", prim.RotationAxisLocks);
+
+            if (prim.Animations!= null)
+                cmd.Parameters.AddWithValue("sopanims", prim.SerializeAnimations());
+            else
+                cmd.Parameters.AddWithValue("sopanims", null);
+
+            cmd.Parameters.AddWithValue("sitactrange", prim.SitActiveRange);
+            cmd.Parameters.AddWithValue("pseudocrc", prim.PseudoCRC);
         }
 
         /// <summary>
@@ -1961,6 +1805,7 @@ namespace OpenSim.Data.MySQL
 
             cmd.Parameters.AddWithValue("ParcelImageID", settings.ParcelImageID);
             cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject);
+            cmd.Parameters.AddWithValue("cacheID", settings.CacheID);
         }
 
         /// <summary>
@@ -2018,7 +1863,19 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("SeeAVs", land.SeeAVs ? 1 : 0);
             cmd.Parameters.AddWithValue("AnyAVSounds", land.AnyAVSounds ? 1 : 0);
             cmd.Parameters.AddWithValue("GroupAVSounds", land.GroupAVSounds ? 1 : 0);
-
+            if (land.Environment == null)
+                cmd.Parameters.AddWithValue("environment", "");
+            else
+            {
+                try
+                {
+                    cmd.Parameters.AddWithValue("environment", ViewerEnvironment.ToOSDString(land.Environment));
+                }
+                catch
+                {
+                    cmd.Parameters.AddWithValue("environment", "");
+                }
+            }
         }
 
         /// <summary>

OpenSim/Data/MySQL/MySQLUserProfilesData.cs

@@ -112,8 +112,7 @@ namespace OpenSim.Data.MySQL
                                 }
                                 catch (Exception e)
                                 {
-                                    m_log.ErrorFormat("[PROFILES_DATA]" +
-                                                     ": UserAccount exception {0}", e.Message);
+                                    m_log.ErrorFormat("[PROFILES_DATA] GetClassifiedRecords exception {0}", e.Message);
                                 }
                                 n.Add("classifieduuid", OSD.FromUUID(Id));
                                 n.Add("name", OSD.FromString(Name));
@@ -234,8 +233,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": ClassifiedesUpdate exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdateClassifiedRecord exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -262,8 +260,7 @@ namespace OpenSim.Data.MySQL
             }
             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;
@@ -310,8 +307,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": GetPickInfo exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetClassifiedInfo exception {0}", e.Message);
             }
             return true;
         }
@@ -353,8 +349,7 @@ namespace OpenSim.Data.MySQL
             }
             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;
         }
@@ -407,8 +402,7 @@ 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;
         }
@@ -472,8 +466,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": UpdateAvatarNotes exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdatePicksRecord exception {0}", e.Message);
                 return false;
             }
             return true;
@@ -500,8 +493,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": DeleteUserPickRecord exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: DeletePicksRecord exception {0}", e.Message);
                 return false;
             }
             return true;
@@ -541,8 +533,7 @@ namespace OpenSim.Data.MySQL
             }
             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;
         }
@@ -589,8 +580,7 @@ namespace OpenSim.Data.MySQL
             }
             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;
@@ -711,8 +701,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": Requst properties exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetAvatarProperties exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -747,8 +736,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": AgentPropertiesUpdate exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarProperties exception {0}", e.Message);
 
                 return false;
             }
@@ -787,8 +775,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": AgentInterestsUpdate exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarInterests exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -849,7 +836,7 @@ namespace OpenSim.Data.MySQL
 
                     const string queryB = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = ?Id";
 
-                    using (MySqlCommand cmd = new MySqlCommand(string.Format (queryB,"`userpicks`"), dbcon))
+                    using (MySqlCommand cmd = new MySqlCommand(queryB, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
 
@@ -870,8 +857,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                  ": GetAvatarNotes exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetUserImageAssets exception {0}", e.Message);
             }
             return data;
         }
@@ -921,8 +907,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": Get preferences exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetUserPreferences exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -954,8 +939,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                    ": UserPreferencesUpdate exception {0} {1}", e.Message, e.InnerException);
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdateUserPreferences exception {0} {1}", e.Message, e.InnerException);
                 result = e.Message;
                 return false;
             }
@@ -1006,8 +990,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": Requst application data exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetUserAppData exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -1037,8 +1020,7 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": SetUserData exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: SetUserAppData exception {0}", e.Message);
                 return false;
             }
             return true;

OpenSim/Data/MySQL/MySQLXAssetData.cs

@@ -58,11 +58,6 @@ 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"; } }
@@ -250,7 +245,9 @@ namespace OpenSim.Data.MySQL
                         }
                     }
 
-                    byte[] hash = hasher.ComputeHash(asset.Data);
+                    byte[] hash;
+                    using (HashAlgorithm hasher = new SHA256CryptoServiceProvider())
+                        hash = hasher.ComputeHash(asset.Data);
 
 //                        m_log.DebugFormat(
 //                            "[XASSET DB]: Compressed data size for {0} {1}, hash {2} is {3}",

OpenSim/Data/MySQL/Resources/EstateStore.migrations

@@ -69,3 +69,15 @@ CREATE TABLE IF NOT EXISTS `estateban` (
 
 COMMIT;
 
+:VERSION 35
+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;
+COMMIT;
+
+:VERSION 36
+BEGIN;
+ALTER TABLE `estate_settings`
+    ADD COLUMN `AllowEnviromentOverride` tinyint(4) NOT NULL DEFAULT '0';
+COMMIT;

OpenSim/Data/MySQL/Resources/HGTravelStore.migrations

@@ -16,3 +16,9 @@ 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/MuteListStore.migrations

@@ -0,0 +1,16 @@
+: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/RegionStore.migrations

@@ -467,3 +467,86 @@ COMMIT;
 BEGIN;
 ALTER TABLE `prims` ADD COLUMN `PhysInertia` TEXT default NULL;
 COMMIT;
+
+:VERSION 58         #----- Add sop animations
+
+BEGIN;
+ALTER TABLE `prims` ADD COLUMN `sopanims` blob default NULL;
+COMMIT;
+
+:VERSION 59         #----- Add standtarget and sit range
+
+BEGIN;
+ALTER TABLE `prims` 
+ADD COLUMN `standtargetx` float DEFAULT '0.0',
+ADD COLUMN `standtargety` float DEFAULT '0.0',
+ADD COLUMN `standtargetz` float DEFAULT '0.0',
+ADD COLUMN `sitactrange` float DEFAULT '0.0';
+COMMIT;
+
+:VERSION 60         #----- don't store float on double
+
+BEGIN;
+ALTER TABLE `prims` 
+MODIFY `PositionX` float DEFAULT '0.0',
+MODIFY `PositionY` float DEFAULT '0.0',
+MODIFY `PositionZ` float DEFAULT '0.0',
+MODIFY `GroupPositionX` float DEFAULT '0.0',
+MODIFY `GroupPositionY` float DEFAULT '0.0',
+MODIFY `GroupPositionZ` float DEFAULT '0.0',
+MODIFY `VelocityX` float DEFAULT '0.0',
+MODIFY `VelocityY` float DEFAULT '0.0',
+MODIFY `VelocityZ` float DEFAULT '0.0',
+MODIFY `AngularVelocityX` float DEFAULT '0.0',
+MODIFY `AngularVelocityY` float DEFAULT '0.0',
+MODIFY `AngularVelocityZ` float DEFAULT '0.0',
+MODIFY `AccelerationX` float DEFAULT '0.0',
+MODIFY `AccelerationY` float DEFAULT '0.0',
+MODIFY `AccelerationZ` float DEFAULT '0.0',
+MODIFY `RotationX` float DEFAULT '0.0',
+MODIFY `RotationY` float DEFAULT '0.0',
+MODIFY `RotationZ` float DEFAULT '0.0',
+MODIFY `RotationW` float DEFAULT '0.0',
+MODIFY `SitTargetOffsetX` float DEFAULT '0.0',
+MODIFY `SitTargetOffsetY` float DEFAULT '0.0',
+MODIFY `SitTargetOffsetZ` float DEFAULT '0.0',
+MODIFY `SitTargetOrientX` float DEFAULT '0.0',
+MODIFY `SitTargetOrientY` float DEFAULT '0.0',
+MODIFY `SitTargetOrientZ` float DEFAULT '0.0',
+MODIFY `SitTargetOrientW` float DEFAULT '0.0',
+MODIFY `OmegaX` float DEFAULT '0.0',
+MODIFY `OmegaY` float DEFAULT '0.0',
+MODIFY `OmegaZ` float DEFAULT '0.0',
+MODIFY `CameraEyeOffsetX` float DEFAULT '0.0',
+MODIFY `CameraEyeOffsetY` float DEFAULT '0.0',
+MODIFY `CameraEyeOffsetZ` float DEFAULT '0.0',
+MODIFY `CameraAtOffsetX` float DEFAULT '0.0',
+MODIFY `CameraAtOffsetY` float DEFAULT '0.0',
+MODIFY `CameraAtOffsetZ` float DEFAULT '0.0',
+MODIFY `Density` float DEFAULT '1000.0',
+MODIFY `GravityModifier` float DEFAULT '1.0',
+MODIFY `Friction` float DEFAULT '0.6',
+MODIFY `Restitution` float DEFAULT '0.5',
+MODIFY `AttachedPosX` float DEFAULT '0',
+MODIFY `AttachedPosY` float DEFAULT '0',
+MODIFY `AttachedPosZ` float DEFAULT '0',
+MODIFY `LoopedSoundGain` float DEFAULT '0';
+COMMIT;
+
+:VERSION 61         #----- Add pseudo CRC and region cache id
+
+BEGIN;
+ALTER TABLE `prims` ADD COLUMN `pseudocrc` int DEFAULT '0';
+ALTER TABLE `regionsettings` ADD COLUMN `cacheID` char(36) DEFAULT NULL;
+COMMIT;
+
+:VERSION 62         #----- increase size of environment settings
+BEGIN;
+ALTER TABLE `regionenvironment` MODIFY `llsd_settings` MEDIUMTEXT;
+COMMIT;
+
+:VERSION 63         #----- parcel environment store
+BEGIN;
+ALTER TABLE `land` ADD COLUMN `environment` MEDIUMTEXT default NULL;
+COMMIT;
+

OpenSim/Data/MySQL/Resources/os_groups_Store.migrations

@@ -113,3 +113,11 @@ 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,6 +42,47 @@ 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,12 +68,34 @@ 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)
                 return Instance.Get(regionName, scopeID);
 
-//            m_log.DebugFormat("[NULL REGION DATA]: Getting region {0}, scope {1}", regionName, scopeID);
+            // m_log.DebugFormat("[NULL REGION DATA]: Getting region {0}, scope {1}", regionName, scopeID);
 
             string cleanName = regionName.ToLower();
 

OpenSim/Data/Null/NullSimulationData.cs

@@ -151,7 +151,7 @@ namespace OpenSim.Data.Null
         // Legacy. Just don't do this.
         public void StoreTerrain(double[,] ter, UUID regionID)
         {
-            TerrainData terrData = new HeightmapTerrainData(ter);
+            TerrainData terrData = new TerrainData(ter);
             StoreTerrain(terrData, regionID);
         }
 

OpenSim/Data/PGSQL/PGSQLEstateData.cs

@@ -286,7 +286,7 @@ namespace OpenSim.Data.PGSQL
         {
             es.ClearBans();
 
-            string sql = "select \"bannedUUID\" from estateban where \"EstateID\" = :EstateID";
+            string sql = "select * from estateban where \"EstateID\" = :EstateID";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
@@ -302,6 +302,8 @@ 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);
@@ -346,11 +348,15 @@ namespace OpenSim.Data.PGSQL
                     cmd.ExecuteNonQuery();
 
                     //Insert after
-                    cmd.CommandText = "insert into estateban (\"EstateID\", \"bannedUUID\",\"bannedIp\", \"bannedIpHostMask\", \"bannedNameMask\") values ( :EstateID, :bannedUUID, '','','' )";
+                    cmd.CommandText = "insert into estateban (\"EstateID\", \"bannedUUID\",\"bannedIp\", \"bannedIpHostMask\", \"bannedNameMask\", \"banningUUID\",\"banTime\" ) values ( :EstateID, :bannedUUID, '','','', :banningUUID, :banTime )";
                     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

@@ -0,0 +1,316 @@
+/*
+ * 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

@@ -180,7 +180,54 @@ namespace OpenSim.Data.PGSQL
 
         public virtual T[] Get(string field, string key)
         {
-            return Get(new string[] { field }, new 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);
+            }
         }
 
         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 ORDER BY lower(\"Name\") LIMIT 100";
+                pattern = "1";
 
                 return m_Groups.Get(pattern);
             }
             else
             {
-                pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%') ORDER BY lower(\"Name\") LIMIT 100";
+                pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%')";
 
                 return m_Groups.Get(pattern, new NpgsqlParameter("pattern", pattern));
             }

OpenSim/Data/PGSQL/PGSQLRegionData.cs

@@ -114,6 +114,27 @@ namespace OpenSim.Data.PGSQL
             }
         }
 
+        public RegionData GetSpecific(string regionName, UUID scopeID)
+        {
+            string sql = "select * from " + m_Realm + " where lower(\"regionName\") = lower(:regionName) ";
+            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));
+                if (scopeID != UUID.Zero)
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                List<RegionData> ret = RunCommand(cmd);
+                if (ret.Count == 0)
+                    return null;
+
+                return ret[0];
+            }
+        }
+
         public RegionData Get(int posX, int posY, UUID scopeID)
         {
             // extend database search for maximum region size area

OpenSim/Data/PGSQL/PGSQLSimulationData.cs

@@ -353,8 +353,10 @@ namespace OpenSim.Data.PGSQL
             ""PhysicsShapeType"" = :PhysicsShapeType, ""Density"" = :Density, ""GravityModifier"" = :GravityModifier, ""Friction"" = :Friction, ""Restitution"" = :Restitution, 
             ""PassCollisions"" = :PassCollisions, ""RotationAxisLocks"" = :RotationAxisLocks, ""RezzerID"" = :RezzerID,
             ""ClickAction"" = :ClickAction, ""Material"" = :Material, ""CollisionSound"" = :CollisionSound, ""CollisionSoundVolume"" = :CollisionSoundVolume, ""PassTouches"" = :PassTouches,
-            ""LinkNumber"" = :LinkNumber, ""MediaURL"" = :MediaURL, ""DynAttrs"" = :DynAttrs,
-            ""PhysInertia"" = :PhysInertia
+            ""LinkNumber"" = :LinkNumber, ""MediaURL"" = :MediaURL, ""DynAttrs"" = :DynAttrs, ""Vehicle"" = :Vehicle,
+            ""PhysInertia"" = :PhysInertia, ""standtargetx"" =:standtargetx, ""standtargety"" =:standtargety, ""standtargetz"" =:standtargetz,
+            ""sitactrange"" =:sitactrange, ""pseudocrc"" = :pseudocrc
+
         WHERE ""UUID"" = :UUID ;
 
         INSERT INTO
@@ -368,7 +370,8 @@ 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"" , ""PhysInertia""
+            ""PhysicsShapeType"", ""Density"", ""GravityModifier"", ""Friction"", ""Restitution"", ""PassCollisions"", ""RotationAxisLocks"", ""RezzerID"" , ""Vehicle"", ""PhysInertia"",
+            ""standtargetx"", ""standtargety"", ""standtargetz"", ""sitactrange"", ""pseudocrc""
             ) Select
             :UUID, :CreationDate, :Name, :Text, :Description, :SitName, :TouchName, :ObjectFlags, :OwnerMask, :NextOwnerMask, :GroupMask,
             :EveryoneMask, :BaseMask, :PositionX, :PositionY, :PositionZ, :GroupPositionX, :GroupPositionY, :GroupPositionZ, :VelocityX,
@@ -379,7 +382,8 @@ 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, :PhysInertia
+            :PhysicsShapeType, :Density, :GravityModifier, :Friction, :Restitution, :PassCollisions, :RotationAxisLocks, :RezzerID, :Vehicle, :PhysInertia,
+            :standtargetx, :standtargety, :standtargetz,:sitactrange, :pseudocrc 
             where not EXISTS (SELECT ""UUID"" FROM prims WHERE ""UUID"" = :UUID);
         ";
 
@@ -610,7 +614,7 @@ namespace OpenSim.Data.PGSQL
         // Legacy entry point for when terrain was always a 256x256 heightmap
         public void StoreTerrain(double[,] terrain, UUID regionID)
         {
-            StoreTerrain(new HeightmapTerrainData(terrain), regionID);
+            StoreTerrain(new TerrainData(terrain), regionID);
         }
 
         /// <summary>
@@ -766,13 +770,14 @@ namespace OpenSim.Data.PGSQL
                 (""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"")
+                 ""MediaType"",""MediaDescription"",""MediaSize"",""MediaLoop"",""ObscureMusic"",""ObscureMedia"",""SeeAVs"",""AnyAVSounds"",""GroupAVSounds"",
+                 ""environment"")
                 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)";
+                 :AnyAVSounds::int::smallint,:GroupAVSounds::int::smallint,:environment)";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
@@ -821,477 +826,6 @@ 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)
@@ -1432,7 +966,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
+""TelehubObject"" = :telehubobject, ""parcel_tile_ID"" = :ParcelImageID, ""cacheID"" = :cacheID
  WHERE ""regionUUID"" = :regionUUID";
 
                 using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
@@ -1547,6 +1081,8 @@ 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;
         }
 
@@ -1602,7 +1138,6 @@ namespace OpenSim.Data.PGSQL
             newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
             newData.Dwell = Convert.ToSingle(row["Dwell"]);
 
-
             try
             {
                 newData.UserLocation =
@@ -1632,6 +1167,35 @@ namespace OpenSim.Data.PGSQL
             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;
         }
 
@@ -1692,9 +1256,9 @@ namespace OpenSim.Data.PGSQL
             prim.BaseMask = Convert.ToUInt32(primRow["BaseMask"]);
             // vectors
             prim.OffsetPosition = new Vector3(
-                                    Convert.ToSingle(primRow["PositionX"]),
-                                    Convert.ToSingle(primRow["PositionY"]),
-                                    Convert.ToSingle(primRow["PositionZ"]));
+                                Convert.ToSingle(primRow["PositionX"]),
+                                Convert.ToSingle(primRow["PositionY"]),
+                                Convert.ToSingle(primRow["PositionZ"]));
 
             prim.GroupPosition = new Vector3(
                                     Convert.ToSingle(primRow["GroupPositionX"]),
@@ -1707,9 +1271,9 @@ namespace OpenSim.Data.PGSQL
                                 Convert.ToSingle(primRow["VelocityZ"]));
 
             prim.AngularVelocity = new Vector3(
-                                    Convert.ToSingle(primRow["AngularVelocityX"]),
-                                    Convert.ToSingle(primRow["AngularVelocityY"]),
-                                    Convert.ToSingle(primRow["AngularVelocityZ"]));
+                                Convert.ToSingle(primRow["AngularVelocityX"]),
+                                Convert.ToSingle(primRow["AngularVelocityY"]),
+                                Convert.ToSingle(primRow["AngularVelocityZ"]));
 
             prim.Acceleration = new Vector3(
                                 Convert.ToSingle(primRow["AccelerationX"]),
@@ -1728,12 +1292,20 @@ 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"]);
@@ -1742,7 +1314,10 @@ namespace OpenSim.Data.PGSQL
 
             prim.Sound = new UUID((Guid)primRow["LoopedSound"]);
             prim.SoundGain = Convert.ToSingle(primRow["LoopedSoundGain"]);
-            prim.SoundFlags = 1; // If it's persisted at all, it's looped
+            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"];
@@ -1797,7 +1372,7 @@ namespace OpenSim.Data.PGSQL
             if (!(primRow["DynAttrs"] is System.DBNull) && (string)primRow["DynAttrs"] != "")
                 prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
             else
-                prim.DynAttrs = new DAMap();
+                prim.DynAttrs = null;
 
             prim.PhysicsShapeType = Convert.ToByte(primRow["PhysicsShapeType"]);
             prim.Density = Convert.ToSingle(primRow["Density"]);
@@ -1805,13 +1380,24 @@ namespace OpenSim.Data.PGSQL
             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;
         }
 
@@ -1998,6 +1584,8 @@ 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();
         }
 
@@ -2059,6 +1647,20 @@ namespace OpenSim.Data.PGSQL
             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();
         }
 
@@ -2152,6 +1754,13 @@ 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]));
@@ -2214,8 +1823,7 @@ namespace OpenSim.Data.PGSQL
 
             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
@@ -2228,14 +1836,18 @@ namespace OpenSim.Data.PGSQL
 
             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.CountNamespaces > 0)
+            if (prim.DynAttrs != null && prim.DynAttrs.CountNamespaces > 0)
                 parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
             else
                 parameters.Add(_Database.CreateParameter("DynAttrs", null));
@@ -2247,6 +1859,8 @@ namespace OpenSim.Data.PGSQL
             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();
         }
 

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(string.Format(query, "\"userpicks\""), dbcon))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
                         cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
 

OpenSim/Data/PGSQL/Resources/EstateStore.migrations

@@ -110,3 +110,32 @@ CREATE INDEX IF NOT EXISTS  "ix_estateban" ON "public"."estateban" USING btree("
 
 COMMIT;
 
+:VERSION 13
+
+ BEGIN TRASACTION;
+
+-- ----------------------------
+-- SEQUENCE estate_settings_id
+-- ----------------------------
+CREATE SEQUENCE IF NOT EXISTS "public"."estate_settings_id"
+  INCREMENT 100
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 100
+  CACHE 1;
+
+COMMIT;
+
+:VERSION 14
+BEGIN TRANSACTION;
+
+ALTER TABLE "public"."estateban"
+    ADD COLUMN "banningUUID" uuid NOT NULL,
+    ADD COLUMN "banTime" int4 NOT NULL DEFAULT 0;
+COMMIT;
+
+:VERSION 15
+BEGIN TRANSACTION;
+ALTER TABLE "public"."estate_settings"
+    ADD COLUMN "AllowEnviromentOverride" bool NOT NULL;
+COMMIT;

OpenSim/Data/PGSQL/Resources/FSAssetStore.migrations

@@ -0,0 +1,14 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE fsassets (
+  "id" uuid NOT NULL PRIMARY KEY,
+  "type" integer NOT NULL,
+  "hash" char(64) NOT NULL,
+  "create_time" integer NOT NULL DEFAULT '0',
+  "access_time" integer NOT NULL DEFAULT '0',
+  "asset_flags" integer NOT NULL DEFAULT '0'
+);
+
+COMMIT;

OpenSim/Data/PGSQL/Resources/RegionStore.migrations

@@ -1225,3 +1225,33 @@ ALTER TABLE "public"."prims"
             ELSE NULL
             END;
 COMMIT;
+
+:VERSION 48 #---- field Vehicle to table prims
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "Vehicle" TEXT;
+COMMIT;
+
+:VERSION 49         #----- Add standtarget and sit range
+
+BEGIN;
+ALTER TABLE `prims` 
+ADD COLUMN `standtargetx` real DEFAULT '0.0',
+ADD COLUMN `standtargety` real DEFAULT '0.0',
+ADD COLUMN `standtargetz` real DEFAULT '0.0',
+ADD COLUMN `sitactrange` real DEFAULT '0.0';
+COMMIT;
+
+
+:VERSION 50         #----- Add pseudo CRC and region cache id
+
+BEGIN;
+ALTER TABLE `prims` ADD COLUMN `pseudocrc` integer DEFAULT '0';
+ALTER TABLE `regionsettings` ADD COLUMN `cacheID` uuid DEFAULT NULL;
+COMMIT;
+
+:VERSION 51         #----- parcel environment store
+BEGIN;
+ALTER TABLE `land` ADD COLUMN `environment` varchar default NULL;
+COMMIT;

OpenSim/Data/SQLite/Resources/EstateStore.migrations

@@ -63,7 +63,21 @@ CREATE TABLE IF NOT EXISTS estateban (
   bannedIpHostMask varchar(16) NOT NULL,
   bannedNameMask varchar(64) default NULL
 );
+
 CREATE INDEX estate_ban_estate_id on estateban(EstateID);
 
 COMMIT;
 
+:VERSION 11
+BEGIN;
+ALTER TABLE `estateban` ADD COLUMN `banningUUID` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+ALTER TABLE `estateban` ADD COLUMN `banTime` integer NOT NULL DEFAULT 0;
+COMMIT;
+
+:VERSION 12
+BEGIN;
+ALTER TABLE `estate_settings`
+    ADD COLUMN `AllowEnviromentOverride` tinyint not null default 0;
+COMMIT;
+
+

OpenSim/Data/SQLite/Resources/MuteListStore.migrations

@@ -0,0 +1,16 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+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 (AgentID, MuteID, MuteName),
+  PRIMARY KEY(AgentID)
+);
+
+COMMIT;

OpenSim/Data/SQLite/Resources/RegionStore.migrations

@@ -183,14 +183,14 @@ CREATE TABLE IF NOT EXISTS land(
        UserLookAtY float,
        UserLookAtZ float,
        AuthbuyerID varchar(36) NOT NULL default  '00000000-0000-0000-0000-000000000000', 
-	   OtherCleanTime INTEGER NOT NULL default 0, 
-	   Dwell INTEGER NOT NULL default 0, 
-	   `MediaType` VARCHAR(32) NOT NULL DEFAULT 'none/none', 
-	   `MediaDescription` VARCHAR(255) NOT NULL DEFAULT '', 
-	   `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0', 
-	   `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE, 
-	   `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE, 
-	   `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE);
+       OtherCleanTime INTEGER NOT NULL default 0, 
+       Dwell INTEGER NOT NULL default 0, 
+       `MediaType` VARCHAR(32) NOT NULL DEFAULT 'none/none', 
+       `MediaDescription` VARCHAR(255) NOT NULL DEFAULT '', 
+       `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0', 
+       `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE, 
+       `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE, 
+       `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE);
 
 CREATE TABLE IF NOT EXISTS landaccesslist(
        LandUUID varchar(255),
@@ -377,3 +377,25 @@ COMMIT;
 BEGIN;
 ALTER TABLE `prims` ADD COLUMN `PhysInertia` TEXT default NULL;
 COMMIT;
+
+:VERSION 37         #----- Add standtarget and sit range
+
+BEGIN;
+ALTER TABLE `prims` ADD COLUMN `standtargetx` float NOT NULL DEFAULT '0.0';
+ALTER TABLE `prims` ADD COLUMN `standtargety` float NOT NULL DEFAULT '0.0';
+ALTER TABLE `prims` ADD COLUMN `standtargetz` float NOT NULL DEFAULT '0.0';
+ALTER TABLE `prims` ADD COLUMN `sitactrange` float NOT NULL DEFAULT '0.0';
+COMMIT;
+
+
+:VERSION 38         #----- Add pseudo CRC and region cache id
+
+BEGIN;
+ALTER TABLE `prims` ADD COLUMN `pseudocrc` integer DEFAULT '0';
+ALTER TABLE `regionsettings` ADD COLUMN `cacheID` char(36) DEFAULT NULL;
+COMMIT;
+
+:VERSION 39         #----- parcel environment store
+BEGIN;
+ALTER TABLE `land` ADD COLUMN `environment` TEXT default NULL;
+COMMIT;

OpenSim/Data/SQLite/SQLiteEstateData.cs

@@ -186,13 +186,10 @@ namespace OpenSim.Data.SQLite
         private void DoCreate(EstateSettings es)
         {
             List<string> names = new List<string>(FieldList);
-
-            IDataReader r = null;
+            names.Remove("EstateID");
 
             using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
             {
-                names.Remove("EstateID");
-
                 string sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( :"+String.Join(", :", names.ToArray())+")";
 
                 cmd.CommandText = sql;
@@ -217,17 +214,12 @@ namespace OpenSim.Data.SQLite
 
                 cmd.CommandText = "select LAST_INSERT_ROWID() as id";
                 cmd.Parameters.Clear();
-
-                r = cmd.ExecuteReader();
+                using(IDataReader r = cmd.ExecuteReader())
+                {
+                    r.Read();
+                    es.EstateID = Convert.ToUInt32(r["id"]);
+                }
             }
-
-            r.Read();
-
-            es.EstateID = Convert.ToUInt32(r["id"]);
-
-            r.Close();
-
-            es.Save();
         }
 
         public void StoreEstateSettings(EstateSettings es)
@@ -240,11 +232,10 @@ namespace OpenSim.Data.SQLite
             foreach (string f in fields)
                 terms.Add(f+" = :"+f);
 
-            string sql = "update estate_settings set "+String.Join(", ", terms.ToArray())+" where EstateID = :EstateID";
-
             using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
             {
-                cmd.CommandText = sql;
+                cmd.CommandText = "update estate_settings set " + String.Join(", ", terms.ToArray()) + " where EstateID = :EstateID"; ;
+                cmd.Parameters.AddWithValue(":EstateID", es.EstateID);
 
                 foreach (string name in FieldList)
                 {
@@ -278,7 +269,7 @@ namespace OpenSim.Data.SQLite
 
             using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
             {
-                cmd.CommandText = "select bannedUUID from estateban where EstateID = :EstateID";
+                cmd.CommandText = "select * from estateban where EstateID = :EstateID";
                 cmd.Parameters.AddWithValue(":EstateID", es.EstateID);
 
                 r = cmd.ExecuteReader();
@@ -288,12 +279,11 @@ namespace OpenSim.Data.SQLite
             {
                 EstateBan eb = new EstateBan();
 
-                UUID uuid = new UUID();
-                UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
-
-                eb.BannedUserID = uuid;
+                eb.BannedUserID = DBGuid.FromDB(r["bannedUUID"]); ;
                 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);
             }
             r.Close();
@@ -310,12 +300,14 @@ namespace OpenSim.Data.SQLite
 
                 cmd.Parameters.Clear();
 
-                cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask) values ( :EstateID, :bannedUUID, '', '', '' )";
+                cmd.CommandText = "insert into estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask, banningUUID, banTime) values ( :EstateID, :bannedUUID, '', '', '', :banningUUID, :banTime )";
 
                 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();
@@ -471,34 +463,35 @@ namespace OpenSim.Data.SQLite
 
         public bool LinkRegion(UUID regionID, int estateID)
         {
-            SqliteTransaction transaction = m_connection.BeginTransaction();
-
-            // Delete any existing estate mapping for this region.
-            using(SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+            using(SqliteTransaction transaction = m_connection.BeginTransaction())
             {
-                cmd.CommandText = "delete from estate_map where RegionID = :RegionID";
-                cmd.Transaction = transaction;
-                cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
-
-                cmd.ExecuteNonQuery();
-            }
-
-            using(SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {
-                cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
-                cmd.Transaction = transaction;
-                cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
-                cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
-
-                if (cmd.ExecuteNonQuery() == 0)
+                // Delete any existing estate mapping for this region.
+                using(SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
-                    transaction.Rollback();
-                    return false;
+                    cmd.CommandText = "delete from estate_map where RegionID = :RegionID";
+                    cmd.Transaction = transaction;
+                    cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
+
+                    cmd.ExecuteNonQuery();
                 }
-                else
+
+                using(SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
-                    transaction.Commit();
-                    return true;
+                    cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
+                    cmd.Transaction = transaction;
+                    cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
+                    cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
+
+                    if (cmd.ExecuteNonQuery() == 0)
+                    {
+                        transaction.Rollback();
+                        return false;
+                    }
+                    else
+                    {
+                        transaction.Commit();
+                        return true;
+                    }
                 }
             }
         }

OpenSim/Data/SQLite/SQLiteMuteListData.cs

@@ -28,42 +28,44 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-using log4net;
-using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+#if CSharpSqlite
+    using Community.CsharpSqlite.Sqlite;
+#else
+    using Mono.Data.Sqlite;
+#endif
 
-namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
+namespace OpenSim.Data.SQLite
 {
-    public class MicroScheduler : System.MarshalByRefObject, IMicrothreader
+    public class SQLiteMuteListData : SQLiteGenericTableHandler<MuteData>, IMuteListData
     {
-        private readonly List<IEnumerator> m_threads = new List<IEnumerator>();
-
-        public void Run(IEnumerable microthread)
+        public SQLiteMuteListData(string connectionString)
+                : base(connectionString, "MuteList", "MuteListStore")
         {
-            lock (m_threads)
-                m_threads.Add(microthread.GetEnumerator());
         }
 
-        public void Tick(int count)
+        public MuteData[] Get(UUID agentID)
         {
-            lock (m_threads)
+            MuteData[] data = base.Get("AgentID", agentID.ToString());
+            return data;
+        }
+
+        public bool Delete(UUID agentID, UUID muteID, string muteName)
+        {
+            using (SqliteCommand cmd = new SqliteCommand())
             {
-                if (m_threads.Count == 0)
-                    return;
+                cmd.CommandText = "delete from MuteList where `AgentID` = :AgentID and `MuteID` = :MuteID and `MuteName` = :MuteName";
 
-                int i = 0;
-                while (m_threads.Count > 0 && i < count)
-                {
-                    i++;
+                cmd.Parameters.AddWithValue(":AgentID", agentID.ToString());
+                cmd.Parameters.AddWithValue(":MuteID", muteID.ToString());
+                cmd.Parameters.AddWithValue(":MuteName", muteName);
 
-                    bool running = m_threads[i%m_threads.Count].MoveNext();
-
-
-                    if (!running)
-                        m_threads.Remove(m_threads[i%m_threads.Count]);
-                }
+                if (ExecuteNonQuery(cmd, m_Connection) > 0)
+                    return true;
+                return false;
             }
         }
     }
-}
+}

OpenSim/Data/SQLite/SQLiteSimulationData.cs

@@ -429,75 +429,6 @@ namespace OpenSim.Data.SQLite
             }
         }
 
-        /// <summary>
-        /// Load windlight settings from region storage
-        /// </summary>
-        /// <param name="regionUUID">RegionID</param>
-        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
-        {
-            RegionLightShareData wl = null;
-
-            lock (ds)
-            {
-                DataTable windlightTable = ds.Tables["regionwindlight"];
-                DataRow windlightRow = windlightTable.Rows.Find(regionUUID.ToString());
-                if (windlightRow == null)
-                {
-                    wl = new RegionLightShareData();
-                    wl.regionID = regionUUID;
-                    StoreRegionWindlightSettings(wl);
-                    return wl;
-                }
-                wl = buildRegionWindlight(windlightRow);
-                return wl;
-            }
-        }
-
-        /// <summary>
-        /// Remove windlight settings from region storage
-        /// </summary>
-        /// <param name="regionID">RegionID</param>
-        public void RemoveRegionWindlightSettings(UUID regionID)
-        {
-            lock (ds)
-            {
-                DataTable windlightTable = ds.Tables["regionwindlight"];
-                DataRow windlightRow = windlightTable.Rows.Find(regionID.ToString());
-
-                if (windlightRow != null)
-                {
-                    windlightRow.Delete();
-                }
-            }
-            Commit();
-        }
-
-        /// <summary>
-        /// Adds an windlight into region storage
-        /// </summary>
-        /// <param name="wl">RegionLightShareData</param>
-        public void StoreRegionWindlightSettings(RegionLightShareData wl)
-        {
-            lock (ds)
-            {
-                DataTable windlightTable = ds.Tables["regionwindlight"];
-                DataRow windlightRow = windlightTable.Rows.Find(wl.regionID.ToString());
-
-                if (windlightRow == null)
-                {
-                    windlightRow = windlightTable.NewRow();
-                    fillRegionWindlightRow(windlightRow, wl);
-                    windlightTable.Rows.Add(windlightRow);
-                }
-                else
-                {
-                    fillRegionWindlightRow(windlightRow, wl);
-                }
-
-                Commit();
-            }
-        }
-
         #region Region Environment Settings
         public string LoadRegionEnvironmentSettings(UUID regionUUID)
         {
@@ -626,10 +557,13 @@ namespace OpenSim.Data.SQLite
 //                    m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
                     addPrim(prim, obj.UUID, regionUUID);
                 }
+                primDa.Update(ds, "prims");
+                shapeDa.Update(ds, "primshapes");
+                itemsDa.Update(ds, "primitems");
+                ds.AcceptChanges();
             }
 
-            Commit();
-//            m_log.Info("[Dump of prims]: " + ds.GetXml());
+            // m_log.Info("[Dump of prims]: " + ds.GetXml());
         }
 
         /// <summary>
@@ -823,7 +757,7 @@ namespace OpenSim.Data.SQLite
         // Legacy entry point for when terrain was always a 256x256 hieghtmap
         public void StoreTerrain(double[,] ter, UUID regionID)
         {
-            StoreTerrain(new HeightmapTerrainData(ter), regionID);
+            StoreTerrain(new TerrainData(ter), regionID);
         }
 
         /// <summary>
@@ -835,8 +769,7 @@ namespace OpenSim.Data.SQLite
         {
             lock (ds)
             {
-                using (
-                    SqliteCommand cmd = new SqliteCommand("delete from terrain where RegionUUID=:RegionUUID", m_conn))
+                using (SqliteCommand cmd = new SqliteCommand("delete from terrain where RegionUUID=:RegionUUID", m_conn))
                 {
                     cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
                     cmd.ExecuteNonQuery();
@@ -1058,12 +991,9 @@ namespace OpenSim.Data.SQLite
                     if (rowToCheck["LandUUID"].ToString() == parcel.LandData.GlobalID.ToString())
                         rowsToDelete.Add(rowToCheck);
                 }
-                for (int iter = 0; iter < rowsToDelete.Count; iter++)
-                {
+                for (int iter = 0; iter < rowsToDelete.Count; ++iter)
                     rowsToDelete[iter].Delete();
-                    landaccesslist.Rows.Remove(rowsToDelete[iter]);
-                }
-                rowsToDelete.Clear();
+
                 foreach (LandAccessEntry entry in parcel.LandData.ParcelAccessList)
                 {
                     DataRow newAccessRow = landaccesslist.NewRow();
@@ -1313,6 +1243,21 @@ namespace OpenSim.Data.SQLite
 
             createCol(prims, "KeyframeMotion", typeof(Byte[]));
 
+            createCol(prims, "PassTouches", typeof(bool));
+            createCol(prims, "PassCollisions", typeof(bool));
+            createCol(prims, "Vehicle", typeof(string));
+
+            createCol(prims, "RotationAxisLocks", typeof(byte));
+
+            createCol(prims, "PhysInertia", typeof(string));
+
+            createCol(prims, "standtargetx", typeof(float));
+            createCol(prims, "standtargety", typeof(float));
+            createCol(prims, "standtargetz", typeof(float));
+            createCol(prims, "sitactrange", typeof(float));
+
+            createCol(prims, "pseudocrc", typeof(int));
+
             // Add in contraints
             prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] };
 
@@ -1355,6 +1300,7 @@ namespace OpenSim.Data.SQLite
             createCol(shapes, "ProfileCurve", typeof(Int32));
             createCol(shapes, "ProfileHollow", typeof(Int32));
             createCol(shapes, "State", typeof(Int32));
+            createCol(shapes, "LastAttachPoint", typeof(Int32));
             // text TODO: this isn't right, but I'm not sure the right
             // way to specify this as a blob atm
             createCol(shapes, "Texture", typeof(Byte[]));
@@ -1456,6 +1402,7 @@ namespace OpenSim.Data.SQLite
             createCol(land, "SeeAVs", typeof(Boolean));
             createCol(land, "AnyAVSounds", typeof(Boolean));
             createCol(land, "GroupAVSounds", typeof(Boolean));
+            createCol(land, "environment", typeof(string));
 
             land.PrimaryKey = new DataColumn[] { land.Columns["UUID"] };
 
@@ -1520,6 +1467,9 @@ namespace OpenSim.Data.SQLite
             createCol(regionsettings, "map_tile_ID", typeof(String));
             createCol(regionsettings, "TelehubObject", typeof(String));
             createCol(regionsettings, "parcel_tile_ID", typeof(String));
+            createCol(regionsettings, "block_search", typeof(Boolean));
+            createCol(regionsettings, "casino", typeof(Boolean));
+            createCol(regionsettings, "cacheID", typeof(string));
             regionsettings.PrimaryKey = new DataColumn[] { regionsettings.Columns["regionUUID"] };
             return regionsettings;
         }
@@ -1725,14 +1675,18 @@ namespace OpenSim.Data.SQLite
                                                    Convert.ToSingle(row["SitTargetOffsetY"]),
                                                    Convert.ToSingle(row["SitTargetOffsetZ"]));
             prim.SitTargetOrientationLL = new Quaternion(
-                                                         Convert.ToSingle(
-                                                                          row["SitTargetOrientX"]),
-                                                         Convert.ToSingle(
-                                                                          row["SitTargetOrientY"]),
-                                                         Convert.ToSingle(
-                                                                          row["SitTargetOrientZ"]),
-                                                         Convert.ToSingle(
-                                                                          row["SitTargetOrientW"]));
+                                                         Convert.ToSingle(row["SitTargetOrientX"]),
+                                                         Convert.ToSingle(row["SitTargetOrientY"]),
+                                                         Convert.ToSingle(row["SitTargetOrientZ"]),
+                                                         Convert.ToSingle(row["SitTargetOrientW"]));
+
+            prim.StandOffset = new Vector3(
+                            Convert.ToSingle(row["standtargetx"]),
+                            Convert.ToSingle(row["standtargety"]),
+                            Convert.ToSingle(row["standtargetz"])
+                            );
+
+            prim.SitActiveRange = Convert.ToSingle(row["sitactrange"]);
 
             prim.ClickAction = Convert.ToByte(row["ClickAction"]);
             prim.PayPrice[0] = Convert.ToInt32(row["PayPrice"]);
@@ -1743,7 +1697,10 @@ namespace OpenSim.Data.SQLite
 
             prim.Sound = new UUID(row["LoopedSound"].ToString());
             prim.SoundGain = Convert.ToSingle(row["LoopedSoundGain"]);
-            prim.SoundFlags = 1; // If it's persisted at all, it's looped
+            if (prim.Sound != UUID.Zero)
+                prim.SoundFlags = 1; // If it's persisted at all, it's looped
+            else
+                prim.SoundFlags = 0;
 
             if (!row.IsNull("TextureAnimation"))
                 prim.TextureAnimation = Convert.FromBase64String(row["TextureAnimation"].ToString());
@@ -1809,7 +1766,7 @@ namespace OpenSim.Data.SQLite
             }
             else
             {
-                prim.DynAttrs = new DAMap();
+                prim.DynAttrs = null;
             }
 
             prim.PhysicsShapeType = Convert.ToByte(row["PhysicsShapeType"]);
@@ -1849,6 +1806,10 @@ namespace OpenSim.Data.SQLite
                 pdata = PhysicsInertiaData.FromXml2(row["PhysInertia"].ToString());
             prim.PhysicsInertia = pdata;
 
+            int pseudocrc = Convert.ToInt32(row["pseudocrc"]);
+            if(pseudocrc != 0)
+                prim.PseudoCRC = pseudocrc;
+
             return prim;
         }
 
@@ -1960,6 +1921,36 @@ namespace OpenSim.Data.SQLite
 
             newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
 
+            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;
         }
 
@@ -2012,86 +2003,12 @@ namespace OpenSim.Data.SQLite
             newSettings.ParcelImageID = new UUID((String)row["parcel_tile_ID"]);
             newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
             newSettings.Casino = Convert.ToBoolean(row["casino"]);
+            if (!(row["cacheID"] is System.DBNull))
+                newSettings.CacheID = new UUID((String)row["cacheID"]);
+
             return newSettings;
         }
 
-        /// <summary>
-        /// Build a windlight entry from the persisted data.
-        /// </summary>
-        /// <param name="row"></param>
-        /// <returns>RegionLightShareData</returns>
-        private RegionLightShareData buildRegionWindlight(DataRow row)
-        {
-            RegionLightShareData windlight = new RegionLightShareData();
-
-            windlight.regionID = new UUID((string)row["region_id"]);
-            windlight.waterColor.X = Convert.ToSingle(row["water_color_r"]);
-            windlight.waterColor.Y = Convert.ToSingle(row["water_color_g"]);
-            windlight.waterColor.Z = Convert.ToSingle(row["water_color_b"]);
-            //windlight.waterColor.W = Convert.ToSingle(row["water_color_i"]); //not implemented
-            windlight.waterFogDensityExponent = Convert.ToSingle(row["water_fog_density_exponent"]);
-            windlight.underwaterFogModifier = Convert.ToSingle(row["underwater_fog_modifier"]);
-            windlight.reflectionWaveletScale.X = Convert.ToSingle(row["reflection_wavelet_scale_1"]);
-            windlight.reflectionWaveletScale.Y = Convert.ToSingle(row["reflection_wavelet_scale_2"]);
-            windlight.reflectionWaveletScale.Z = Convert.ToSingle(row["reflection_wavelet_scale_3"]);
-            windlight.fresnelScale = Convert.ToSingle(row["fresnel_scale"]);
-            windlight.fresnelOffset = Convert.ToSingle(row["fresnel_offset"]);
-            windlight.refractScaleAbove = Convert.ToSingle(row["refract_scale_above"]);
-            windlight.refractScaleBelow = Convert.ToSingle(row["refract_scale_below"]);
-            windlight.blurMultiplier = Convert.ToSingle(row["blur_multiplier"]);
-            windlight.bigWaveDirection.X = Convert.ToSingle(row["big_wave_direction_x"]);
-            windlight.bigWaveDirection.Y = Convert.ToSingle(row["big_wave_direction_y"]);
-            windlight.littleWaveDirection.X = Convert.ToSingle(row["little_wave_direction_x"]);
-            windlight.littleWaveDirection.Y = Convert.ToSingle(row["little_wave_direction_y"]);
-            windlight.normalMapTexture = new UUID((string)row["normal_map_texture"]);
-            windlight.horizon.X = Convert.ToSingle(row["horizon_r"]);
-            windlight.horizon.Y = Convert.ToSingle(row["horizon_g"]);
-            windlight.horizon.Z = Convert.ToSingle(row["horizon_b"]);
-            windlight.horizon.W = Convert.ToSingle(row["horizon_i"]);
-            windlight.hazeHorizon = Convert.ToSingle(row["haze_horizon"]);
-            windlight.blueDensity.X = Convert.ToSingle(row["blue_density_r"]);
-            windlight.blueDensity.Y = Convert.ToSingle(row["blue_density_g"]);
-            windlight.blueDensity.Z = Convert.ToSingle(row["blue_density_b"]);
-            windlight.blueDensity.W = Convert.ToSingle(row["blue_density_i"]);
-            windlight.hazeDensity = Convert.ToSingle(row["haze_density"]);
-            windlight.densityMultiplier = Convert.ToSingle(row["density_multiplier"]);
-            windlight.distanceMultiplier = Convert.ToSingle(row["distance_multiplier"]);
-            windlight.maxAltitude = Convert.ToUInt16(row["max_altitude"]);
-            windlight.sunMoonColor.X = Convert.ToSingle(row["sun_moon_color_r"]);
-            windlight.sunMoonColor.Y = Convert.ToSingle(row["sun_moon_color_g"]);
-            windlight.sunMoonColor.Z = Convert.ToSingle(row["sun_moon_color_b"]);
-            windlight.sunMoonColor.W = Convert.ToSingle(row["sun_moon_color_i"]);
-            windlight.sunMoonPosition = Convert.ToSingle(row["sun_moon_position"]);
-            windlight.ambient.X = Convert.ToSingle(row["ambient_r"]);
-            windlight.ambient.Y = Convert.ToSingle(row["ambient_g"]);
-            windlight.ambient.Z = Convert.ToSingle(row["ambient_b"]);
-            windlight.ambient.W = Convert.ToSingle(row["ambient_i"]);
-            windlight.eastAngle = Convert.ToSingle(row["east_angle"]);
-            windlight.sunGlowFocus = Convert.ToSingle(row["sun_glow_focus"]);
-            windlight.sunGlowSize = Convert.ToSingle(row["sun_glow_size"]);
-            windlight.sceneGamma = Convert.ToSingle(row["scene_gamma"]);
-            windlight.starBrightness = Convert.ToSingle(row["star_brightness"]);
-            windlight.cloudColor.X = Convert.ToSingle(row["cloud_color_r"]);
-            windlight.cloudColor.Y = Convert.ToSingle(row["cloud_color_g"]);
-            windlight.cloudColor.Z = Convert.ToSingle(row["cloud_color_b"]);
-            windlight.cloudColor.W = Convert.ToSingle(row["cloud_color_i"]);
-            windlight.cloudXYDensity.X = Convert.ToSingle(row["cloud_x"]);
-            windlight.cloudXYDensity.Y = Convert.ToSingle(row["cloud_y"]);
-            windlight.cloudXYDensity.Z = Convert.ToSingle(row["cloud_density"]);
-            windlight.cloudCoverage = Convert.ToSingle(row["cloud_coverage"]);
-            windlight.cloudScale = Convert.ToSingle(row["cloud_scale"]);
-            windlight.cloudDetailXYDensity.X = Convert.ToSingle(row["cloud_detail_x"]);
-            windlight.cloudDetailXYDensity.Y = Convert.ToSingle(row["cloud_detail_y"]);
-            windlight.cloudDetailXYDensity.Z = Convert.ToSingle(row["cloud_detail_density"]);
-            windlight.cloudScrollX = Convert.ToSingle(row["cloud_scroll_x"]);
-            windlight.cloudScrollXLock = Convert.ToBoolean(row["cloud_scroll_x_lock"]);
-            windlight.cloudScrollY = Convert.ToSingle(row["cloud_scroll_y"]);
-            windlight.cloudScrollYLock = Convert.ToBoolean(row["cloud_scroll_y_lock"]);
-            windlight.drawClassicClouds = Convert.ToBoolean(row["draw_classic_clouds"]);
-
-            return windlight;
-        }
-
         /// <summary>
         /// Build a land access entry from the persisted data.
         /// </summary>
@@ -2172,6 +2089,14 @@ namespace OpenSim.Data.SQLite
             row["SitTargetOrientX"] = sitTargetOrient.X;
             row["SitTargetOrientY"] = sitTargetOrient.Y;
             row["SitTargetOrientZ"] = sitTargetOrient.Z;
+
+            Vector3 standTarget = prim.StandOffset;
+            row["standtargetx"] = standTarget.X;
+            row["standtargety"] = standTarget.Y;
+            row["standtargetz"] = standTarget.Z;
+
+            row["sitactrange"] = prim.SitActiveRange;
+
             row["ColorR"] = Convert.ToInt32(prim.Color.R);
             row["ColorG"] = Convert.ToInt32(prim.Color.G);
             row["ColorB"] = Convert.ToInt32(prim.Color.B);
@@ -2197,7 +2122,6 @@ namespace OpenSim.Data.SQLite
             row["CameraAtOffsetY"] = prim.GetCameraAtOffset().Y;
             row["CameraAtOffsetZ"] = prim.GetCameraAtOffset().Z;
 
-
             if ((prim.SoundFlags & 1) != 0) // Looped
             {
                 row["LoopedSound"] = prim.Sound.ToString();
@@ -2247,7 +2171,7 @@ namespace OpenSim.Data.SQLite
             row["AttachedPosY"] = prim.AttachedPos.Y;
             row["AttachedPosZ"] = prim.AttachedPos.Z;
 
-            if (prim.DynAttrs.CountNamespaces > 0)
+            if (prim.DynAttrs!= null && prim.DynAttrs.CountNamespaces > 0)
                 row["DynAttrs"] = prim.DynAttrs.ToXml();
             else
                 row["DynAttrs"] = null;
@@ -2277,6 +2201,7 @@ namespace OpenSim.Data.SQLite
             else
                 row["PhysInertia"] = String.Empty;
 
+            row["pseudocrc"] = prim.PseudoCRC;
         }
 
         /// <summary>
@@ -2364,6 +2289,20 @@ namespace OpenSim.Data.SQLite
             row["AnyAVSounds"] = land.AnyAVSounds;
             row["GroupAVSounds"] = land.GroupAVSounds;
 
+            if (land.Environment == null)
+                row["environment"] = "";
+            else
+            {
+                try
+                {
+                    row["environment"] = ViewerEnvironment.ToOSDString(land.Environment);
+                }
+                catch
+                {
+                    row["environment"] = "";
+                }
+            }
+
         }
 
         /// <summary>
@@ -2424,79 +2363,7 @@ namespace OpenSim.Data.SQLite
             row["parcel_tile_ID"] = settings.ParcelImageID.ToString();
             row["block_search"] = settings.GodBlockSearch;
             row["casino"] = settings.Casino;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="row"></param>
-        /// <param name="windlight"></param>
-        private static void fillRegionWindlightRow(DataRow row, RegionLightShareData windlight)
-        {
-            row["region_id"] = windlight.regionID.ToString();
-            row["water_color_r"] = windlight.waterColor.X;
-            row["water_color_g"] = windlight.waterColor.Y;
-            row["water_color_b"] = windlight.waterColor.Z;
-            row["water_color_i"] = 1; //windlight.waterColor.W;  //not implemented
-            row["water_fog_density_exponent"] = windlight.waterFogDensityExponent;
-            row["underwater_fog_modifier"] = windlight.underwaterFogModifier;
-            row["reflection_wavelet_scale_1"] = windlight.reflectionWaveletScale.X;
-            row["reflection_wavelet_scale_2"] = windlight.reflectionWaveletScale.Y;
-            row["reflection_wavelet_scale_3"] = windlight.reflectionWaveletScale.Z;
-            row["fresnel_scale"] = windlight.fresnelScale;
-            row["fresnel_offset"] = windlight.fresnelOffset;
-            row["refract_scale_above"] = windlight.refractScaleAbove;
-            row["refract_scale_below"] = windlight.refractScaleBelow;
-            row["blur_multiplier"] = windlight.blurMultiplier;
-            row["big_wave_direction_x"] = windlight.bigWaveDirection.X;
-            row["big_wave_direction_y"] = windlight.bigWaveDirection.Y;
-            row["little_wave_direction_x"] = windlight.littleWaveDirection.X;
-            row["little_wave_direction_y"] = windlight.littleWaveDirection.Y;
-            row["normal_map_texture"] = windlight.normalMapTexture.ToString();
-            row["horizon_r"] = windlight.horizon.X;
-            row["horizon_g"] = windlight.horizon.Y;
-            row["horizon_b"] = windlight.horizon.Z;
-            row["horizon_i"] = windlight.horizon.W;
-            row["haze_horizon"] = windlight.hazeHorizon;
-            row["blue_density_r"] = windlight.blueDensity.X;
-            row["blue_density_g"] = windlight.blueDensity.Y;
-            row["blue_density_b"] = windlight.blueDensity.Z;
-            row["blue_density_i"] = windlight.blueDensity.W;
-            row["haze_density"] = windlight.hazeDensity;
-            row["density_multiplier"] = windlight.densityMultiplier;
-            row["distance_multiplier"] = windlight.distanceMultiplier;
-            row["max_altitude"] = windlight.maxAltitude;
-            row["sun_moon_color_r"] = windlight.sunMoonColor.X;
-            row["sun_moon_color_g"] = windlight.sunMoonColor.Y;
-            row["sun_moon_color_b"] = windlight.sunMoonColor.Z;
-            row["sun_moon_color_i"] = windlight.sunMoonColor.W;
-            row["sun_moon_position"] = windlight.sunMoonPosition;
-            row["ambient_r"] = windlight.ambient.X;
-            row["ambient_g"] = windlight.ambient.Y;
-            row["ambient_b"] = windlight.ambient.Z;
-            row["ambient_i"] = windlight.ambient.W;
-            row["east_angle"] = windlight.eastAngle;
-            row["sun_glow_focus"] = windlight.sunGlowFocus;
-            row["sun_glow_size"] = windlight.sunGlowSize;
-            row["scene_gamma"] = windlight.sceneGamma;
-            row["star_brightness"] = windlight.starBrightness;
-            row["cloud_color_r"] = windlight.cloudColor.X;
-            row["cloud_color_g"] = windlight.cloudColor.Y;
-            row["cloud_color_b"] = windlight.cloudColor.Z;
-            row["cloud_color_i"] = windlight.cloudColor.W;
-            row["cloud_x"] = windlight.cloudXYDensity.X;
-            row["cloud_y"] = windlight.cloudXYDensity.Y;
-            row["cloud_density"] = windlight.cloudXYDensity.Z;
-            row["cloud_coverage"] = windlight.cloudCoverage;
-            row["cloud_scale"] = windlight.cloudScale;
-            row["cloud_detail_x"] = windlight.cloudDetailXYDensity.X;
-            row["cloud_detail_y"] = windlight.cloudDetailXYDensity.Y;
-            row["cloud_detail_density"] = windlight.cloudDetailXYDensity.Z;
-            row["cloud_scroll_x"] = windlight.cloudScrollX;
-            row["cloud_scroll_x_lock"] = windlight.cloudScrollXLock;
-            row["cloud_scroll_y"] = windlight.cloudScrollY;
-            row["cloud_scroll_y_lock"] = windlight.cloudScrollYLock;
-            row["draw_classic_clouds"] = windlight.drawClassicClouds;
+            row["cacheID"] = settings.CacheID;
         }
 
         /// <summary>

OpenSim/Data/SQLite/SQLiteUserProfilesData.cs

@@ -926,7 +926,7 @@ namespace OpenSim.Data.SQLite
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
-                    cmd.CommandText = query;
+                    cmd.CommandText = string.Format(query, "\"classifieds\"");
                     cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
 
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
@@ -940,7 +940,7 @@ namespace OpenSim.Data.SQLite
 
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
-                    cmd.CommandText = query;
+                    cmd.CommandText = string.Format(query, "\"userpicks\"");
                     cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
 
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))

OpenSim/Data/Tests/EstateTests.cs

@@ -495,10 +495,6 @@ namespace OpenSim.Data.Tests
             Assert.AreEqual(pricePerMeter, estateSettings.PricePerMeter);
             Assert.AreEqual(redirectGridX, estateSettings.RedirectGridX);
             Assert.AreEqual(redirectGridY, estateSettings.RedirectGridY);
-            Assert.AreEqual(useGlobalTime, estateSettings.UseGlobalTime);
-            Assert.AreEqual(fixedSun, estateSettings.FixedSun);
-
-            DataTestUtil.AssertDoubleEqualsWithTolerance(sunPosition, estateSettings.SunPosition);
 
             Assert.AreEqual(allowVoice, estateSettings.AllowVoice);
             Assert.AreEqual(allowDirectTeleport, estateSettings.AllowDirectTeleport);

OpenSim/Data/Tests/RegionTests.cs

@@ -269,12 +269,12 @@ namespace OpenSim.Data.Tests
             random.NextBytes(partsys);
             DateTime expires = new DateTime(2008, 12, 20);
             DateTime rezzed = new DateTime(2009, 07, 15);
-            Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());
-            Vector3 offset = new Vector3(random.Next(),random.Next(),random.Next());
-            Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next());
-            Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
-            Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next());
-            Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
+            Vector3 groupos = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+            Vector3 offset = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+            Quaternion rotoff = new Quaternion(random.Next(1),random.Next(1),random.Next(1),random.Next(1));
+            Vector3 velocity = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+            Vector3 angvelo = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+            Vector3 accel = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
             string description = name;
             Color color = Color.FromArgb(255, 165, 50, 100);
             string text = "All Your Base Are Belong to Us";
@@ -289,7 +289,7 @@ namespace OpenSim.Data.Tests
             pbshap.ProfileBegin = ushort.MaxValue;
             pbshap.ProfileEnd = ushort.MaxValue;
             pbshap.ProfileHollow = ushort.MaxValue;
-            Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next());
+            Vector3 scale = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
 
             RegionInfo regionInfo = new RegionInfo();
             regionInfo.RegionID = region3;
@@ -378,9 +378,9 @@ namespace OpenSim.Data.Tests
             SceneObjectPart p = sogs[0].RootPart;
             Assert.That(regionh,Is.EqualTo(p.RegionHandle), "Assert.That(regionh,Is.EqualTo(p.RegionHandle))");
             //Assert.That(localid,Is.EqualTo(p.LocalId), "Assert.That(localid,Is.EqualTo(p.LocalId))");
-            Assert.That(groupos,Is.EqualTo(p.GroupPosition), "Assert.That(groupos,Is.EqualTo(p.GroupPosition))");
+            Assert.That(groupos, Is.EqualTo(p.GroupPosition), "Assert.That(groupos,Is.EqualTo(p.GroupPosition))");
             Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))");
-            Assert.That(rotoff,Is.EqualTo(p.RotationOffset), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
+            Assert.That(rotoff, Is.EqualTo(p.RotationOffset), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
             Assert.That(uuid,Is.EqualTo(p.UUID), "Assert.That(uuid,Is.EqualTo(p.UUID))");
             Assert.That(creator,Is.EqualTo(p.CreatorID), "Assert.That(creator,Is.EqualTo(p.CreatorID))");
             //Assert.That(iserial,Is.EqualTo(p.InventorySerial), "Assert.That(iserial,Is.EqualTo(p.InventorySerial))");
@@ -443,12 +443,12 @@ namespace OpenSim.Data.Tests
             random.NextBytes(partsys);
             DateTime expires = new DateTime(2010, 12, 20);
             DateTime rezzed = new DateTime(2005, 07, 15);
-            Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());
-            Vector3 offset = new Vector3(random.Next(),random.Next(),random.Next());
-            Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next());
-            Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
-            Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next());
-            Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
+            Vector3 groupos = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+            Vector3 offset = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+            Quaternion rotoff = new Quaternion(random.Next(100000),random.Next(100000),random.Next(100000),random.Next(100000));
+            Vector3 velocity = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+            Vector3 angvelo = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+            Vector3 accel = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
             string description = name;
             Color color = Color.FromArgb(255, 255, 255, 0);
             string text = "What You Say?{]\vz~";
@@ -536,12 +536,12 @@ namespace OpenSim.Data.Tests
             {
                 UUID tmp = UUID.Random();
                 SceneObjectPart sop = NewSOP(("Test SOP " + i.ToString()),tmp);
-                Vector3 groupos = new Vector3(random.Next(),random.Next(),random.Next());
-                Vector3 offset = new Vector3(random.Next(),random.Next(),random.Next());
-                Quaternion rotoff = new Quaternion(random.Next(),random.Next(),random.Next(),random.Next());
-                Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
-                Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next());
-                Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
+                Vector3 groupos = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+                Vector3 offset = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+                Quaternion rotoff = new Quaternion(random.Next(100000),random.Next(100000),random.Next(100000),random.Next(100000));
+                Vector3 velocity = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+                Vector3 angvelo = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
+                Vector3 accel = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
 
                 sop.GroupPosition = groupos;
                 sop.RotationOffset = rotoff;
@@ -648,11 +648,13 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T020_PrimInventoryEmpty()
         {
+/*
             TestHelpers.InMethod();
 
             SceneObjectGroup sog = GetMySOG("object1");
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t, Is.Null);
+*/
         }
 
         // TODO: Is there any point to call StorePrimInventory on a list, rather than on the prim itself?
@@ -672,6 +674,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T021_PrimInventoryBasic()
         {
+/*
             TestHelpers.InMethod();
 
             SceneObjectGroup sog = GetMySOG("object1");
@@ -707,11 +710,13 @@ namespace OpenSim.Data.Tests
             sog = FindSOG("object1", region1);
             t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t, Is.Null);
+*/
         }
 
         [Test]
         public void T025_PrimInventoryPersistency()
         {
+/*
             TestHelpers.InMethod();
 
             InventoryItemBase i = new InventoryItemBase();
@@ -779,12 +784,14 @@ namespace OpenSim.Data.Tests
 //            Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 16), "Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8))");
             Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID), "Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID))");
             Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID), "Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID))");
+*/
         }
-
+/*
         [Test]
         [ExpectedException(typeof(ArgumentException))]
         public void T026_PrimInventoryMany()
         {
+
             TestHelpers.InMethod();
 
             UUID i1,i2,i3,i4;
@@ -812,8 +819,9 @@ namespace OpenSim.Data.Tests
             Assert.That(t3.Name, Is.EqualTo(ib3.Name), "Assert.That(t3.Name, Is.EqualTo(ib3.Name))");
             TaskInventoryItem t4 = sog.GetInventoryItem(sog.RootPart.LocalId, i4);
             Assert.That(t4, Is.Null);
-        }
 
+        }
+*/
         [Test]
         public void T052_RemoveObject()
         {
@@ -861,7 +869,6 @@ namespace OpenSim.Data.Tests
             double terrainlower = random.Next();
             Vector3 sunvector = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));
             UUID terimgid = UUID.Random();
-            double sunpos = random.Next();
             UUID cov = UUID.Random();
 
             RegionSettings r1 = db.LoadRegionSettings(region1);
@@ -895,10 +902,8 @@ namespace OpenSim.Data.Tests
             r1.TerrainLowerLimit = terrainlower;
             r1.UseEstateSun = false;
             r1.Sandbox = true;
-            r1.SunVector = sunvector;
             r1.TerrainImageID = terimgid;
             r1.FixedSun = true;
-            r1.SunPosition = sunpos;
             r1.Covenant = cov;
 
             db.StoreRegionSettings(r1);
@@ -933,12 +938,8 @@ namespace OpenSim.Data.Tests
             Assert.That(r1a.WaterHeight,Is.EqualTo(waterh), "Assert.That(r1a.WaterHeight,Is.EqualTo(waterh))");
             Assert.That(r1a.TerrainRaiseLimit,Is.EqualTo(terrainraise), "Assert.That(r1a.TerrainRaiseLimit,Is.EqualTo(terrainraise))");
             Assert.That(r1a.TerrainLowerLimit,Is.EqualTo(terrainlower), "Assert.That(r1a.TerrainLowerLimit,Is.EqualTo(terrainlower))");
-            Assert.That(r1a.UseEstateSun,Is.False);
             Assert.That(r1a.Sandbox,Is.True);
-            Assert.That(r1a.SunVector,Is.EqualTo(sunvector), "Assert.That(r1a.SunVector,Is.EqualTo(sunvector))");
             //Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid), "Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid))");
-            Assert.That(r1a.FixedSun,Is.True);
-            Assert.That(r1a.SunPosition, Is.EqualTo(sunpos), "Assert.That(r1a.SunPosition, Is.EqualTo(sunpos))");
             Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");
         }
 
@@ -962,7 +963,7 @@ namespace OpenSim.Data.Tests
             db.StoreTerrain(t1, region1);
 
             // store terrain is async
-            Thread.Sleep(1000);
+            Thread.Sleep(500);
 
             Assert.That(db.LoadTerrain(zero), Is.Null);
             Assert.That(db.LoadTerrain(region1), Is.Not.Null);
@@ -992,7 +993,7 @@ namespace OpenSim.Data.Tests
             db.StoreTerrain(baseterrain2, region1);
 
             // store terrain is async
-            Thread.Sleep(1000);
+            Thread.Sleep(500);
 
             double[,] t1 = db.LoadTerrain(region1);
             Assert.That(CompareTerrain(t1, baseterrain1), Is.False);
@@ -1078,7 +1079,6 @@ namespace OpenSim.Data.Tests
             sop.Shape = PrimitiveBaseShape.Default;
 
             SceneObjectGroup sog = new SceneObjectGroup(sop);
-//            sog.SetScene(scene);
 
             return sog;
         }

OpenSim/Framework/AgentCircuitData.cs

@@ -173,6 +173,7 @@ namespace OpenSim.Framework
         /// Position the Agent's Avatar starts in the region
         /// </summary>
         public Vector3 startpos;
+        public float startfar = -1.0f;
 
         public Dictionary<string, object> ServiceURLs;
 
@@ -219,6 +220,8 @@ namespace OpenSim.Framework
             args["channel"] = OSD.FromString(Channel);
             args["mac"] = OSD.FromString(Mac);
             args["id0"] = OSD.FromString(Id0);
+            if(startfar > 0)
+                args["far"] = OSD.FromReal(startfar);
 
             if (Appearance != null)
             {
@@ -264,16 +267,17 @@ namespace OpenSim.Framework
         /// <param name="args"></param>
         public void UnpackAgentCircuitData(OSDMap args)
         {
-            if (args["agent_id"] != null)
-                AgentID = args["agent_id"].AsUUID();
-            if (args["base_folder"] != null)
-                BaseFolder = args["base_folder"].AsUUID();
-            if (args["caps_path"] != null)
-                CapsPath = args["caps_path"].AsString();
+            OSD tmpOSD;
+            if (args.TryGetValue("agent_id", out tmpOSD))
+                AgentID = tmpOSD.AsUUID();
+            if (args.TryGetValue("base_folder", out tmpOSD))
+                BaseFolder =tmpOSD.AsUUID();
+            if (args.TryGetValue("caps_path", out tmpOSD))
+                CapsPath = tmpOSD.AsString();
 
-            if ((args["children_seeds"] != null) && (args["children_seeds"].Type == OSDType.Array))
+            if ((args.TryGetValue("children_seeds", out tmpOSD) && tmpOSD is OSDArray))
             {
-                OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]);
+                OSDArray childrenSeeds = (OSDArray)tmpOSD;
                 ChildrenCapSeeds = new Dictionary<ulong, string>();
                 foreach (OSD o in childrenSeeds)
                 {
@@ -282,50 +286,59 @@ namespace OpenSim.Framework
                         ulong handle = 0;
                         string seed = "";
                         OSDMap pair = (OSDMap)o;
-                        if (pair["handle"] != null)
-                            if (!UInt64.TryParse(pair["handle"].AsString(), out handle))
+                        if (pair.TryGetValue("handle", out tmpOSD))
+                        {
+                            if (!UInt64.TryParse(tmpOSD.AsString(), out handle))
                                 continue;
-                        if (pair["seed"] != null)
-                            seed = pair["seed"].AsString();
+                        }
                         if (!ChildrenCapSeeds.ContainsKey(handle))
-                            ChildrenCapSeeds.Add(handle, seed);
+                        {
+                            if (pair.TryGetValue("seed", out tmpOSD))
+                            {
+                                seed = tmpOSD.AsString();
+                                ChildrenCapSeeds.Add(handle, seed);
+                            }
+                        }
                     }
                 }
             }
             else
                 ChildrenCapSeeds = new Dictionary<ulong, string>();
 
-            if (args["child"] != null)
-                child = args["child"].AsBoolean();
-            if (args["circuit_code"] != null)
-                UInt32.TryParse(args["circuit_code"].AsString(), out circuitcode);
-            if (args["first_name"] != null)
-                firstname = args["first_name"].AsString();
-            if (args["last_name"] != null)
-                lastname = args["last_name"].AsString();
-            if (args["inventory_folder"] != null)
-                InventoryFolder = args["inventory_folder"].AsUUID();
-            if (args["secure_session_id"] != null)
-                SecureSessionID = args["secure_session_id"].AsUUID();
-            if (args["session_id"] != null)
-                SessionID = args["session_id"].AsUUID();
-            if (args["service_session_id"] != null)
-                ServiceSessionID = args["service_session_id"].AsString();
-            if (args["client_ip"] != null)
-                IPAddress = args["client_ip"].AsString();
-            if (args["viewer"] != null)
-                Viewer = args["viewer"].AsString();
-            if (args["channel"] != null)
-                Channel = args["channel"].AsString();
-            if (args["mac"] != null)
-                Mac = args["mac"].AsString();
-            if (args["id0"] != null)
-                Id0 = args["id0"].AsString();
-            if (args["teleport_flags"] != null)
-                teleportFlags = args["teleport_flags"].AsUInteger();
+            if (args.TryGetValue("child", out tmpOSD))
+                child = tmpOSD.AsBoolean();
+            if (args.TryGetValue("circuit_code", out tmpOSD))
+                UInt32.TryParse(tmpOSD.AsString(), out circuitcode);
+            if (args.TryGetValue("first_name", out tmpOSD))
+                firstname = tmpOSD.AsString();
+            if (args.TryGetValue("last_name", out tmpOSD))
+                lastname = tmpOSD.AsString();
+            if (args.TryGetValue("inventory_folder", out tmpOSD))
+                InventoryFolder = tmpOSD.AsUUID();
+            if (args.TryGetValue("secure_session_id", out tmpOSD))
+                SecureSessionID = tmpOSD.AsUUID();
+            if (args.TryGetValue("session_id", out tmpOSD))
+                SessionID = tmpOSD.AsUUID();
+            if (args.TryGetValue("service_session_id", out tmpOSD))
+                ServiceSessionID = tmpOSD.AsString();
+            if (args.TryGetValue("client_ip", out tmpOSD))
+                IPAddress = tmpOSD.AsString();
+            if (args.TryGetValue("viewer", out tmpOSD))
+                Viewer = tmpOSD.AsString();
+            if (args.TryGetValue("channel", out tmpOSD))
+                Channel = tmpOSD.AsString();
+            if (args.TryGetValue("mac", out tmpOSD))
+                Mac = tmpOSD.AsString();
+            if (args.TryGetValue("id0", out tmpOSD))
+                Id0 = tmpOSD.AsString();
+            if (args.TryGetValue("teleport_flags", out tmpOSD))
+                teleportFlags = tmpOSD.AsUInteger();
 
-            if (args["start_pos"] != null)
-                Vector3.TryParse(args["start_pos"].AsString(), out startpos);
+            if (args.TryGetValue("start_pos", out tmpOSD))
+                Vector3.TryParse(tmpOSD.AsString(), out startpos);
+
+            if(args.TryGetValue("far", out tmpOSD))
+                startfar = (float)tmpOSD.AsReal();
 
             //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
 
@@ -336,12 +349,12 @@ namespace OpenSim.Framework
 
                 // Eventually this code should be deprecated, use full appearance
                 // packing in packed_appearance
-                if (args["appearance_serial"] != null)
-                    Appearance.Serial = args["appearance_serial"].AsInteger();
+                if (args.TryGetValue("appearance_serial", out tmpOSD))
+                    Appearance.Serial = tmpOSD.AsInteger();
 
-                if (args.ContainsKey("packed_appearance") && (args["packed_appearance"].Type == OSDType.Map))
+                if (args.TryGetValue("packed_appearance", out tmpOSD) && (tmpOSD is OSDMap))
                 {
-                    Appearance.Unpack((OSDMap)args["packed_appearance"]);
+                    Appearance.Unpack((OSDMap)tmpOSD);
 //                    m_log.InfoFormat("[AGENTCIRCUITDATA] unpacked appearance");
                 }
                 else
@@ -356,31 +369,29 @@ namespace OpenSim.Framework
 
             ServiceURLs = new Dictionary<string, object>();
             // Try parse the new way, OSDMap
-            if (args.ContainsKey("serviceurls") && args["serviceurls"] != null && (args["serviceurls"]).Type == OSDType.Map)
+            if (args.TryGetValue("serviceurls", out tmpOSD) && (tmpOSD is OSDMap))
             {
-                OSDMap urls = (OSDMap)(args["serviceurls"]);
+                OSDMap urls = (OSDMap)tmpOSD;
                 foreach (KeyValuePair<String, OSD> kvp in urls)
                 {
-                    ServiceURLs[kvp.Key] = kvp.Value.AsString();
+                    ServiceURLs[kvp.Key] = kvp.Value;
                     //System.Console.WriteLine("XXX " + kvp.Key + "=" + ServiceURLs[kvp.Key]);
-
                 }
             }
             // else try the old way, OSDArray
             // OBSOLETE -- soon to be deleted
-            else if (args.ContainsKey("service_urls") && args["service_urls"] != null && (args["service_urls"]).Type == OSDType.Array)
+            else if (args.TryGetValue("service_urls", out tmpOSD) && (tmpOSD is OSDArray))
             {
-                OSDArray urls = (OSDArray)(args["service_urls"]);
-                for (int i = 0; i < urls.Count / 2; i++)
+                OSDArray urls = (OSDArray)tmpOSD;
+                OSD tmpOSDb;
+                for (int i = 0; i < urls.Count - 1; i += 2)
                 {
-                    ServiceURLs[urls[i * 2].AsString()] = urls[(i * 2) + 1].AsString();
+                    tmpOSD = urls[i];
+                    tmpOSDb = urls[i + 1];
+                    ServiceURLs[tmpOSD.AsString()] = tmpOSDb.AsString();
                     //System.Console.WriteLine("XXX " + urls[i * 2].AsString() + "=" + urls[(i * 2) + 1].AsString());
-
                 }
             }
         }
-
     }
-
-
 }

OpenSim/Framework/AgentCircuitManager.cs

@@ -26,6 +26,7 @@
  */
 
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
@@ -41,26 +42,18 @@ namespace OpenSim.Framework
         /// <remarks>
         /// We lock this for operations both on this dictionary and on m_agentCircuitsByUUID
         /// </remarks>
-        private Dictionary<uint, AgentCircuitData> m_agentCircuits = new Dictionary<uint, AgentCircuitData>();
+        private ConcurrentDictionary<uint, AgentCircuitData> m_agentCircuits = new ConcurrentDictionary<uint, AgentCircuitData>();
 
         /// <summary>
         /// Agent circuits indexed by agent UUID.
         /// </summary>
-        private Dictionary<UUID, AgentCircuitData> m_agentCircuitsByUUID = new Dictionary<UUID, AgentCircuitData>();
+        private ConcurrentDictionary<UUID, AgentCircuitData> m_agentCircuitsByUUID = new ConcurrentDictionary<UUID, AgentCircuitData>();
 
         public virtual AuthenticateResponse AuthenticateSession(UUID sessionID, UUID agentID, uint circuitcode)
         {
-            AgentCircuitData validcircuit = null;
-
-            lock (m_agentCircuits)
-            {
-                if (m_agentCircuits.ContainsKey(circuitcode))
-                    validcircuit = m_agentCircuits[circuitcode];
-            }
 
             AuthenticateResponse user = new AuthenticateResponse();
-
-            if (validcircuit == null)
+            if (!m_agentCircuits.TryGetValue(circuitcode, out AgentCircuitData validcircuit) || validcircuit == null)
             {
                 //don't have this circuit code in our list
                 user.Authorised = false;
@@ -79,13 +72,13 @@ namespace OpenSim.Framework
                 user.LoginInfo.InventoryFolder = validcircuit.InventoryFolder;
                 user.LoginInfo.BaseFolder = validcircuit.BaseFolder;
                 user.LoginInfo.StartPos = validcircuit.startpos;
+                user.LoginInfo.StartFar = (float)validcircuit.startfar;
             }
             else
             {
                 // Invalid
                 user.Authorised = false;
             }
-
             return user;
         }
 
@@ -96,65 +89,39 @@ namespace OpenSim.Framework
         /// <param name="agentData"></param>
         public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
         {
-            lock (m_agentCircuits)
-            {
-                if (m_agentCircuits.ContainsKey(circuitCode))
-                {
-                    m_agentCircuits[circuitCode] = agentData;
-                    m_agentCircuitsByUUID[agentData.AgentID] = agentData;
-                }
-                else
-                {
-                    m_agentCircuits.Add(circuitCode, agentData);
-                    m_agentCircuitsByUUID[agentData.AgentID] = agentData;
-                }
-            }
+            RemoveCircuit(agentData.AgentID); // no duplications
+            m_agentCircuits[circuitCode] = agentData;
+            m_agentCircuitsByUUID[agentData.AgentID] = agentData;
         }
 
         public virtual void RemoveCircuit(uint circuitCode)
         {
-            lock (m_agentCircuits)
+            if (m_agentCircuits.TryRemove(circuitCode, out AgentCircuitData ac))
             {
-                if (m_agentCircuits.ContainsKey(circuitCode))
-                {
-                    UUID agentID = m_agentCircuits[circuitCode].AgentID;
-                    m_agentCircuits.Remove(circuitCode);
-                    m_agentCircuitsByUUID.Remove(agentID);
-                }
+                m_agentCircuitsByUUID.TryRemove(ac.AgentID, out AgentCircuitData dummy);
             }
         }
 
         public virtual void RemoveCircuit(UUID agentID)
         {
-            lock (m_agentCircuits)
+            if (m_agentCircuitsByUUID.TryRemove(agentID, out AgentCircuitData ac))
             {
-                if (m_agentCircuitsByUUID.ContainsKey(agentID))
-                {
-                    uint circuitCode = m_agentCircuitsByUUID[agentID].circuitcode;
-                    m_agentCircuits.Remove(circuitCode);
-                    m_agentCircuitsByUUID.Remove(agentID);
-                }
+                m_agentCircuits.TryRemove(ac.circuitcode, out AgentCircuitData dummy);
             }
         }
 
         public AgentCircuitData GetAgentCircuitData(uint circuitCode)
         {
-            AgentCircuitData agentCircuit = null;
-
-            lock (m_agentCircuits)
-                m_agentCircuits.TryGetValue(circuitCode, out agentCircuit);
-
-            return agentCircuit;
+            if(m_agentCircuits.TryGetValue(circuitCode, out AgentCircuitData agentCircuit))
+                return agentCircuit;
+            return null;
         }
 
         public AgentCircuitData GetAgentCircuitData(UUID agentID)
         {
-            AgentCircuitData agentCircuit = null;
-
-            lock (m_agentCircuits)
-                m_agentCircuitsByUUID.TryGetValue(agentID, out agentCircuit);
-
-            return agentCircuit;
+            if(m_agentCircuitsByUUID.TryGetValue(agentID, out AgentCircuitData agentCircuit))
+                return agentCircuit;
+            return null;
         }
 
         /// <summary>
@@ -169,20 +136,16 @@ namespace OpenSim.Framework
 
         public void UpdateAgentData(AgentCircuitData agentData)
         {
-            lock (m_agentCircuits)
+            if (m_agentCircuits.TryGetValue(agentData.circuitcode, out AgentCircuitData ac))
             {
-                if (m_agentCircuits.ContainsKey((uint) agentData.circuitcode))
-                {
-                    m_agentCircuits[(uint) agentData.circuitcode].firstname = agentData.firstname;
-                    m_agentCircuits[(uint) agentData.circuitcode].lastname = agentData.lastname;
-                    m_agentCircuits[(uint) agentData.circuitcode].startpos = agentData.startpos;
+                ac.firstname = agentData.firstname;
+                ac.lastname = agentData.lastname;
+                ac.startpos = agentData.startpos;
+                ac.startfar = agentData.startfar;
 
-                    // Updated for when we don't know them before calling Scene.NewUserConnection
-                    m_agentCircuits[(uint) agentData.circuitcode].SecureSessionID = agentData.SecureSessionID;
-                    m_agentCircuits[(uint) agentData.circuitcode].SessionID = agentData.SessionID;
-
-                    // m_log.Debug("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
-                }
+                // Updated for when we don't know them before calling Scene.NewUserConnection
+                ac.SecureSessionID = agentData.SecureSessionID;
+                ac.SessionID = agentData.SessionID;
             }
         }
 
@@ -191,38 +154,30 @@ namespace OpenSim.Framework
         /// </summary>
         /// <param name="circuitcode"></param>
         /// <param name="newcircuitcode"></param>
-        public bool TryChangeCiruitCode(uint circuitcode, uint newcircuitcode)
+        public bool TryChangeCircuitCode(uint circuitcode, uint newcircuitcode)
         {
-            lock (m_agentCircuits)
+            if(m_agentCircuits.ContainsKey(newcircuitcode))
+                return false;
+            if (m_agentCircuits.TryRemove(circuitcode, out AgentCircuitData agentData))
             {
-                if (m_agentCircuits.ContainsKey((uint)circuitcode) && !m_agentCircuits.ContainsKey((uint)newcircuitcode))
-                {
-                    AgentCircuitData agentData = m_agentCircuits[(uint)circuitcode];
-
-                    agentData.circuitcode = newcircuitcode;
-
-                    m_agentCircuits.Remove((uint)circuitcode);
-                    m_agentCircuits.Add(newcircuitcode, agentData);
-                    return true;
-                }
+                agentData.circuitcode = newcircuitcode;
+                m_agentCircuits.TryAdd(newcircuitcode, agentData);
+                m_agentCircuitsByUUID[agentData.AgentID] = agentData;
+                return true;
             }
-
             return false;
         }
 
         public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)
         {
-            lock (m_agentCircuits)
-                if (m_agentCircuits.ContainsKey(circuitcode))
-                    m_agentCircuits[circuitcode].child = childstatus;
+            if (m_agentCircuits.TryGetValue(circuitcode, out AgentCircuitData ac))
+                ac.child = childstatus;
         }
 
         public bool GetAgentChildStatus(uint circuitcode)
         {
-            lock (m_agentCircuits)
-                if (m_agentCircuits.ContainsKey(circuitcode))
-                    return m_agentCircuits[circuitcode].child;
-
+            if (m_agentCircuits.TryGetValue(circuitcode, out AgentCircuitData ac))
+                return ac.child;
             return false;
         }
     }

OpenSim/Framework/AgentUpdateArgs.cs

@@ -83,6 +83,7 @@ namespace OpenSim.Framework
         public bool UseClientAgentPosition;
         public bool NeedsCameraCollision;
         public uint lastpacketSequence;
+        public double lastUpdateTS;
 
         public AgentUpdateArgs()
         {

OpenSim/Framework/Animation.cs

@@ -112,12 +112,13 @@ namespace OpenSim.Framework
         /// <param name="args"></param>
         public void UnpackUpdateMessage(OSDMap args)
         {
-            if (args["animation"] != null)
-                animID = args["animation"].AsUUID();
-            if (args["object_id"] != null)
-                objectID = args["object_id"].AsUUID();
-            if (args["seq_num"] != null)
-                sequenceNum = args["seq_num"].AsInteger();
+            OSD tmp;
+            if (args.TryGetValue("animation", out tmp))
+                animID = tmp.AsUUID();
+            if (args.TryGetValue("object_id", out tmp))
+                objectID = tmp.AsUUID();
+            if (args.TryGetValue("seq_num", out tmp))
+                sequenceNum = tmp.AsInteger();
         }
 
         public override bool Equals(object obj)

OpenSim/Framework/AssetBase.cs

@@ -34,12 +34,13 @@ using OpenMetaverse;
 namespace OpenSim.Framework
 {
     [Flags]
+    // this enum is stuck, can not be changed or will break compatibilty with any version older than that change
     public enum AssetFlags : int
     {
         Normal = 0,         // Immutable asset
         Maptile = 1,        // What it says
         Rewritable = 2,     // Content can be rewritten
-        Collectable = 4     // Can be GC'ed after some time
+        Collectable = 4,     // Can be GC'ed after some time
     }
 
     /// <summary>

OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs

@@ -42,11 +42,13 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
     public class AssetLoaderFileSystem : IAssetLoader
     {
         private static readonly UUID LIBRARY_OWNER_ID = new UUID("11111111-1111-0000-0000-000100bba000");
+        private static readonly string LIBRARY_OWNER_IDstr = "11111111-1111-0000-0000-000100bba000";
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type)
         {
-            AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID.ToString());
+            AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_IDstr);
 
             if (!String.IsNullOrEmpty(path))
             {

OpenSim/Framework/AvatarAppearance.cs

@@ -51,27 +51,28 @@ namespace OpenSim.Framework
 
         // this is viewer capabilities and weared things dependent
         // should be only used as initial default value ( V1 viewers )
-        public readonly static int VISUALPARAM_COUNT = 218;
+        public const int VISUALPARAM_COUNT = 218;
 
-//        public readonly static int TEXTURE_COUNT = 21
-        // 21 bad, make it be updated as libovm gets update
-        // also keeping in sync with it
-        public readonly static int TEXTURE_COUNT = Primitive.TextureEntry.MAX_FACES;
+        // regions and viewer compatibility
+        public readonly static int TEXTURE_COUNT = 45;
+        public const int TEXTURE_COUNT_PV7 = 29;
+        public const int BAKES_COUNT_PV7 = 6;
+        public const int MAXWEARABLE_PV7 = 16;
+        public const int MAXWEARABLE_LEGACY = 15;
 
-        public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 };
+        public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20, 40, 41, 42, 43, 44 };
 
         protected int m_serial = 0;
         protected byte[] m_visualparams;
         protected Primitive.TextureEntry m_texture;
         protected AvatarWearable[] m_wearables;
         protected Dictionary<int, List<AvatarAttachment>> m_attachments;
-        protected float m_avatarHeight = 0;
+        protected WearableCacheItem[] m_cacheitems;
         protected Vector3 m_avatarSize = new Vector3(0.45f, 0.6f, 1.9f); // sl Z cloud value
         protected Vector3 m_avatarBoxSize = new Vector3(0.45f, 0.6f, 1.9f);
+        protected float m_avatarHeight = 0;
         protected float m_avatarFeetOffset = 0;
         protected float m_avatarAnimOffset = 0;
-        protected WearableCacheItem[] m_cacheitems;
-        protected bool m_cacheItemsDirty = true;
 
         public virtual int Serial
         {
@@ -128,11 +129,7 @@ namespace OpenSim.Framework
             set { m_cacheitems = value; }
         }
 
-        public virtual bool WearableCacheItemsDirty
-        {
-            get { return m_cacheItemsDirty; }
-            set { m_cacheItemsDirty = value; }
-        }
+        public virtual float AvatarPreferencesHoverZ { get; set; }
 
         public AvatarAppearance()
         {
@@ -204,12 +201,14 @@ namespace OpenSim.Framework
                 SetDefaultParams();
 //                SetHeight();
                 SetSize(new Vector3(0.45f, 0.6f, 1.9f));
+                AvatarPreferencesHoverZ = 0;
                 m_attachments = new Dictionary<int, List<AvatarAttachment>>();
 
                 return;
             }
 
             m_serial = appearance.Serial;
+            AvatarPreferencesHoverZ = appearance.AvatarPreferencesHoverZ;
 
             if (copyWearables && (appearance.Wearables != null))
             {
@@ -228,7 +227,7 @@ namespace OpenSim.Framework
             m_texture = null;
             if (appearance.Texture != null)
             {
-                byte[] tbytes = appearance.Texture.GetBytes();
+                byte[] tbytes = appearance.Texture.GetBakesBytes();
                 m_texture = new Primitive.TextureEntry(tbytes,0,tbytes.Length);
                 if (copyBaked && appearance.m_cacheitems != null)
                     m_cacheitems = (WearableCacheItem[])appearance.m_cacheitems.Clone();
@@ -295,6 +294,7 @@ namespace OpenSim.Framework
             m_serial = 0;
 
             SetDefaultTexture();
+            AvatarPreferencesHoverZ = 0;
 
             //for (int i = 0; i < BAKE_INDICES.Length; i++)
             // {
@@ -330,9 +330,6 @@ namespace OpenSim.Framework
         protected virtual void SetDefaultTexture()
         {
             m_texture = new Primitive.TextureEntry(new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
-
-            // for (uint i = 0; i < TEXTURE_COUNT; i++)
-            //     m_texture.CreateFace(i).TextureID = new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE);
         }
 
         /// <summary>
@@ -347,31 +344,31 @@ namespace OpenSim.Framework
             if (textureEntry == null)
                 return false;
 
-            // There are much simpler versions of this copy that could be
-            // made. We determine if any of the textures actually
-            // changed to know if the appearance should be saved later
             bool changed = false;
-            for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
-            {
-                Primitive.TextureEntryFace newface = textureEntry.FaceTextures[i];
-                Primitive.TextureEntryFace oldface = m_texture.FaceTextures[i];
+            Primitive.TextureEntryFace newface;
+            Primitive.TextureEntryFace tmpFace;
 
-                if (newface == null)
+            //make sure textureEntry.DefaultTexture is the unused one(DEFAULT_AVATAR_TEXTURE).
+            Primitive.TextureEntry converted = new Primitive.TextureEntry(AppearanceManager.DEFAULT_AVATAR_TEXTURE);
+            for (uint i = 0; i < TEXTURE_COUNT; ++i)
+            {
+                newface = textureEntry.GetFace(i);
+                if (newface.TextureID != AppearanceManager.DEFAULT_AVATAR_TEXTURE)
                 {
-                    if (oldface == null)
-                        continue;
+                    tmpFace = converted.GetFace(i);
+                    tmpFace.TextureID = newface.TextureID; // we need a full high level copy, assuming all other parameters are the same.
+                    if (m_texture.FaceTextures[i] == null || newface.TextureID != m_texture.FaceTextures[i].TextureID)
+                        changed = true;
                 }
                 else
-                {
-                    if (oldface != null && oldface.TextureID == newface.TextureID)
+                {   if (m_texture.FaceTextures[i] == null)
                         continue;
+                    if(m_texture.FaceTextures[i].TextureID != AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                        changed = true;
                 }
-
-                changed = true;
             }
-
-            m_texture = textureEntry;
-
+            if(changed)
+                m_texture = converted;
             return changed;
         }
 
@@ -736,42 +733,72 @@ namespace OpenSim.Framework
 
             data["serial"] = OSD.FromInteger(m_serial);
             data["height"] = OSD.FromReal(m_avatarHeight);
+            data["aphz"] = OSD.FromReal(AvatarPreferencesHoverZ);
+
+            if (m_texture == null)
+                return data;
+
+            bool sendPV8 = false;
 
             // Wearables
-            //
-            // This will send as many or as few wearables as we have, unless a count
-            // is given. Used for legacy (pre 0.4) versions.
-            int count = ctx.WearablesCount;
-            if (ctx.WearablesCount == -1)
-                count = m_wearables.Length;
-            OSDArray wears = new OSDArray(count);
-            for (int i = 0; i < count; i++)
+            OSDArray wears;
+            int count;
+            if (ctx == null)
+                count = MAXWEARABLE_LEGACY;
+            else
             {
-                AvatarWearable dummyWearable = new AvatarWearable();
-
-                if (i < m_wearables.Length)
-                    wears.Add(m_wearables[i].Pack());
+                if(ctx.OutboundVersion >= 0.8)
+                {
+                    sendPV8 = true;
+                    count = m_wearables.Length;
+                }
+                else if (ctx.OutboundVersion >= 0.6)
+                    count = MAXWEARABLE_PV7;
                 else
-                    wears.Add(dummyWearable.Pack());
+                    count = MAXWEARABLE_LEGACY;
+
+                if (sendPV8 && count > MAXWEARABLE_PV7)
+                {
+                    wears = new OSDArray(count - MAXWEARABLE_PV7);
+                    for (int i = MAXWEARABLE_PV7; i < count; ++i)
+                        wears.Add(m_wearables[i].Pack());
+
+                    data["wrbls8"] = wears;
+                    count = MAXWEARABLE_PV7;
+                }
             }
+
+            if(count > m_wearables.Length)
+                count = m_wearables.Length;
+
+            wears = new OSDArray(count);
+            for (int i = 0; i < count; ++i)
+                wears.Add(m_wearables[i].Pack());
             data["wearables"] = wears;
 
             // Avatar Textures
-            OSDArray textures = new OSDArray(AvatarAppearance.TEXTURE_COUNT);
-            for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
+            OSDArray textures;
+            if (sendPV8)
             {
-                if (m_texture.FaceTextures[i] != null)
-                    textures.Add(OSD.FromUUID(m_texture.FaceTextures[i].TextureID));
-                else
-                    textures.Add(OSD.FromUUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
+                byte[] te = m_texture.GetBakesBytes();
+                data["te8"] = OSD.FromBinary(te);
+            }
+            else
+            {
+                textures = new OSDArray(TEXTURE_COUNT_PV7);
+                for (uint i = 0; i < TEXTURE_COUNT_PV7; ++i)
+                    textures.Add(OSD.FromUUID(m_texture.GetFace(i).TextureID));
+                data["textures"] = textures;
             }
-            data["textures"] = textures;
 
             if (m_cacheitems != null)
             {
-                OSDArray baked = WearableCacheItem.BakedToOSD(m_cacheitems);
-                if (baked != null)
+                OSDArray baked = WearableCacheItem.BakedToOSD(m_cacheitems, 0, BAKES_COUNT_PV7);
+                if (baked != null && baked.Count > 0)
                     data["bakedcache"] = baked;
+                baked = WearableCacheItem.BakedToOSD(m_cacheitems, BAKES_COUNT_PV7, -1);
+                if (baked != null && baked.Count > 0)
+                    data["bc8"] = baked;
             }
 
             // Visual Parameters
@@ -790,68 +817,178 @@ namespace OpenSim.Framework
             return data;
         }
 
+        public OSDMap PackForNotecard(bool NoHuds = true)
+        {
+            OSDMap data = new OSDMap();
+
+            data["serial"] = OSD.FromInteger(m_serial);
+            data["height"] = OSD.FromReal(m_avatarHeight);
+            data["aphz"] = OSD.FromReal(AvatarPreferencesHoverZ);
+
+            // old regions may not like missing/empty wears
+            OSDArray wears = new OSDArray(MAXWEARABLE_LEGACY);
+            for (int i = 0; i< MAXWEARABLE_LEGACY; ++i)
+                wears.Add(new OSDArray());
+            data["wearables"] = wears;
+
+            // Avatar Textures
+            OSDArray textures;
+
+            // allow old regions to still see something
+            textures = new OSDArray(TEXTURE_COUNT_PV7);
+            textures.Add(OSD.FromUUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
+            for (uint i = 1; i < TEXTURE_COUNT_PV7; ++i)
+                textures.Add(OSD.FromUUID(m_texture.GetFace(i).TextureID));
+            data["textures"] = textures;
+
+            bool needExtra = false;
+            for (int i = BAKES_COUNT_PV7; i < BAKE_INDICES.Length; ++i)
+            {
+                int idx = BAKE_INDICES[i];
+                if (m_texture.FaceTextures[idx] == null)
+                    continue;
+                if (m_texture.FaceTextures[idx].TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE ||
+                        m_texture.FaceTextures[idx].TextureID == UUID.Zero)
+                    continue;
+                needExtra = true;
+            }
+
+            if (needExtra)
+            {
+                byte[] te = m_texture.GetBakesBytes();
+                data["te8"] = OSD.FromBinary(te);
+            }
+
+            // Visual Parameters
+            OSDBinary visualparams = new OSDBinary(m_visualparams);
+            data["visualparams"] = visualparams;
+
+            lock (m_attachments)
+            {
+                // Attachments
+                OSDArray attachs = new OSDArray(m_attachments.Count);
+                foreach (AvatarAttachment attach in GetAttachments())
+                {
+                    if (NoHuds &&
+                            attach.AttachPoint >= (uint)AttachmentPoint.HUDCenter2 &&
+                            attach.AttachPoint <= (uint)AttachmentPoint.HUDBottomRight)
+                        continue;
+                    attachs.Add(attach.Pack());
+                }
+                data["attachments"] = attachs;
+            }
+
+            return data;
+        }
+
         /// <summary>
         /// Unpack and OSDMap and initialize the appearance
         /// from it
         /// </summary>
         public void Unpack(OSDMap data)
         {
-            if ((data != null) && (data["serial"] != null))
-                m_serial = data["serial"].AsInteger();
-            if ((data != null) && (data["height"] != null))
-//                m_avatarHeight = (float)data["height"].AsReal();
-                SetSize(new Vector3(0.45f,0.6f, (float)data["height"].AsReal()));
+            SetDefaultWearables();
+            SetDefaultTexture();
+            SetDefaultParams();
+            m_attachments = new Dictionary<int, List<AvatarAttachment>>();
+
+            if(data == null)
+            {
+                m_log.Warn("[AVATAR APPEARANCE]: data to unpack is null");
+                return;
+            }
+
+            OSD tmpOSD;
+            if (data.TryGetValue("serial", out tmpOSD))
+                m_serial = tmpOSD.AsInteger();
+            if(data.TryGetValue("aphz", out tmpOSD))
+                AvatarPreferencesHoverZ = (float)tmpOSD.AsReal();
+            if (data.TryGetValue("height", out tmpOSD))
+                SetSize(new Vector3(0.45f, 0.6f, (float)tmpOSD.AsReal()));
 
             try
             {
                 // Wearables
-                SetDefaultWearables();
-                if ((data != null) && (data["wearables"] != null) && (data["wearables"]).Type == OSDType.Array)
+                OSD tmpOSD8;
+                OSDArray wears8 = null;
+                int wears8Count = 0;
+
+                if (data.TryGetValue("wrbls8", out tmpOSD8) && (tmpOSD8 is OSDArray))
                 {
-                    OSDArray wears = (OSDArray)(data["wearables"]);
-
-                    int count = wears.Count;
-
-                    m_wearables = new AvatarWearable[count];
-
-                    for (int i = 0; i < count; i++)
-                        m_wearables[i] = new AvatarWearable((OSDArray)wears[i]);
-                }
-                else
-                {
-                    m_log.Warn("[AVATAR APPEARANCE]: failed to unpack wearables");
+                    wears8 = (OSDArray)tmpOSD8;
+                    wears8Count = wears8.Count;
                 }
 
-                // Avatar Textures
-                SetDefaultTexture();
-                if ((data != null) && (data["textures"] != null) && (data["textures"]).Type == OSDType.Array)
+                if (data.TryGetValue("wearables", out tmpOSD) && (tmpOSD is OSDArray))
                 {
-                    OSDArray textures = (OSDArray)(data["textures"]);
-                    for (int i = 0; i < AvatarAppearance.TEXTURE_COUNT && i < textures.Count; i++)
+                    OSDArray wears = (OSDArray)tmpOSD;
+                    if(wears.Count + wears8Count > 0)
                     {
-                        UUID textureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE;
-                        if (textures[i] != null)
-                            textureID = textures[i].AsUUID();
-                        m_texture.CreateFace((uint)i).TextureID = new UUID(textureID);
+                        m_wearables = new AvatarWearable[wears.Count + wears8Count];
+
+                        for (int i = 0; i < wears.Count; ++i)
+                            m_wearables[i] = new AvatarWearable((OSDArray)wears[i]);
+                        if (wears8Count > 0)
+                        {
+                            for (int i = 0; i < wears8Count; ++i)
+                                m_wearables[i + wears.Count] = new AvatarWearable((OSDArray)wears8[i]);
+                        }
                     }
                 }
-                else
+
+                if (data.TryGetValue("te8", out tmpOSD))
                 {
-                    m_log.Warn("[AVATAR APPEARANCE]: failed to unpack textures");
+                    byte[] teb = tmpOSD.AsBinary();
+                    Primitive.TextureEntry te = new Primitive.TextureEntry(teb, 0, teb.Length);
+                    m_texture = te;
+                }
+                else if (data.TryGetValue("textures", out tmpOSD) && (tmpOSD is OSDArray))
+                {
+                    OSDArray textures = (OSDArray)tmpOSD;
+                    for (int i = 0; i < textures.Count && i < TEXTURE_COUNT_PV7; ++i)
+                    {
+                        tmpOSD = textures[i];
+                        if (tmpOSD != null)
+                            m_texture.CreateFace((uint)i).TextureID = tmpOSD.AsUUID();
+                    }
                 }
 
-                if ((data != null) && (data["bakedcache"] != null) && (data["bakedcache"]).Type == OSDType.Array)
+                if (data.TryGetValue("bakedcache", out tmpOSD) && (tmpOSD is OSDArray))
                 {
-                    OSDArray bakedOSDArray = (OSDArray)(data["bakedcache"]);
-                    m_cacheitems = WearableCacheItem.BakedFromOSD(bakedOSDArray);
+                    OSDArray bakedOSDArray = (OSDArray)tmpOSD;
+                    m_cacheitems = WearableCacheItem.GetDefaultCacheItem();
+
+                    bakedOSDArray = (OSDArray)tmpOSD;
+                    foreach (OSDMap item in bakedOSDArray)
+                    {
+                        int idx = item["textureindex"].AsInteger();
+                        if (idx < 0 || idx >= m_cacheitems.Length)
+                            continue;
+                        m_cacheitems[idx].CacheId = item["cacheid"].AsUUID();
+                        m_cacheitems[idx].TextureID = item["textureid"].AsUUID();
+                        m_cacheitems[idx].TextureAsset = null;
+                    }
+
+                    if (data.TryGetValue("bc8", out tmpOSD) && (tmpOSD is OSDArray))
+                    {
+                        bakedOSDArray = (OSDArray)tmpOSD;
+                        foreach (OSDMap item in bakedOSDArray)
+                        {
+                            int idx = item["textureindex"].AsInteger();
+                            if (idx < 0 || idx >= m_cacheitems.Length)
+                                continue;
+                            m_cacheitems[idx].CacheId = item["cacheid"].AsUUID();
+                            m_cacheitems[idx].TextureID = item["textureid"].AsUUID();
+                            m_cacheitems[idx].TextureAsset = null;
+                        }
+                    }
                 }
 
                 // Visual Parameters
-                SetDefaultParams();
-                if ((data != null) && (data["visualparams"] != null))
+                if (data.TryGetValue("visualparams", out tmpOSD))
                 {
-                    if ((data["visualparams"].Type == OSDType.Binary) || (data["visualparams"].Type == OSDType.Array))
-                        m_visualparams = data["visualparams"].AsBinary();
+                    if (tmpOSD is OSDBinary || tmpOSD is OSDArray)
+                        m_visualparams = tmpOSD.AsBinary();
                 }
                 else
                 {
@@ -859,10 +996,9 @@ namespace OpenSim.Framework
                 }
 
                 // Attachments
-                m_attachments = new Dictionary<int, List<AvatarAttachment>>();
-                if ((data != null) && (data["attachments"] != null) && (data["attachments"]).Type == OSDType.Array)
+                if (data.TryGetValue("attachments", out tmpOSD) && tmpOSD is OSDArray)
                 {
-                    OSDArray attachs = (OSDArray)(data["attachments"]);
+                    OSDArray attachs = (OSDArray)tmpOSD;
                     for (int i = 0; i < attachs.Count; i++)
                     {
                         AvatarAttachment att = new AvatarAttachment((OSDMap)attachs[i]);
@@ -882,6 +1018,32 @@ namespace OpenSim.Framework
 
         #endregion
 
+        public bool CanTeleport(float version)
+        {
+            if (version >= 0.8)
+                return true;
+            if (m_wearables.Length <= MAXWEARABLE_PV7)
+                return true;
+            for(int i = MAXWEARABLE_PV7; i < m_wearables.Length; ++i)
+            {
+                if(m_wearables[i].Count > 0)
+                    return false;
+            }
+
+            // also check baked
+            for (int i = BAKES_COUNT_PV7; i < BAKE_INDICES.Length; i++)
+            {
+                int idx = BAKE_INDICES[i];
+                if (m_texture.FaceTextures[idx] == null)
+                    continue;
+                if (m_texture.FaceTextures[idx].TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE ||
+                        m_texture.FaceTextures[idx].TextureID == UUID.Zero)
+                    continue;
+                return false;
+            }
+            return true;
+        }
+
         #region VPElement
 
         /// <summary>

OpenSim/Framework/AvatarAttachment.cs

@@ -68,11 +68,18 @@ namespace OpenSim.Framework
 
         public void Unpack(OSDMap args)
         {
-            if (args["point"] != null)
-                AttachPoint = args["point"].AsInteger();
+            OSD tmpOSD;
+            if (args.TryGetValue("point", out tmpOSD))
+                AttachPoint = tmpOSD.AsInteger();
+            if (args.TryGetValue("item", out tmpOSD))
+                ItemID = tmpOSD.AsUUID();
+            else
+                ItemID = UUID.Zero;
 
-            ItemID = (args["item"] != null) ? args["item"].AsUUID() : UUID.Zero;
-            AssetID = (args["asset"] != null) ? args["asset"].AsUUID() : UUID.Zero;
+            if (args.TryGetValue("asset", out tmpOSD))
+                AssetID = tmpOSD.AsUUID();
+            else
+                AssetID = UUID.Zero;
         }
     }
 }

OpenSim/Framework/AvatarWearable.cs

@@ -67,10 +67,14 @@ namespace OpenSim.Framework
 
         public static readonly int ALPHA = 13;
         public static readonly int TATTOO = 14;
-
         public static readonly int LEGACY_VERSION_MAX_WEARABLES = 15;
-//        public static readonly int PHYSICS = 15;
-//        public static int MAX_WEARABLES = 16;
+
+        public static readonly int PHYSICS = 15;
+
+        public static int MAX_WEARABLES_PV7 = 16;
+
+        public static readonly int UNIVERSAL = 16;
+        public static int MAX_WEARABLES = 17;
 
 
         public static readonly UUID DEFAULT_BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
@@ -91,11 +95,11 @@ namespace OpenSim.Framework
         public static readonly UUID DEFAULT_PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111");
         public static readonly UUID DEFAULT_PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120");
 
-//        public static readonly UUID DEFAULT_ALPHA_ITEM = new UUID("bfb9923c-4838-4d2d-bf07-608c5b1165c8");
-//        public static readonly UUID DEFAULT_ALPHA_ASSET = new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594");
+        public static readonly UUID DEFAULT_ALPHA_ITEM = new UUID("bfb9923c-4838-4d2d-bf07-608c5b1165c8");
+        public static readonly UUID DEFAULT_ALPHA_ASSET = new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594");
 
-//        public static readonly UUID DEFAULT_TATTOO_ITEM = new UUID("c47e22bd-3021-4ba4-82aa-2b5cb34d35e1");
-//        public static readonly UUID DEFAULT_TATTOO_ASSET = new UUID("00000000-0000-2222-3333-100000001007");
+        public static readonly UUID DEFAULT_TATTOO_ITEM = new UUID("c47e22bd-3021-4ba4-82aa-2b5cb34d35e1");
+        public static readonly UUID DEFAULT_TATTOO_ASSET = new UUID("00000000-0000-2222-3333-100000001007");
 
         protected Dictionary<UUID, UUID> m_items = new Dictionary<UUID, UUID>();
         protected List<UUID> m_ids = new List<UUID>();
@@ -132,10 +136,12 @@ namespace OpenSim.Framework
         public void Unpack(OSDArray args)
         {
             Clear();
-
+            OSD tmpOSDA, tmpOSDB;
             foreach (OSDMap weardata in args)
             {
-                Add(weardata["item"].AsUUID(), weardata["asset"].AsUUID());
+                tmpOSDA = weardata["item"];
+                tmpOSDB = weardata["asset"];
+                Add(tmpOSDA.AsUUID(), tmpOSDB.AsUUID());
             }
         }
 

OpenSim/Framework/BlockingQueue.cs

@@ -1,148 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Collections.Generic;
-using System.Threading;
-
-namespace OpenSim.Framework
-{
-    public class BlockingQueue<T>
-    {
-        private readonly Queue<T> m_pqueue = new Queue<T>();
-        private readonly Queue<T> m_queue = new Queue<T>();
-        private readonly object m_queueSync = new object();
-
-        public void PriorityEnqueue(T value)
-        {
-            lock (m_queueSync)
-            {
-                m_pqueue.Enqueue(value);
-                Monitor.Pulse(m_queueSync);
-            }
-        }
-
-        public void Enqueue(T value)
-        {
-            lock (m_queueSync)
-            {
-                m_queue.Enqueue(value);
-                Monitor.Pulse(m_queueSync);
-            }
-        }
-
-        public T Dequeue()
-        {
-            lock (m_queueSync)
-            {
-                while (m_queue.Count < 1 && m_pqueue.Count < 1)
-                {
-                    Monitor.Wait(m_queueSync);
-                }
-
-                if (m_pqueue.Count > 0)
-                    return m_pqueue.Dequeue();
-
-                if (m_queue.Count > 0)
-                    return m_queue.Dequeue();
-                return default(T);
-            }
-        }
-
-        public T Dequeue(int msTimeout)
-        {
-            lock (m_queueSync)
-            {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
-                {
-                    if(!Monitor.Wait(m_queueSync, msTimeout))
-                        return default(T);
-                }
-
-                if (m_pqueue.Count > 0)
-                    return m_pqueue.Dequeue();
-                if (m_queue.Count > 0)
-                    return m_queue.Dequeue();
-                return default(T);
-            }
-        }
-
-        /// <summary>
-        /// Indicate whether this queue contains the given item.
-        /// </summary>
-        /// <remarks>
-        /// This method is not thread-safe.  Do not rely on the result without consistent external locking.
-        /// </remarks>
-        public bool Contains(T item)
-        {
-            lock (m_queueSync)
-            {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
-                    return false;
-
-                if (m_pqueue.Contains(item))
-                    return true;
-                return m_queue.Contains(item);
-            }
-        }
-
-        /// <summary>
-        /// Return a count of the number of requests on this queue.
-        /// </summary>
-        public int Count()
-        {
-            lock (m_queueSync)
-                return m_queue.Count + m_pqueue.Count;
-        }
-
-        /// <summary>
-        /// Return the array of items on this queue.
-        /// </summary>
-        /// <remarks>
-        /// This method is not thread-safe.  Do not rely on the result without consistent external locking.
-        /// </remarks>
-        public T[] GetQueueArray()
-        {
-            lock (m_queueSync)
-            {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
-                    return new T[0];
-
-                return m_queue.ToArray();
-            }
-        }
-
-        public void Clear()
-        {
-            lock (m_queueSync)
-            {
-                m_pqueue.Clear();
-                m_queue.Clear();
-                Monitor.Pulse(m_queueSync);
-            }
-        }
-    }
-}

OpenSim/Framework/ChatTypeEnum.cs

@@ -38,6 +38,7 @@ namespace OpenSim.Framework
         DebugChannel = 6,
         Region = 7,
         Owner = 8,
+        Direct = 9, //llRegionSayTo
         Broadcast = 0xFF
     }
 }

OpenSim/Framework/ChildAgentDataUpdate.cs

@@ -398,7 +398,8 @@ namespace OpenSim.Framework
         // Scripted
         public ControllerData[] Controllers;
 
-        public string CallbackURI;
+        public string CallbackURI; // to remove
+        public string NewCallbackURI;
 
         // These two must have the same Count
         public List<ISceneObject> AttachmentObjects;
@@ -528,6 +529,9 @@ namespace OpenSim.Framework
             if ((CallbackURI != null) && (!CallbackURI.Equals("")))
                 args["callback_uri"] = OSD.FromString(CallbackURI);
 
+            if ((NewCallbackURI != null) && (!NewCallbackURI.Equals("")))
+                args["cb_uri"] = OSD.FromString(NewCallbackURI);
+
             // Attachment objects for fatpack messages
             if (AttachmentObjects != null)
             {
@@ -567,145 +571,141 @@ namespace OpenSim.Framework
         public virtual void Unpack(OSDMap args, IScene scene, EntityTransferContext ctx)
         {
             //m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Unpack data");
+            OSD tmp;
+            if (args.TryGetValue("region_id", out tmp) && tmp != null)
+                UUID.TryParse(tmp.AsString(), out RegionID);
 
-            if (args.ContainsKey("region_id"))
-                UUID.TryParse(args["region_id"].AsString(), out RegionID);
+            if (args.TryGetValue("circuit_code", out tmp) && tmp != null)
+                UInt32.TryParse(tmp.AsString(), out CircuitCode);
 
-            if (args["circuit_code"] != null)
-                UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode);
+            if (args.TryGetValue("agent_uuid", out tmp) && tmp != null)
+                AgentID = tmp.AsUUID();
 
-            if (args["agent_uuid"] != null)
-                AgentID = args["agent_uuid"].AsUUID();
+            if (args.TryGetValue("session_uuid", out tmp) && tmp != null)
+                SessionID = tmp.AsUUID();
 
-            if (args["session_uuid"] != null)
-                SessionID = args["session_uuid"].AsUUID();
+            if (args.TryGetValue("position", out tmp) && tmp != null)
+                Vector3.TryParse(tmp.AsString(), out Position);
 
-            if (args["position"] != null)
-                Vector3.TryParse(args["position"].AsString(), out Position);
+            if (args.TryGetValue("velocity", out tmp) && tmp != null)
+                Vector3.TryParse(tmp.AsString(), out Velocity);
 
-            if (args["velocity"] != null)
-                Vector3.TryParse(args["velocity"].AsString(), out Velocity);
+            if (args.TryGetValue("center", out tmp) && tmp != null)
+                Vector3.TryParse(tmp.AsString(), out Center);
 
-            if (args["center"] != null)
-                Vector3.TryParse(args["center"].AsString(), out Center);
+            if (args.TryGetValue("size", out tmp) && tmp != null)
+                Vector3.TryParse(tmp.AsString(), out Size);
 
-            if (args["size"] != null)
-                Vector3.TryParse(args["size"].AsString(), out Size);
+            if (args.TryGetValue("at_axis", out tmp) && tmp != null)
+                Vector3.TryParse(tmp.AsString(), out AtAxis);
 
-            if (args["at_axis"] != null)
-                Vector3.TryParse(args["at_axis"].AsString(), out AtAxis);
+            if (args.TryGetValue("left_axis", out tmp) && tmp != null)
+                Vector3.TryParse(tmp.AsString(), out AtAxis);
 
-            if (args["left_axis"] != null)
-                Vector3.TryParse(args["left_axis"].AsString(), out AtAxis);
+            if (args.TryGetValue("up_axis", out tmp) && tmp != null)
+                Vector3.TryParse(tmp.AsString(), out AtAxis);
 
-            if (args["up_axis"] != null)
-                Vector3.TryParse(args["up_axis"].AsString(), out AtAxis);
+            if (args.TryGetValue("wait_for_root", out tmp) && tmp != null)
+                SenderWantsToWaitForRoot = tmp.AsBoolean();
 
-            if (args.ContainsKey("wait_for_root") && args["wait_for_root"] != null)
-                SenderWantsToWaitForRoot = args["wait_for_root"].AsBoolean();
+            if (args.TryGetValue("far", out tmp) && tmp != null)
+                Far = (float)(tmp.AsReal());
 
-            if (args["far"] != null)
-                Far = (float)(args["far"].AsReal());
+            if (args.TryGetValue("aspect", out tmp) && tmp != null)
+                Aspect = (float)tmp.AsReal();
 
-            if (args["aspect"] != null)
-                Aspect = (float)args["aspect"].AsReal();
+            if (args.TryGetValue("throttles", out tmp) && tmp != null)
+                Throttles = tmp.AsBinary();
 
-            if (args["throttles"] != null)
-                Throttles = args["throttles"].AsBinary();
+            if (args.TryGetValue("locomotion_state", out tmp) && tmp != null)
+                UInt32.TryParse(tmp.AsString(), out LocomotionState);
 
-            if (args["locomotion_state"] != null)
-                UInt32.TryParse(args["locomotion_state"].AsString(), out LocomotionState);
+            if (args.TryGetValue("head_rotation", out tmp) && tmp != null)
+                Quaternion.TryParse(tmp.AsString(), out HeadRotation);
 
-            if (args["head_rotation"] != null)
-                Quaternion.TryParse(args["head_rotation"].AsString(), out HeadRotation);
+            if (args.TryGetValue("body_rotation", out tmp) && tmp != null)
+                Quaternion.TryParse(tmp.AsString(), out BodyRotation);
 
-            if (args["body_rotation"] != null)
-                Quaternion.TryParse(args["body_rotation"].AsString(), out BodyRotation);
+            if (args.TryGetValue("control_flags", out tmp) && tmp != null)
+                UInt32.TryParse(tmp.AsString(), out ControlFlags);
 
-            if (args["control_flags"] != null)
-                UInt32.TryParse(args["control_flags"].AsString(), out ControlFlags);
+            if (args.TryGetValue("energy_level", out tmp) && tmp != null)
+                EnergyLevel = (float)(tmp.AsReal());
 
-            if (args["energy_level"] != null)
-                EnergyLevel = (float)(args["energy_level"].AsReal());
+            if (args.TryGetValue("god_data", out tmp) && tmp != null)
+                GodData = tmp;
 
-            //if (args["god_level"] != null)
-            //    Byte.TryParse(args["god_level"].AsString(), out GodLevel);
+            if (args.TryGetValue("always_run", out tmp) && tmp != null)
+                AlwaysRun = tmp.AsBoolean();
 
-            if (args.ContainsKey("god_data") && args["god_data"] != null)
-                GodData = args["god_data"];
+            if (args.TryGetValue("prey_agent", out tmp) && tmp != null)
+                PreyAgent = tmp.AsUUID();
 
-            if (args["always_run"] != null)
-                AlwaysRun = args["always_run"].AsBoolean();
+            if (args.TryGetValue("agent_access", out tmp) && tmp != null)
+                Byte.TryParse(tmp.AsString(), out AgentAccess);
 
-            if (args["prey_agent"] != null)
-                PreyAgent = args["prey_agent"].AsUUID();
+            if (args.TryGetValue("agent_cof", out tmp) && tmp != null)
+                agentCOF = tmp.AsUUID();
 
-            if (args["agent_access"] != null)
-                Byte.TryParse(args["agent_access"].AsString(), out AgentAccess);
-
-            if (args.ContainsKey("agent_cof") && args["agent_cof"] != null)
-                agentCOF = args["agent_cof"].AsUUID();
-
-            if (args.ContainsKey("crossingflags") && args["crossingflags"] != null)
-                CrossingFlags = (byte)args["crossingflags"].AsInteger();
+            if (args.TryGetValue("crossingflags", out tmp) && tmp != null)
+                CrossingFlags = (byte)tmp.AsInteger();
 
             if(CrossingFlags != 0)
             {
-                if (args.ContainsKey("crossExtraFlags") && args["crossExtraFlags"] != null)
-                    CrossExtraFlags = (byte)args["crossExtraFlags"].AsInteger();
+                if (args.TryGetValue("crossExtraFlags", out tmp) && tmp != null)
+                    CrossExtraFlags = (byte)tmp.AsInteger();
             }
 
-            if (args.ContainsKey("active_group_id") && args["active_group_id"] != null)
-                ActiveGroupID = args["active_group_id"].AsUUID();
+            if (args.TryGetValue("active_group_id", out tmp) && tmp != null)
+                ActiveGroupID = tmp.AsUUID();
 
-            if (args.ContainsKey("active_group_name") && args["active_group_name"] != null)
-                ActiveGroupName = args["active_group_name"].AsString();
+            if (args.TryGetValue("active_group_name", out tmp) && tmp != null)
+                ActiveGroupName = tmp.AsString();
 
-            if(args.ContainsKey("active_group_title") && args["active_group_title"] != null)
-                ActiveGroupTitle = args["active_group_title"].AsString();
+            if(args.TryGetValue("active_group_title", out tmp) && tmp != null)
+                ActiveGroupTitle = tmp.AsString();
 
-            if (args.ContainsKey("children_seeds") && (args["children_seeds"] != null) &&
-                            (args["children_seeds"].Type == OSDType.Array))
+            if (args.TryGetValue("children_seeds", out tmp) && tmp is OSDArray)
             {
-                OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]);
+                OSDArray childrenSeeds = (OSDArray)tmp;
                 ChildrenCapSeeds = new Dictionary<ulong, string>();
                 foreach (OSD o in childrenSeeds)
                 {
-                    if (o.Type == OSDType.Map)
+                    if (o is OSDMap)
                     {
                         ulong handle = 0;
                         string seed = "";
                         OSDMap pair = (OSDMap)o;
-                        if (pair["handle"] != null)
-                            if (!UInt64.TryParse(pair["handle"].AsString(), out handle))
+                        if (pair.TryGetValue("handle", out tmp))
+                            if (!UInt64.TryParse(tmp.AsString(), out handle))
                                 continue;
-                        if (pair["seed"] != null)
-                            seed = pair["seed"].AsString();
+                        if (pair.TryGetValue("seed", out tmp))
+                            seed = tmp.AsString();
                         if (!ChildrenCapSeeds.ContainsKey(handle))
                             ChildrenCapSeeds.Add(handle, seed);
                     }
                 }
             }
 
-            if ((args["animations"] != null) && (args["animations"]).Type == OSDType.Array)
+            if (args.TryGetValue("animations", out tmp) && tmp is OSDArray)
             {
-                OSDArray anims = (OSDArray)(args["animations"]);
+                OSDArray anims = (OSDArray)tmp;
                 Anims = new Animation[anims.Count];
                 int i = 0;
                 foreach (OSD o in anims)
                 {
-                    if (o.Type == OSDType.Map)
+                    if (o is OSDMap)
                     {
                         Anims[i++] = new Animation((OSDMap)o);
                     }
                 }
             }
 
-            if (args["default_animation"] != null)
+            if (args.TryGetValue("default_animation", out tmp) && tmp is OSDMap)
             {
                 try
                 {
-                    DefaultAnim = new Animation((OSDMap)args["default_animation"]);
+                    DefaultAnim = new Animation((OSDMap)tmp);
                 }
                 catch
                 {
@@ -713,11 +713,11 @@ namespace OpenSim.Framework
                 }
             }
 
-            if (args["animation_state"] != null)
+            if (args.TryGetValue("animation_state", out tmp) && tmp is OSDMap)
             {
                 try
                 {
-                    AnimState = new Animation((OSDMap)args["animation_state"]);
+                    AnimState = new Animation((OSDMap)tmp);
                 }
                 catch
                 {
@@ -727,9 +727,9 @@ namespace OpenSim.Framework
 
             MovementAnimationOverRides.Clear();
 
-            if (args["movementAO"] != null && args["movementAO"].Type == OSDType.Array)
+            if (args.TryGetValue("movementAO", out tmp) && tmp is OSDArray)
             {
-                OSDArray AOs = (OSDArray)(args["movementAO"]);
+                OSDArray AOs = (OSDArray)tmp;
                 int count = AOs.Count;
 
                 for (int i = 0; i < count; i++)
@@ -744,8 +744,8 @@ namespace OpenSim.Framework
                 }
             }
 
-            if (args.ContainsKey("motion_state"))
-                MotionState = (byte)args["motion_state"].AsInteger();
+            if (args.TryGetValue("motion_state", out tmp) && tmp != null)
+                MotionState = (byte)tmp.AsInteger();
 
             //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
             //{
@@ -758,10 +758,10 @@ namespace OpenSim.Framework
 
 
             // packed_appearence should contain all appearance information
-            if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map)
+            if (args.TryGetValue("packed_appearance", out tmp) && tmp is OSDMap)
             {
                 m_log.WarnFormat("[CHILDAGENTDATAUPDATE] got packed appearance");
-                Appearance = new AvatarAppearance((OSDMap)args["packed_appearance"]);
+                Appearance = new AvatarAppearance((OSDMap)tmp);
             }
             else
             {
@@ -773,19 +773,19 @@ namespace OpenSim.Framework
                 // The code to unpack textures, visuals, wearables and attachments
                 // should be removed; packed appearance contains the full appearance
                 // This is retained for backward compatibility only
-                if (args["texture_entry"] != null)
+                if (args.TryGetValue("texture_entry", out tmp) && tmp != null)
                 {
-                    byte[] rawtextures = args["texture_entry"].AsBinary();
+                    byte[] rawtextures = tmp.AsBinary();
                     Primitive.TextureEntry textures = new Primitive.TextureEntry(rawtextures, 0, rawtextures.Length);
                     Appearance.SetTextureEntries(textures);
                 }
 
-                if (args["visual_params"] != null)
-                    Appearance.SetVisualParams(args["visual_params"].AsBinary());
+                if (args.TryGetValue("visual_params", out tmp) && tmp != null)
+                    Appearance.SetVisualParams(tmp.AsBinary());
 
-                if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array)
+                if (args.TryGetValue("wearables", out tmp) && tmp is OSDArray)
                 {
-                    OSDArray wears = (OSDArray)(args["wearables"]);
+                    OSDArray wears = (OSDArray)tmp;
 
                     for (int i = 0; i < wears.Count / 2; i++)
                     {
@@ -794,12 +794,12 @@ namespace OpenSim.Framework
                     }
                 }
 
-                if ((args["attachments"] != null) && (args["attachments"]).Type == OSDType.Array)
+                if (args.TryGetValue("attachments", out tmp) && tmp is OSDArray)
                 {
-                    OSDArray attachs = (OSDArray)(args["attachments"]);
+                    OSDArray attachs = (OSDArray)tmp;
                     foreach (OSD o in attachs)
                     {
-                        if (o.Type == OSDType.Map)
+                        if (o is OSDMap)
                         {
                             // We know all of these must end up as attachments so we
                             // append rather than replace to ensure multiple attachments
@@ -811,38 +811,36 @@ namespace OpenSim.Framework
                 }
                 // end of code to remove
             }
-/* moved above
-            if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map)
-                Appearance = new AvatarAppearance((OSDMap)args["packed_appearance"]);
-            else
-                m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance");
-*/
-            if ((args["controllers"] != null) && (args["controllers"]).Type == OSDType.Array)
+
+            if (args.TryGetValue("controllers", out tmp) && tmp is OSDArray)
             {
-                OSDArray controls = (OSDArray)(args["controllers"]);
+                OSDArray controls = (OSDArray)tmp;
                 Controllers = new ControllerData[controls.Count];
                 int i = 0;
                 foreach (OSD o in controls)
                 {
-                    if (o.Type == OSDType.Map)
+                    if (o is OSDMap)
                     {
                         Controllers[i++] = new ControllerData((OSDMap)o);
                     }
                 }
             }
 
-            if (args["callback_uri"] != null)
-                CallbackURI = args["callback_uri"].AsString();
+            if (args.TryGetValue("callback_uri", out tmp) && tmp != null)
+                CallbackURI = tmp.AsString();
+
+            if (args.TryGetValue("cb_uri", out tmp) && tmp != null)
+                NewCallbackURI = tmp.AsString();
 
             // Attachment objects
-            if (args["attach_objects"] != null && args["attach_objects"].Type == OSDType.Array)
+            if (args.TryGetValue("attach_objects", out tmp) && tmp is OSDArray)
             {
-                OSDArray attObjs = (OSDArray)(args["attach_objects"]);
+                OSDArray attObjs = (OSDArray)tmp;
                 AttachmentObjects = new List<ISceneObject>();
                 AttachmentObjectStates = new List<string>();
                 foreach (OSD o in attObjs)
                 {
-                    if (o.Type == OSDType.Map)
+                    if (o is OSDMap)
                     {
                         OSDMap info = (OSDMap)o;
                         ISceneObject so = scene.DeserializeObject(info["sog"].AsString());
@@ -854,10 +852,10 @@ namespace OpenSim.Framework
                 }
             }
 
-            if (args["parent_part"] != null)
-                ParentPart = args["parent_part"].AsUUID();
-            if (args["sit_offset"] != null)
-                Vector3.TryParse(args["sit_offset"].AsString(), out SitOffset);
+            if (args.TryGetValue("parent_part", out tmp) && tmp != null)
+                ParentPart = tmp.AsUUID();
+            if (args.TryGetValue("sit_offset", out tmp) && tmp != null)
+                Vector3.TryParse(tmp.AsString(), out SitOffset);
         }
 
         public AgentData()

OpenSim/Framework/ClientManager.cs

@@ -51,7 +51,14 @@ namespace OpenSim.Framework
         private object m_syncRoot = new object();
 
         /// <summary>Number of clients in the collection</summary>
-        public int Count { get { return m_dict1.Count; } }
+        public int Count
+        {
+            get
+            {
+                lock (m_syncRoot) 
+                    return m_dict1.Count;
+            }
+        }
 
         /// <summary>
         /// Default constructor
@@ -60,7 +67,7 @@ namespace OpenSim.Framework
         {
             m_dict1 = new Dictionary<UUID, IClientAPI>();
             m_dict2 = new Dictionary<IPEndPoint, IClientAPI>();
-            m_array = new IClientAPI[0];
+            m_array = null;
         }
 
         /// <summary>
@@ -74,17 +81,9 @@ namespace OpenSim.Framework
         {
             lock (m_syncRoot)
             {
-                // allow self healing
-//                if (m_dict1.ContainsKey(value.AgentId) || m_dict2.ContainsKey(value.RemoteEndPoint))
-//                    return false;
-
                 m_dict1[value.AgentId] = value;
                 m_dict2[value.RemoteEndPoint] = value;
-
-                // dict1 is the master
-                IClientAPI[] newArray = new IClientAPI[m_dict1.Count];
-                m_dict1.Values.CopyTo(newArray, 0);
-                m_array = newArray;
+                m_array = null;
             }
 
             return true;
@@ -105,10 +104,7 @@ namespace OpenSim.Framework
                 {
                     m_dict1.Remove(key);
                     m_dict2.Remove(value.RemoteEndPoint);
-
-                    IClientAPI[] newArray = new IClientAPI[m_dict1.Count];
-                    m_dict1.Values.CopyTo(newArray, 0);
-                    m_array = newArray;
+                    m_array = null;
                     return true;
                 }
             }
@@ -124,7 +120,7 @@ namespace OpenSim.Framework
             {
                 m_dict1.Clear();
                 m_dict2.Clear();
-                m_array = new IClientAPI[0];
+                m_array = null;
             }
         }
 
@@ -135,7 +131,8 @@ namespace OpenSim.Framework
         /// <returns>True if the UUID was found in the collection, otherwise false</returns>
         public bool ContainsKey(UUID key)
         {
-            return m_dict1.ContainsKey(key);
+            lock (m_syncRoot)
+                return m_dict1.ContainsKey(key);
         }
 
         /// <summary>
@@ -145,7 +142,8 @@ namespace OpenSim.Framework
         /// <returns>True if the endpoint was found in the collection, otherwise false</returns>
         public bool ContainsKey(IPEndPoint key)
         {
-            return m_dict2.ContainsKey(key);
+            lock (m_syncRoot)
+                return m_dict2.ContainsKey(key);
         }
 
         /// <summary>
@@ -156,8 +154,12 @@ namespace OpenSim.Framework
         /// <returns>True if the lookup succeeded, otherwise false</returns>
         public bool TryGetValue(UUID key, out IClientAPI value)
         {
-            try { return m_dict1.TryGetValue(key, out value); }
-            catch (Exception)
+            try
+            {
+                lock (m_syncRoot)
+                    return m_dict1.TryGetValue(key, out value);
+            }
+            catch
             {
                 value = null;
                 return false;
@@ -172,8 +174,12 @@ namespace OpenSim.Framework
         /// <returns>True if the lookup succeeded, otherwise false</returns>
         public bool TryGetValue(IPEndPoint key, out IClientAPI value)
         {
-            try { return m_dict2.TryGetValue(key, out value); }
-            catch (Exception)
+            try
+            {
+                lock (m_syncRoot)
+                    return m_dict2.TryGetValue(key, out value);
+            }
+            catch
             {
                 value = null;
                 return false;
@@ -187,7 +193,20 @@ namespace OpenSim.Framework
         /// <param name="action">Action to perform on each element</param>
         public void ForEach(Action<IClientAPI> action)
         {
-            IClientAPI[] localArray = m_array;
+            IClientAPI[] localArray;
+            lock (m_syncRoot)
+            {
+                if (m_array == null)
+                {
+                    if (m_dict1.Count == 0)
+                        return;
+
+                    m_array = new IClientAPI[m_dict1.Count];
+                    m_dict1.Values.CopyTo(m_array, 0);
+                }
+                localArray = m_array;
+            }
+
             for (int i = 0; i < localArray.Length; i++)
                 action(localArray[i]);
         }

OpenSim/Framework/ConfigurationMember.cs

@@ -262,14 +262,14 @@ namespace OpenSim.Framework
                                 if (configurationDescription.Trim() != String.Empty)
                                 {
                                     console_result =
-                                        MainConsole.Instance.CmdPrompt(
+                                        MainConsole.Instance.Prompt(
                                             configurationDescription + ": " + configOption.configurationQuestion,
                                             configOption.configurationDefault);
                                 }
                                 else
                                 {
                                     console_result =
-                                        MainConsole.Instance.CmdPrompt(configOption.configurationQuestion,
+                                        MainConsole.Instance.Prompt(configOption.configurationQuestion,
                                                                        configOption.configurationDefault);
                                 }
                             }

OpenSim/Framework/Console/CommandConsole.cs

@@ -36,6 +36,7 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using log4net;
 using OpenSim.Framework;
+using Nini.Config;
 
 namespace OpenSim.Framework.Console
 {
@@ -789,5 +790,9 @@ namespace OpenSim.Framework.Console
             }
             return cmdinput;
         }
+
+        public virtual void ReadConfig(IConfigSource configSource)
+        {
+        }
     }
 }

OpenSim/Framework/Console/ConsoleBase.cs

@@ -35,13 +35,39 @@ using log4net;
 
 namespace OpenSim.Framework.Console
 {
-    public class ConsoleBase
+    public class ConsoleLevel
+    {
+        public string m_string;
+
+        ConsoleLevel(string v)
+        {
+            m_string = v;
+        }
+
+        static public implicit operator ConsoleLevel(string s)
+        {
+            return new ConsoleLevel(s);
+        }
+
+        public static string ToString(ConsoleLevel s)
+        {
+            return s.m_string;
+        }
+
+        public override string ToString()
+        {
+            return m_string;
+        }
+    }
+
+
+    public class ConsoleBase : IConsole
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected string prompt = "# ";
 
-        public object ConsoleScene { get; set; }
+        public IScene ConsoleScene { get; set; }
 
         public string DefaultPrompt { get; set; }
 
@@ -58,27 +84,47 @@ namespace OpenSim.Framework.Console
         {
         }
 
-        public virtual void Output(string text, string level)
+        public virtual void Output(string format)
         {
-            Output(text);
+            System.Console.WriteLine(format);
         }
 
-        public virtual void Output(string text)
+        public virtual void Output(string format, params object[] components)
         {
+            string level = null;
+            if (components != null && components.Length > 0)
+            {
+                if (components[0] == null || components[0] is ConsoleLevel)
+                {
+                    if (components[0] is ConsoleLevel)
+                        level = ((ConsoleLevel)components[0]).ToString();
+
+                    if (components.Length > 1)
+                    {
+                        object[] tmp = new object[components.Length - 1];
+                        Array.Copy(components, 1, tmp, 0, components.Length - 1);
+                        components = tmp;
+                    }
+                    else
+                        components = null;
+                }
+
+            }
+            string text;
+            if (components == null || components.Length == 0)
+                text = format;
+            else
+                text = String.Format(format, components);
+
             System.Console.WriteLine(text);
         }
 
-        public virtual void OutputFormat(string format, params object[] components)
-        {
-            Output(string.Format(format, components));
-        }
-
-        public string CmdPrompt(string p)
+        public string Prompt(string p)
         {
             return ReadLine(String.Format("{0}: ", p), false, true);
         }
 
-        public string CmdPrompt(string p, string def)
+        public string Prompt(string p, string def)
         {
             string ret = ReadLine(String.Format("{0} [{1}]: ", p, def), false, true);
             if (ret == String.Empty)
@@ -87,14 +133,14 @@ namespace OpenSim.Framework.Console
             return ret;
         }
 
-        public string CmdPrompt(string p, List<char> excludedCharacters)
+        public string Prompt(string p, List<char> excludedCharacters)
         {
             bool itisdone = false;
             string ret = String.Empty;
             while (!itisdone)
             {
                 itisdone = true;
-                ret = CmdPrompt(p);
+                ret = Prompt(p);
 
                 foreach (char c in excludedCharacters)
                 {
@@ -109,27 +155,34 @@ namespace OpenSim.Framework.Console
             return ret;
         }
 
-        public string CmdPrompt(string p, string def, List<char> excludedCharacters)
+        public virtual string Prompt(string p, string def, List<char> excludedCharacters, bool echo = true)
         {
             bool itisdone = false;
             string ret = String.Empty;
             while (!itisdone)
             {
                 itisdone = true;
-                ret = CmdPrompt(p, def);
 
-                if (ret == String.Empty)
+                if (def == null)
+                    ret = ReadLine(String.Format("{0}: ", p), false, echo);
+                else
+                    ret = ReadLine(String.Format("{0} [{1}]: ", p, def), false, echo);
+
+                if (ret == String.Empty && def != null)
                 {
                     ret = def;
                 }
                 else
                 {
-                    foreach (char c in excludedCharacters)
+                    if (excludedCharacters != null)
                     {
-                        if (ret.Contains(c.ToString()))
+                        foreach (char c in excludedCharacters)
                         {
-                            System.Console.WriteLine("The character \"" + c.ToString() + "\" is not permitted.");
-                            itisdone = false;
+                            if (ret.Contains(c.ToString()))
+                            {
+                                System.Console.WriteLine("The character \"" + c.ToString() + "\" is not permitted.");
+                                itisdone = false;
+                            }
                         }
                     }
                 }
@@ -139,14 +192,14 @@ namespace OpenSim.Framework.Console
         }
 
         // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
-        public string CmdPrompt(string prompt, string defaultresponse, List<string> options)
+        public virtual string Prompt(string prompt, string defaultresponse, List<string> options)
         {
             bool itisdone = false;
             string optstr = String.Empty;
             foreach (string s in options)
                 optstr += " " + s;
 
-            string temp = CmdPrompt(prompt, defaultresponse);
+            string temp = Prompt(prompt, defaultresponse);
             while (itisdone == false)
             {
                 if (options.Contains(temp))
@@ -156,19 +209,12 @@ namespace OpenSim.Framework.Console
                 else
                 {
                     System.Console.WriteLine("Valid options are" + optstr);
-                    temp = CmdPrompt(prompt, defaultresponse);
+                    temp = Prompt(prompt, defaultresponse);
                 }
             }
             return temp;
         }
 
-        // Displays a prompt and waits for the user to enter a string, then returns that string
-        // (Done with no echo and suitable for passwords)
-        public string PasswdPrompt(string p)
-        {
-            return ReadLine(String.Format("{0}: ", p), false, false);
-        }
-
         public virtual string ReadLine(string p, bool isCommand, bool e)
         {
             System.Console.Write("{0}", p);

OpenSim/Framework/Console/ConsoleUtil.cs

@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Console
         {
             if (File.Exists(path))
             {
-                console.OutputFormat("File {0} already exists.  Please move or remove it.", path);
+                console.Output("File {0} already exists.  Please move or remove it.", path);
                 return false;
             }
 
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Console
             if (!UUID.TryParse(rawUuid, out uuid))
             {
                 if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid uuid", rawUuid);
+                    console.Output("ERROR: {0} is not a valid uuid", rawUuid);
 
                 return false;
             }
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Console
             if (!uint.TryParse(rawLocalId, out localId))
             {
                 if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid local id", localId);
+                    console.Output("ERROR: {0} is not a valid local id", localId);
 
                 return false;
             }
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.Console
             if (localId == 0)
             {
                 if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid local id - it must be greater than 0", localId);
+                    console.Output("ERROR: {0} is not a valid local id - it must be greater than 0", localId);
 
                 return false;
             }
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Console
             }
 
             if (console != null)
-                console.OutputFormat("ERROR: {0} is not a valid UUID or local id", rawId);
+                console.Output("ERROR: {0} is not a valid UUID or local id", rawId);
 
             return false;
         }
@@ -167,7 +167,7 @@ namespace OpenSim.Framework.Console
             if (!bool.TryParse(rawConsoleString, out b))
             {
                 if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a true or false value", rawConsoleString);
+                    console.Output("ERROR: {0} is not a true or false value", rawConsoleString);
 
                 return false;
             }
@@ -187,7 +187,7 @@ namespace OpenSim.Framework.Console
             if (!int.TryParse(rawConsoleInt, out i))
             {
                 if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid integer", rawConsoleInt);
+                    console.Output("ERROR: {0} is not a valid integer", rawConsoleInt);
 
                 return false;
             }
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.Console
             if (!float.TryParse(rawConsoleInput, out i))
             {
                 if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid float", rawConsoleInput);
+                    console.Output("ERROR: {0} is not a valid float", rawConsoleInput);
 
                 return false;
             }
@@ -227,7 +227,7 @@ namespace OpenSim.Framework.Console
             if (!double.TryParse(rawConsoleInput, out i))
             {
                 if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid double", rawConsoleInput);
+                    console.Output("ERROR: {0} is not a valid double", rawConsoleInput);
 
                 return false;
             }
@@ -249,7 +249,7 @@ namespace OpenSim.Framework.Console
                 if (i < 0)
                 {
                     if (console != null)
-                        console.OutputFormat("ERROR: {0} is not a positive integer", rawConsoleInt);
+                        console.Output("ERROR: {0} is not a positive integer", rawConsoleInt);
 
                     return false;
                 }

OpenSim/Framework/Console/LocalConsole.cs

@@ -46,6 +46,7 @@ namespace OpenSim.Framework.Console
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private string m_historyPath;
         private bool m_historyEnable;
+        private bool m_historytimestamps;
 
         // private readonly object m_syncRoot = new object();
         private const string LOGLEVEL_NONE = "(none)";
@@ -98,15 +99,30 @@ namespace OpenSim.Framework.Console
             string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", "OpenSimConsoleHistory.txt");
             int m_historySize = startupConfig.GetInt("ConsoleHistoryFileLines", 100);
             m_historyPath = Path.GetFullPath(Path.Combine(Util.configDir(), m_historyFile));
-            m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1}", m_historySize, m_historyPath);
+            m_historytimestamps = startupConfig.GetBoolean("ConsoleHistoryTimeStamp", false);
+            m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1} {2} timestamps",
+                m_historySize, m_historyPath, m_historytimestamps?"with":"without");
 
             if (File.Exists(m_historyPath))
             {
+                List<string> originallines = new List<string>();
                 using (StreamReader history_file = new StreamReader(m_historyPath))
                 {
                     string line;
                     while ((line = history_file.ReadLine()) != null)
                     {
+                        originallines.Add(line);
+                        if(line.StartsWith("["))
+                        {
+                            int indx = line.IndexOf("]:> ");
+                            if(indx > 0)
+                            {
+                                if(indx + 4 >= line.Length)
+                                    line = String.Empty;
+                                else
+                                   line = line.Substring(indx + 4);
+                            }
+                        }
                         m_history.Add(line);
                     }
                 }
@@ -114,11 +130,14 @@ namespace OpenSim.Framework.Console
                 if (m_history.Count > m_historySize)
                 {
                     while (m_history.Count > m_historySize)
+                    {
                         m_history.RemoveAt(0);
+                        originallines.RemoveAt(0);
+                    }
 
                     using (StreamWriter history_file = new StreamWriter(m_historyPath))
                     {
-                        foreach (string line in m_history)
+                        foreach (string line in originallines)
                         {
                             history_file.WriteLine(line);
                         }
@@ -141,6 +160,8 @@ namespace OpenSim.Framework.Console
             m_history.Add(text);
             if (m_historyEnable)
             {
+                if (m_historytimestamps)
+                    text = String.Format("[{0} {1}]:> {2}", DateTime.Now.ToShortDateString(), DateTime.Now.ToShortTimeString(), text);
                 File.AppendAllText(m_historyPath, text + Environment.NewLine);
             }
         }
@@ -338,7 +359,7 @@ namespace OpenSim.Framework.Console
         {
             string outText = text;
 
-            if (level != LOGLEVEL_NONE)
+            if (level != null)
             {
                 MatchCollection matches = m_categoryRegex.Matches(text);
 
@@ -368,13 +389,38 @@ namespace OpenSim.Framework.Console
             System.Console.WriteLine();
         }
 
-        public override void Output(string text)
+        public override void Output(string format)
         {
-            Output(text, LOGLEVEL_NONE);
+            Output(format, null);
         }
 
-        public override void Output(string text, string level)
+        public override void Output(string format, params object[] components)
         {
+            string level = null;
+            if(components != null && components.Length > 0)
+            {
+                if(components[0] == null || components[0] is ConsoleLevel)
+                {
+                    if(components[0] is ConsoleLevel)
+                        level = ((ConsoleLevel)components[0]).ToString();
+
+                    if (components.Length > 1)
+                    {
+                        object[] tmp = new object[components.Length - 1];
+                        Array.Copy(components, 1, tmp, 0, components.Length - 1);
+                        components = tmp;
+                    }
+                    else
+                        components = null;
+                }
+
+            }
+            string text;
+            if (components == null || components.Length == 0)
+                text = format;
+            else
+                text = String.Format(format, components);
+
             FireOnOutput(text);
 
             lock (m_commandLine)
@@ -382,7 +428,6 @@ namespace OpenSim.Framework.Console
                 if (m_cursorYPosition == -1)
                 {
                     WriteLocalText(text, level);
-
                     return;
                 }
 

OpenSim/Framework/Console/MockConsole.cs

@@ -30,6 +30,7 @@ using System.Threading;
 using System.Collections.Generic;
 using System.Text;
 using System.Xml;
+using Nini.Config;
 
 namespace OpenSim.Framework.Console
 {
@@ -56,23 +57,24 @@ namespace OpenSim.Framework.Console
 
         public string ReadLine(string p, bool isCommand, bool e) { return ""; }
 
-        public object ConsoleScene {
+        public IScene ConsoleScene {
             get { return null; }
             set {}
         }
 
-        public void Output(string text, string level) {}
-        public void Output(string text) {}
-        public void OutputFormat(string format, params object[] components) {}
+        public void Output(string format) { }
+        public void Output(string format, params object[] components) { }
 
-        public string CmdPrompt(string p) { return ""; }
-        public string CmdPrompt(string p, string def) { return ""; }
-        public string CmdPrompt(string p, List<char> excludedCharacters) { return ""; }
-        public string CmdPrompt(string p, string def, List<char> excludedCharacters) { return ""; }
+        public string Prompt(string p) { return ""; }
+        public string Prompt(string p, string def) { return ""; }
+        public string Prompt(string p, List<char> excludedCharacters) { return ""; }
+        public string Prompt(string p, string def, List<char> excludedCharacters, bool echo) { return ""; }
 
-        public string CmdPrompt(string prompt, string defaultresponse, List<string> options) { return ""; }
+        public string Prompt(string prompt, string defaultresponse, List<string> options) { return ""; }
 
         public string PasswdPrompt(string p) { return ""; }
+
+        public void ReadConfig(IConfigSource configSource) { }
     }
 
     public class MockCommands : ICommands

OpenSim/Framework/Console/OpenSimAppender.cs

@@ -55,12 +55,14 @@ namespace OpenSim.Framework.Console
             {
                 if (m_console != null)
                 {
-                    string level = "normal";
+                    ConsoleLevel level;
 
                     if (le.Level == Level.Error)
                         level = "error";
                     else if (le.Level == Level.Warn)
                         level = "warn";
+                    else
+                        level = "normal";
 
                     m_console.Output(loggingMessage, level);
                 }

OpenSim/Framework/Console/RemoteConsole.cs

@@ -46,6 +46,8 @@ namespace OpenSim.Framework.Console
     //
     public class RemoteConsole : CommandConsole
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         // Connection specific data, indexed by a session ID
         // we create when a client connects.
         protected class ConsoleConnection
@@ -153,7 +155,7 @@ namespace OpenSim.Framework.Console
             m_expireTimer.Start();
         }
 
-        public void ReadConfig(IConfigSource config)
+        public override void ReadConfig(IConfigSource config)
         {
             m_Config = config;
 
@@ -188,13 +190,46 @@ namespace OpenSim.Framework.Console
             m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand);
         }
 
-        public override void Output(string text, string level)
+        public override void Output(string format)
         {
+            Output(format, null);
+        }
+
+        public override void Output(string format, params object[] components)
+        {
+            string level = null;
+            if (components != null && components.Length > 0)
+            {
+                if (components[0] == null || components[0] is ConsoleLevel)
+                {
+                    if (components[0] is ConsoleLevel)
+                        level = ((ConsoleLevel)components[0]).ToString();
+
+                    if (components.Length > 1)
+                    {
+                        object[] tmp = new object[components.Length - 1];
+                        Array.Copy(components, 1, tmp, 0, components.Length - 1);
+                        components = tmp;
+                    }
+                    else
+                        components = null;
+                }
+            }
+
+            string text;
+            if (components == null || components.Length == 0)
+                text = format;
+            else
+                text = String.Format(format, components);
+
             Output(text, level, false, false, false);
         }
 
         protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput)
         {
+            if (level == null)
+                level = String.Empty;
+
             // Increment the line number. It was 0 and they start at 1
             // so we need to pre-increment.
             m_lineNumber++;
@@ -228,12 +263,6 @@ namespace OpenSim.Framework.Console
             System.Console.WriteLine(text.Trim());
         }
 
-        public override void Output(string text)
-        {
-            // Output plain (non-logging style) text.
-            Output(text, String.Empty, false, false, false);
-        }
-
         public override string ReadLine(string p, bool isCommand, bool e)
         {
             // Output the prompt an prepare to wait. This
@@ -400,10 +429,9 @@ namespace OpenSim.Framework.Console
             }
 
             // This call is a CAP. The URL is the authentication.
-            string uri = "/ReadResponses/" + sessionID.ToString() + "/";
+            string uri = "/ReadResponses/" + sessionID.ToString();
 
-            m_Server.AddPollServiceHTTPHandler(
-                uri, new PollServiceEventArgs(null, uri, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
+            m_Server.AddPollServiceHTTPHandler(new PollServiceEventArgs(null, uri, HasEvents, GetEvents, NoEvents, null, sessionID,25000)); // 25 secs timeout
 
             // Our reply is an XML document.
             // TODO: Change this to Linq.Xml
@@ -687,7 +715,6 @@ namespace OpenSim.Framework.Console
             result["int_response_code"] = 200;
             result["content_type"] = "application/xml";
             result["keepalive"] = false;
-            result["reusecontext"] = false;
             result = CheckOrigin(result);
 
             return result;
@@ -713,7 +740,6 @@ namespace OpenSim.Framework.Console
             result["int_response_code"] = 200;
             result["content_type"] = "text/xml";
             result["keepalive"] = false;
-            result["reusecontext"] = false;
             result = CheckOrigin(result);
 
             return result;

OpenSim/Framework/Constants.cs

@@ -25,18 +25,22 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 using System;
+using OpenMetaverse;
 
 namespace OpenSim.Framework
 {
     public class Constants
     {
+        public const int MaxAgentAttachments = 38;
+        public const int MaxAgentGroups = 60;
+
         // 'RegionSize' is the legacy region size.
         // DO NOT USE THIS FOR ANY NEW CODE. Use Scene.RegionInfo.RegionSize[XYZ] as a region might not
         //      be the legacy region size.
         public const uint RegionSize = 256;
         public const uint RegionHeight = 4096;
-        // This could be a parameters but, really, a region of greater than this is pretty unmanageable
-        public const uint MaximumRegionSize = 8192;
+
+        public const uint MaximumRegionSize = 4096;
 
         // Since terrain is stored in 16x16 heights, regions must be a multiple of this number and that is the minimum
         public const int MinRegionSize = 16;
@@ -44,6 +48,9 @@ namespace OpenSim.Framework
 
         public const string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f";
 
+        public static readonly UUID m_MrOpenSimID = new UUID("11111111-1111-0000-0000-000100bba000");
+        public static readonly DateTime m_MrOpenSimBorn = new DateTime(2007, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
         public enum EstateAccessCodex : uint
         {
             AllowedAccess = 1,
@@ -103,8 +110,8 @@ namespace OpenSim.Framework
             /// <summary>Finished, Same Sim</summary>
             FinishedViaSameSim = 1 << 29,
             /// <summary>Agent coming into the grid from another grid</summary>
-            ViaHGLogin = 1 << 30
+            ViaHGLogin = 1 << 30,
+            notViaHGLogin = 0xbffffff
         }
-
     }
 }