switch to 0.7.1.1 release version info

This might resolve http://opensimulator.org/mantis/view.php?id=5475

CONTRIBUTORS.txt

@@ -1,34 +1,36 @@
 The following people have contributed to OpenSim (Thank you 
 for your effort!)
 
-Add your name in here if you have committed to OpenSim
-
 = Current OpenSim Developers (in very rough order of appearance) =
 These folks represent the current core team for OpenSim, and are the
 people that make the day to day of OpenSim happen.
 
+* justincc
+* chi11ken (Genkii)
+* dahlia
+* Melanie Thielker
+* Diva (Crista Lopes, University of California, Irvine)
+* Dan Lake (Intel)
+* Marck
+* Mic Bowman (Intel)
+* BlueWall (James Hughes)
+
+= Core Developers Following the White Rabbit =
+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. 
+
 * MW (Tribal Media AB)
 * Adam Frisby 	(DeepThink Pty Ltd)
-* MingChen 	(DeepThink Pty Ltd)
 * lbsa71 (Tribal Media AB)
-* Sean Dague / sdague (IBM)
-* Tedd
-* justincc
 * Teravus (w3z)
-* Johan Berntsson (3Di)
 * Ckrinke (Charles Krinke)
-* chi11ken (Genkii)
-* adjohn (Genkii)
 * Dr Scofield aka Dirk Husemann (IBM Research - Zurich)
-* dahlia
 * mikem (3Di)
-* Melanie Thielker
 * Homer_Horwitz
-* idb (Ian Brown)
-* Diva (Crista Lopes, University of California, Irvine)
 * nlin (3Di)
 * Arthur Rodrigo S Valadares (IBM)
-* BlueWall (James Hughes)
+* John Hurliman
 
 = Past Open Sim Developers =
 These folks are alumns of the OpenSim core group, but are now
@@ -44,6 +46,12 @@ where we are today.
 * Dalien
 * Darok
 * Alondria
+* Sean Dague / sdague (IBM)
+* Tedd
+* MingChen 	(DeepThink Pty Ltd)
+* adjohn (Genkii)
+* idb (Ian Brown)
+* Johan Berntsson (3Di)
 
 
 = Additional OpenSim Contributors =
@@ -102,6 +110,7 @@ what it is today.
 * Misterblue (Intel)
 * Mircea Kitsune
 * mpallari
+* MrMonkE
 * nornalbion
 * Omar Vera Ustariz (IBM)
 * openlifegrid.com

OpenSim/Client/MXP/MXPModule.cs

@@ -1,131 +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.Reflection;
-using System.Text;
-using System.Timers;
-using log4net;
-using MXP;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Client.MXP.PacketHandler;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Client.MXP
-{
-
-    /**
-     * MXP Client Module which adds MXP support to client / region communication.
-     */
-    public class MXPModule : IRegionModule
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private MXPPacketServer m_server;
-
-        private IConfigSource m_config;
-        private int m_port = 1253;
-        private Timer m_ticker;
-
-        private readonly Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
-        private bool m_shutdown;
-
-        public void Initialise(Scene scene, IConfigSource source)
-        {
-            if (!m_scenes.ContainsKey(scene.RegionInfo.RegionID))
-                m_scenes.Add(scene.RegionInfo.RegionID, scene);
-
-            m_config = source;
-        }
-
-        public void PostInitialise()
-        {
-            if (m_config.Configs["MXP"] != null)
-            {
-                IConfig con = m_config.Configs["MXP"];
-
-                if (!con.GetBoolean("Enabled", false))
-                    return;
-
-                m_port = con.GetInt("Port", m_port);
-
-                m_server = new MXPPacketServer(m_port, m_scenes,m_config.Configs["StandAlone"].GetBoolean("accounts_authenticate",true));
-
-                m_ticker = new Timer(100);
-                m_ticker.AutoReset = false;
-                m_ticker.Elapsed += ticker_Elapsed;
-
-                lock (m_ticker)
-                    m_ticker.Start();
-
-                m_log.Info("[MXP ClientStack] MXP Enabled and Listening");
-            }
-        }
-
-        void ticker_Elapsed(object sender, ElapsedEventArgs e)
-        {
-            try
-            {
-                m_server.Process();
-            }
-            catch (Exception ex)
-            {
-                m_log.Error("[MXP ClientStack]: Unhandled exception in process loop: " + ex.ToString() + " :" + ex.StackTrace.ToString());
-            }
-
-            if (!m_shutdown)
-            {
-                lock (m_ticker)
-                    m_ticker.Start();
-            }
-        }
-
-        public void Close()
-        {
-            m_shutdown = true;
-            if (m_ticker != null)
-            {
-                lock (m_ticker)
-                    m_ticker.Stop();
-            }
-        }
-
-        public string Name
-        {
-            get { return "MXP ClientStack Module"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-
-    }
-}

OpenSim/Client/MXP/MXPUtil.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 System;
-using System.Collections.Generic;
-using System.Text;
-using OpenMetaverse;
-
-namespace OpenSim.Client.MXP
-{
-    public static class MXPUtil
-    {
-        public static string GenerateMXPURL(string server, int port, UUID bubbleID, Vector3 location)
-        {
-            return string.Format("mxp://{0}:{1}/{2}/{3}", server, port, bubbleID.Guid, location);
-        }
-    }
-}

OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs

@@ -1,561 +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.
- */
-
-/* This file borrows heavily from MXPServer.cs - the reference MXPServer 
- * See http://www.bubblecloud.org for a copy of the original file and
- * implementation details. */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Threading;
-using log4net;
-using MXP;
-using MXP.Messages;
-using OpenMetaverse;
-using OpenSim.Client.MXP.ClientStack;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications;
-using OpenSim.Services.Interfaces;
-using System.Security.Cryptography;
-
-namespace OpenSim.Client.MXP.PacketHandler
-{
-    public class MXPPacketServer
-    {
-        internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        #region Fields
-
-        private readonly List<MXPClientView> m_clients = new List<MXPClientView>();
-        private readonly Dictionary<UUID, Scene> m_scenes;
-        private readonly Transmitter m_transmitter;
-
-//        private readonly Thread m_clientThread;
-
-        private readonly IList<Session> m_sessions = new List<Session>();
-        private readonly IList<Session> m_sessionsToClient = new List<Session>();
-        private readonly IList<MXPClientView> m_sessionsToRemove = new List<MXPClientView>();
-
-        private readonly int m_port;
-//        private readonly bool m_accountsAuthenticate;
-
-        private readonly String m_programName;
-        private readonly byte m_programMajorVersion;
-        private readonly byte m_programMinorVersion;
-
-        #endregion
-
-        #region Constructors
-
-        public MXPPacketServer(int port, Dictionary<UUID, Scene> scenes, bool accountsAuthenticate)
-        {
-            m_port = port;
-//            m_accountsAuthenticate = accountsAuthenticate;
-
-            m_scenes = scenes;
-
-            m_programMinorVersion = 63;
-            m_programMajorVersion = 0;
-            m_programName = "OpenSimulator";
-
-            m_transmitter = new Transmitter(port);
-
-            StartListener();
-        }
-
-        public void StartListener()
-        {
-            m_log.Info("[MXP ClientStack] Transmitter starting on UDP server port: " + m_port);
-            m_transmitter.Startup();
-            m_log.Info("[MXP ClientStack] Transmitter started. MXP version: "+MxpConstants.ProtocolMajorVersion+"."+MxpConstants.ProtocolMinorVersion+" Source Revision: "+MxpConstants.ProtocolSourceRevision);
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Number of sessions pending. (Process() accepts pending sessions).
-        /// </summary>
-        public int PendingSessionCount
-        {
-            get
-            {
-                return m_transmitter.PendingSessionCount;
-            }
-        }
-        /// <summary>
-        /// Number of connected sessions.
-        /// </summary>
-        public int SessionCount
-        {
-            get
-            {
-                return m_sessions.Count;
-            }
-        }
-        /// <summary>
-        /// Property reflecting whether client transmitter threads are alive.
-        /// </summary>
-        public bool IsTransmitterAlive
-        {
-            get
-            {
-                return m_transmitter != null && m_transmitter.IsAlive;
-            }
-        }
-        /// <summary>
-        /// Number of packets sent.
-        /// </summary>
-        public ulong PacketsSent
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.PacketsSent : 0;
-            }
-        }
-        /// <summary>
-        /// Number of packets received.
-        /// </summary>
-        public ulong PacketsReceived
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.PacketsReceived : 0;
-            }
-        }
-        /// <summary>
-        /// Bytes client has received so far.
-        /// </summary>
-        public ulong BytesReceived
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.BytesReceived : 0;
-            }
-        }
-        /// <summary>
-        /// Bytes client has sent so far.
-        /// </summary>
-        public ulong BytesSent
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.BytesSent : 0;
-            }
-        }
-        /// <summary>
-        /// Number of bytes received (bytes per second) during past second.
-        /// </summary>
-        public double ReceiveRate
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.ReceiveRate : 0;
-            }
-        }
-        /// <summary>
-        /// Number of bytes sent (bytes per second) during past second.
-        /// </summary>
-        public double SendRate
-        {
-            get
-            {
-                return m_transmitter != null ? m_transmitter.SendRate : 0;
-            }
-        }
-
-        #endregion
-
-        #region Session Management
-
-        public void Disconnect(Session session)
-        {
-            if (session.IsConnected)
-            {
-                Message message = MessageFactory.Current.ReserveMessage(typeof(LeaveRequestMessage));
-                session.Send(message);
-                MessageFactory.Current.ReleaseMessage(message);
-            }
-            else
-            {
-                throw new Exception("Not connected.");
-            }
-        }
-
-        #endregion
-
-        #region Processing
-
-        public void Process()
-        {
-            ProcessMessages();
-            Clean();
-        }
-
-        public void Clean()
-        {
-            foreach (MXPClientView clientView in m_clients)
-            {
-                if (clientView.Session.SessionState == SessionState.Disconnected)
-                {
-                    m_sessionsToRemove.Add(clientView);
-                }
-            }
-
-            foreach (MXPClientView clientView in m_sessionsToRemove)
-            {
-                clientView.Scene.RemoveClient(clientView.AgentId);
-                clientView.OnClean();
-                m_clients.Remove(clientView);
-                m_sessions.Remove(clientView.Session);
-            }
-
-            m_sessionsToRemove.Clear();
-        }
-
-        public void ProcessMessages()
-        {
-            if (m_transmitter.PendingSessionCount > 0)
-            {
-                Session tmp = m_transmitter.AcceptPendingSession();
-                m_sessions.Add(tmp);
-                m_sessionsToClient.Add(tmp);
-
-            }
-
-            List<Session> tmpRemove = new List<Session>();
-
-            foreach (Session session in m_sessionsToClient)
-            {
-                while (session.AvailableMessages > 0)
-                {
-                    Message message = session.Receive();
-
-                    if (message.GetType() == typeof (JoinRequestMessage))
-                    {
-
-                        JoinRequestMessage joinRequestMessage = (JoinRequestMessage) message;
-
-                        m_log.Info("[MXP ClientStack]: Session join request: " + session.SessionId + " (" +
-                           (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" +
-                            session.RemoteEndPoint.Port + ")");
-
-                        try
-                        {
-
-                            if (joinRequestMessage.BubbleId == Guid.Empty)
-                            {
-                                foreach (Scene scene in m_scenes.Values)
-                                {
-                                    if (scene.RegionInfo.RegionName == joinRequestMessage.BubbleName)
-                                    {
-                                        m_log.Info("[MXP ClientStack]: Resolved region by name: " + joinRequestMessage.BubbleName + " (" + scene.RegionInfo.RegionID + ")");
-                                        joinRequestMessage.BubbleId = scene.RegionInfo.RegionID.Guid;
-                                    }
-                                }
-                            }
-
-                            if (joinRequestMessage.BubbleId == Guid.Empty)
-                            {
-                                m_log.Warn("[MXP ClientStack]: Failed to resolve region by name: " + joinRequestMessage.BubbleName);
-                            }
-
-                            UUID sceneId = new UUID(joinRequestMessage.BubbleId);
-
-                            bool regionExists = true;
-                            if (!m_scenes.ContainsKey(sceneId))
-                            {
-                                m_log.Info("[MXP ClientStack]: No such region: " + sceneId);
-                                regionExists = false;
-                            }
-
-                            UUID userId = UUID.Zero;
-                            UserAccount account = null;
-                            bool authorized = regionExists ? AuthoriseUser(joinRequestMessage.ParticipantName,
-                                                            joinRequestMessage.ParticipantPassphrase,
-                                                            new UUID(joinRequestMessage.BubbleId), out account)
-                                                            : false;
-
-                            if (authorized)
-                            {
-                                Scene scene = m_scenes[sceneId];
-                                UUID mxpSessionID = UUID.Random();
-                                
-                                string reason;
-
-                                m_log.Debug("[MXP ClientStack]: Session join request success: " + session.SessionId + " (" +
-                                   (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" +
-                                   session.RemoteEndPoint.Port + ")");
-
-                                m_log.Debug("[MXP ClientStack]: Attaching UserAgent to UserProfile...");
-                                UUID secureSession = UUID.Zero;
-                                AttachUserAgentToUserProfile(account, session, mxpSessionID, sceneId, out secureSession);
-                                m_log.Debug("[MXP ClientStack]: Attached UserAgent to UserProfile.");
-                                m_log.Debug("[MXP ClientStack]: Preparing Scene to Connection...");
-                                if (!PrepareSceneForConnection(mxpSessionID, secureSession, sceneId, account, out reason))
-                                {
-                                    m_log.DebugFormat("[MXP ClientStack]: Scene refused connection: {0}", reason);
-                                    DeclineConnection(session, joinRequestMessage);
-                                    tmpRemove.Add(session);
-                                    continue;
-                                }
-                                m_log.Debug("[MXP ClientStack]: Prepared Scene to Connection.");
-                                m_log.Debug("[MXP ClientStack]: Accepting connection...");
-                                AcceptConnection(session, joinRequestMessage, mxpSessionID, userId);
-                                m_log.Info("[MXP ClientStack]: Accepted connection.");
-
-                                m_log.Debug("[MXP ClientStack]: Creating ClientView....");
-                                MXPClientView client = new MXPClientView(session, mxpSessionID, userId, scene, account.FirstName, account.LastName);
-                                m_clients.Add(client);
-                                m_log.Debug("[MXP ClientStack]: Created ClientView.");
-
-                                client.MXPSendSynchronizationBegin(m_scenes[new UUID(joinRequestMessage.BubbleId)].SceneContents.GetTotalObjectsCount());
-
-                                m_log.Debug("[MXP ClientStack]: Starting ClientView...");
-                                try
-                                {
-                                    client.Start();
-                                    m_log.Debug("[MXP ClientStack]: Started ClientView.");
-                                }
-                                catch (Exception e)
-                                {
-                                    m_log.Error(e);
-                                }
-
-                                m_log.Debug("[MXP ClientStack]: Connected");
-                            }
-                            else
-                            {
-                                m_log.Info("[MXP ClientStack]: Session join request failure: " + session.SessionId + " (" +
-                                           (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" +
-                                           session.RemoteEndPoint.Port + ")");
-
-                                DeclineConnection(session, joinRequestMessage);
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.Error("[MXP ClientStack]: Session join request failure: " + session.SessionId + " (" +
-                               (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" +
-                               session.RemoteEndPoint.Port + "): "+e.ToString()+" :"+e.StackTrace.ToString());
-                        }
-                        tmpRemove.Add(session);
-                    }
-                }
-            }
-
-            foreach (Session session in tmpRemove)
-            {
-                m_sessionsToClient.Remove(session);
-            }
-
-            foreach (MXPClientView clientView in m_clients)
-            {
-                int messagesProcessedCount = 0;
-                Session session = clientView.Session;
-
-                while (session.AvailableMessages > 0)
-                {
-                    Message message = session.Receive();
-
-                    if (message.GetType() == typeof(LeaveRequestMessage))
-                    {
-                        LeaveResponseMessage leaveResponseMessage = (LeaveResponseMessage)MessageFactory.Current.ReserveMessage(
-                            typeof(LeaveResponseMessage));
-
-                        m_log.Debug("[MXP ClientStack]: Session leave request: " + session.SessionId + " (" + (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" + session.RemoteEndPoint.Port + ")");
-
-                        leaveResponseMessage.RequestMessageId = message.MessageId;
-                        leaveResponseMessage.FailureCode = 0;
-                        session.Send(leaveResponseMessage);
-
-                        if (session.SessionState != SessionState.Disconnected)
-                        {
-                            session.SetStateDisconnected();
-                        }
-
-                        m_log.Debug("[MXP ClientStack]: Removing Client from Scene");
-                        //clientView.Scene.RemoveClient(clientView.AgentId);
-                    }
-                    if (message.GetType() == typeof(LeaveResponseMessage))
-                    {
-                        LeaveResponseMessage leaveResponseMessage = (LeaveResponseMessage)message;
-
-                        m_log.Debug("[MXP ClientStack]: Session leave response: " + session.SessionId + " (" + (session.IsIncoming ? "from" : "to") + " " + session.RemoteEndPoint.Address + ":" + session.RemoteEndPoint.Port + ")");
-
-                        if (leaveResponseMessage.FailureCode == 0)
-                        {
-                            session.SetStateDisconnected();
-                        }
-
-                        m_log.Debug("[MXP ClientStack]: Removing Client from Scene");
-                        //clientView.Scene.RemoveClient(clientView.AgentId);
-                    }
-                    else
-                    {
-                        clientView.MXPPRocessMessage(message);
-                    }
-
-                    MessageFactory.Current.ReleaseMessage(message);
-                    messagesProcessedCount++;
-                    if (messagesProcessedCount > 1000)
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-
-        private void AcceptConnection(Session session, JoinRequestMessage joinRequestMessage, UUID mxpSessionID, UUID userId)
-        {
-            JoinResponseMessage joinResponseMessage = (JoinResponseMessage)MessageFactory.Current.ReserveMessage(
-                                                                               typeof(JoinResponseMessage));
-
-            joinResponseMessage.RequestMessageId = joinRequestMessage.MessageId;
-            joinResponseMessage.FailureCode = MxpResponseCodes.SUCCESS;
-            
-            joinResponseMessage.BubbleId = joinRequestMessage.BubbleId;
-            joinResponseMessage.ParticipantId = userId.Guid;
-            joinResponseMessage.AvatarId = userId.Guid;
-            joinResponseMessage.BubbleAssetCacheUrl = "http://" +
-                                                      NetworkUtil.GetHostFor(session.RemoteEndPoint.Address,
-                                                                             m_scenes[
-                                                                                 new UUID(joinRequestMessage.BubbleId)].
-                                                                                 RegionInfo.
-                                                                                 ExternalHostName) + ":" +
-                                                      m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.
-                                                          HttpPort + "/assets/";
-
-            joinResponseMessage.BubbleName = m_scenes[new UUID(joinRequestMessage.BubbleId)].RegionInfo.RegionName;
-
-            joinResponseMessage.BubbleRange = 128;
-            joinResponseMessage.BubblePerceptionRange = 128 + 256;
-            joinResponseMessage.BubbleRealTime = 0;
-            joinResponseMessage.ProgramName = m_programName;
-            joinResponseMessage.ProgramMajorVersion = m_programMajorVersion;
-            joinResponseMessage.ProgramMinorVersion = m_programMinorVersion;
-            joinResponseMessage.ProtocolMajorVersion = MxpConstants.ProtocolMajorVersion;
-            joinResponseMessage.ProtocolMinorVersion = MxpConstants.ProtocolMinorVersion;
-            joinResponseMessage.ProtocolSourceRevision = MxpConstants.ProtocolSourceRevision;
-
-            session.Send(joinResponseMessage);
-
-            session.SetStateConnected();
-        }
-
-        private void DeclineConnection(Session session, Message joinRequestMessage)
-        {
-            JoinResponseMessage joinResponseMessage = (JoinResponseMessage)MessageFactory.Current.ReserveMessage(typeof(JoinResponseMessage));
-
-            joinResponseMessage.RequestMessageId = joinRequestMessage.MessageId;
-            joinResponseMessage.FailureCode = MxpResponseCodes.UNAUTHORIZED_OPERATION;
-
-            joinResponseMessage.ProgramName = m_programName;
-            joinResponseMessage.ProgramMajorVersion = m_programMajorVersion;
-            joinResponseMessage.ProgramMinorVersion = m_programMinorVersion;
-            joinResponseMessage.ProtocolMajorVersion = MxpConstants.ProtocolMajorVersion;
-            joinResponseMessage.ProtocolMinorVersion = MxpConstants.ProtocolMinorVersion;
-            joinResponseMessage.ProtocolSourceRevision = MxpConstants.ProtocolSourceRevision;
-
-            session.Send(joinResponseMessage);
-
-            session.SetStateDisconnected();
-        }
-
-        public bool AuthoriseUser(string participantName, string password, UUID sceneId, out UserAccount account)
-        {
-            string firstName = "";
-            string lastName = "";
-            account = null;
-
-            string[] nameParts = participantName.Split(' ');
-            if (nameParts.Length != 2)
-            {
-                m_log.Error("[MXP ClientStack]: Login failed as user name is not formed of first and last name separated by space: " + participantName);
-                return false;
-            }
-            firstName = nameParts[0];
-            lastName = nameParts[1];
-
-            account = m_scenes[sceneId].UserAccountService.GetUserAccount(m_scenes[sceneId].RegionInfo.ScopeID, firstName, lastName);
-            if (account != null)
-                return (m_scenes[sceneId].AuthenticationService.Authenticate(account.PrincipalID, password, 1) != string.Empty);
-
-            return false;
-        }
-
-        private void AttachUserAgentToUserProfile(UserAccount account, Session session, UUID sessionId, UUID sceneId, out UUID secureSessionId)
-        {
-            secureSessionId = UUID.Random();
-            Scene scene = m_scenes[sceneId];
-            scene.PresenceService.LoginAgent(account.PrincipalID.ToString(), sessionId, secureSessionId);
-        }
-
-        private bool PrepareSceneForConnection(UUID sessionId, UUID secureSessionId, UUID sceneId, UserAccount account, out string reason)
-        {
-            Scene scene = m_scenes[sceneId];
-
-            AgentCircuitData agent = new AgentCircuitData();
-            agent.AgentID = account.PrincipalID;
-            agent.firstname = account.FirstName;
-            agent.lastname = account.LastName;
-            agent.SessionID = sessionId;
-            agent.SecureSessionID = secureSessionId;
-            agent.circuitcode = sessionId.CRC();
-            agent.BaseFolder = UUID.Zero;
-            agent.InventoryFolder = UUID.Zero;
-            agent.startpos = new Vector3(0, 0, 0); // TODO Fill in region start position
-            agent.CapsPath = "http://localhost/";
-            agent.Appearance = scene.AvatarService.GetAppearance(account.PrincipalID);
-
-            if (agent.Appearance == null)
-            {
-                m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname);
-                agent.Appearance = new AvatarAppearance();
-            }
-            
-            return scene.NewUserConnection(agent, 0, out reason);
-        }
-
-        public void PrintDebugInformation()
-        {
-            m_log.Info("[MXP ClientStack]: Statistics report");
-            m_log.Info("Pending Sessions: " + PendingSessionCount);
-            m_log.Info("Sessions: " + SessionCount + " (Clients: " + m_clients.Count + " )");
-            m_log.Info("Transmitter Alive?: " + IsTransmitterAlive);
-            m_log.Info("Packets Sent/Received: " + PacketsSent + " / " + PacketsReceived);
-            m_log.Info("Bytes Sent/Received: " + BytesSent + " / " + BytesReceived);
-            m_log.Info("Send/Receive Rate (bps): " + SendRate + " / " + ReceiveRate);
-        }
-
-        #endregion
-    
-    }
-}

OpenSim/Client/VWoHTTP/VWoHTTPModule.cs

@@ -1,133 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Client.VWoHTTP.ClientStack;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Client.VWoHTTP
-{
-    class VWoHTTPModule : IRegionModule, IHttpAgentHandler
-    {
-        private bool m_disabled = true;
-
-        private IHttpServer m_httpd;
-
-        private readonly List<Scene> m_scenes = new List<Scene>();
-
-        private Dictionary<UUID, VWHClientView> m_clients = new Dictionary<UUID, VWHClientView>();
-
-        #region Implementation of IRegionModule
-
-        public void Initialise(Scene scene, IConfigSource source)
-        {
-            if (m_disabled)
-                return;
-
-            m_scenes.Add(scene);
-
-            m_httpd = MainServer.Instance;
-        }
-
-        public void PostInitialise()
-        {
-            if (m_disabled)
-                return;
-
-            m_httpd.AddAgentHandler("vwohttp", this);
-        }
-
-        public void Close()
-        {
-            if (m_disabled)
-                return;
-
-            m_httpd.RemoveAgentHandler("vwohttp", this);
-        }
-
-        public string Name
-        {
-            get { return "VWoHTTP ClientStack"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-
-        #endregion
-
-        #region Implementation of IHttpAgentHandler
-
-        public bool Handle(OSHttpRequest req, OSHttpResponse resp)
-        {
-            string[] urlparts = req.Url.AbsolutePath.Split(new char[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
-
-            if (urlparts.Length < 2)
-                return false;
-
-            if (urlparts[1] == "connect")
-            {
-                UUID sessID = UUID.Random();
-
-                VWHClientView client = new VWHClientView(sessID, UUID.Random(), "VWoHTTPClient", m_scenes[0]);
-
-                m_clients.Add(sessID, client);
-
-                return true;
-            }
-            else
-            {
-                if (urlparts.Length < 3)
-                    return false;
-
-                UUID sessionID;
-                if (!UUID.TryParse(urlparts[1], out sessionID))
-                    return false;
-
-                if (!m_clients.ContainsKey(sessionID))
-                    return false;
-
-                return m_clients[sessionID].ProcessInMsg(req, resp);
-            }
-        }
-
-        public bool Match(OSHttpRequest req, OSHttpResponse resp)
-        {
-            return req.Url.ToString().Contains("vwohttp");
-        }
-
-        #endregion
-    }
-}

OpenSim/Data/IXInventoryData.cs

@@ -74,9 +74,38 @@ namespace OpenSim.Data
         bool StoreFolder(XInventoryFolder folder);
         bool StoreItem(XInventoryItem item);
 
+        /// <summary>
+        /// Delete folders where field == val
+        /// </summary>
+        /// <param name="field"></param>
+        /// <param name="val"></param>
+        /// <returns>true if the delete was successful, false if it was not</returns>
         bool DeleteFolders(string field, string val);
+
+        /// <summary>
+        /// Delete folders where field1 == val1, field2 == val2...
+        /// </summary>
+        /// <param name="fields"></param>
+        /// <param name="vals"></param>
+        /// <returns>true if the delete was successful, false if it was not</returns>
+        bool DeleteFolders(string[] fields, string[] vals);
+
+        /// <summary>
+        /// Delete items where field == val
+        /// </summary>
+        /// <param name="field"></param>
+        /// <param name="val"></param>
+        /// <returns>true if the delete was successful, false if it was not</returns>
         bool DeleteItems(string field, string val);
 
+        /// <summary>
+        /// Delete items where field1 == val1, field2 == val2...
+        /// </summary>
+        /// <param name="fields"></param>
+        /// <param name="vals"></param>
+        /// <returns>true if the delete was successful, false if it was not</returns>
+        bool DeleteItems(string[] fields, string[] vals);
+
         bool MoveItem(string id, string newParent);
         XInventoryItem[] GetActiveGestures(UUID principalID);
         int GetAssetPermissions(UUID principalID, UUID assetID);

OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs

@@ -56,15 +56,15 @@ namespace OpenSim.Data.MSSQL
                 string realm, string storeName)
         {
             m_Realm = realm;
+            
+            m_ConnectionString = connectionString;
 
             if (storeName != String.Empty)
             {
-                Assembly assem = GetType().Assembly;
-                m_ConnectionString = connectionString;
                 using (SqlConnection conn = new SqlConnection(m_ConnectionString))
                 {
                     conn.Open();
-                    Migration m = new Migration(conn, assem, storeName);
+                    Migration m = new Migration(conn, GetType().Assembly, storeName);
                     m.Update();
                 }
 
@@ -335,24 +335,35 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
-        public virtual bool Delete(string field, string val)
+        public virtual bool Delete(string field, string key)
         {
+            return Delete(new string[] { field }, new string[] { key });
+        }
+
+        public virtual bool Delete(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return false;
+
+            List<string> terms = new List<string>();
+
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
             using (SqlCommand cmd = new SqlCommand())
             {
-                string deleteCommand = String.Format("DELETE FROM {0} WHERE [{1}] = @{1}", m_Realm, field);
-                cmd.CommandText = deleteCommand;
-                
-                cmd.Parameters.Add(m_database.CreateParameter(field, val));
-                cmd.Connection = conn;
-                conn.Open();
-
-                if (cmd.ExecuteNonQuery() > 0)
+                for (int i = 0; i < fields.Length; i++)
                 {
-                    //m_log.Warn("[MSSQLGenericTable]: " + deleteCommand);
-                    return true;
+                    cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+                    terms.Add("[" + fields[i] + "] = @" + fields[i]);
                 }
-                return false;
+
+                string where = String.Join(" AND ", terms.ToArray());
+
+                string query = String.Format("DELETE * FROM {0} WHERE {1}", m_Realm, where);
+
+                cmd.Connection = conn;
+                cmd.CommandText = query;
+                conn.Open();
+                return cmd.ExecuteNonQuery() > 0;
             }
         }
     }

OpenSim/Data/MSSQL/MSSQLMigration.cs

@@ -61,7 +61,8 @@ namespace OpenSim.Data.MSSQL
                 }
                 catch
                 {
-                    // Something went wrong, so we're version 0
+                    // Return -1 to indicate table does not exist
+                    return -1;
                 }
             }
             return version;

OpenSim/Data/MSSQL/MSSQLSimulationData.cs

@@ -492,12 +492,11 @@ ELSE
             using (SqlConnection conn = new SqlConnection(m_connectionString))
             using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
+                conn.Open();
                 foreach (TaskInventoryItem taskItem in items)
                 {
                     cmd.Parameters.AddRange(CreatePrimInventoryParameters(taskItem));
-                    conn.Open();
                     cmd.ExecuteNonQuery();
-
                     cmd.Parameters.Clear();
                 }
             }
@@ -1154,9 +1153,9 @@ VALUES
             PrimitiveBaseShape baseShape = new PrimitiveBaseShape();
 
             baseShape.Scale = new Vector3(
-                        Convert.ToSingle(shapeRow["ScaleX"]),
-                        Convert.ToSingle(shapeRow["ScaleY"]),
-                        Convert.ToSingle(shapeRow["ScaleZ"]));
+                        (float)Convert.ToDouble(shapeRow["ScaleX"]),
+                        (float)Convert.ToDouble(shapeRow["ScaleY"]),
+                        (float)Convert.ToDouble(shapeRow["ScaleZ"]));
 
             // paths
             baseShape.PCode = Convert.ToByte(shapeRow["PCode"]);
@@ -1193,8 +1192,11 @@ VALUES
             {
             }
 
-            if (!(shapeRow["Media"] is System.DBNull))
+            if (!(shapeRow["Media"] is System.DBNull) )
+            {
                 baseShape.Media = PrimitiveBaseShape.MediaList.FromXml((string)shapeRow["Media"]);
+            }
+                
 
             return baseShape;
         }
@@ -1573,7 +1575,16 @@ VALUES
             parameters.Add(_Database.CreateParameter("Texture", s.TextureEntry));
             parameters.Add(_Database.CreateParameter("ExtraParams", s.ExtraParams));
             parameters.Add(_Database.CreateParameter("State", s.State));
-            parameters.Add(_Database.CreateParameter("Media", null == s.Media ? null : s.Media.ToXml()));
+
+            if(null == s.Media )
+            {
+                parameters.Add(_Database.CreateParameter("Media", DBNull.Value));    
+            }
+            else
+            {
+                parameters.Add(_Database.CreateParameter("Media", s.Media.ToXml()));    
+            }
+            
 
             return parameters.ToArray();
         }

OpenSim/Data/MSSQL/MSSQLXInventoryData.cs

@@ -79,11 +79,21 @@ namespace OpenSim.Data.MSSQL
             return m_Folders.Delete(field, val);
         }
 
+        public bool DeleteFolders(string[] fields, string[] vals)
+        {
+            return m_Folders.Delete(fields, vals);
+        }
+
         public bool DeleteItems(string field, string val)
         {
             return m_Items.Delete(field, val);
         }
 
+        public bool DeleteItems(string[] fields, string[] vals)
+        {
+            return m_Items.Delete(fields, vals);
+        }
+
         public bool MoveItem(string id, string newParent)
         {
             return m_Items.MoveItem(id, newParent);

OpenSim/Data/MSSQL/Resources/AuthStore.migrations

@@ -22,7 +22,11 @@ COMMIT
 
 BEGIN TRANSACTION
 
-INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey, accountType) SELECT [UUID] AS UUID, [passwordHash] AS passwordHash, [passwordSalt] AS passwordSalt, [webLoginKey] AS webLoginKey, 'UserAccount' as [accountType] FROM users;
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[users]') AND type in (N'U'))
+	INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey, accountType) SELECT [UUID] AS UUID, [passwordHash] AS passwordHash, [passwordSalt] AS passwordSalt, [webLoginKey] AS webLoginKey, 'UserAccount' as [accountType] FROM users;
+
+COMMIT
+
+
 
 
-COMMIT

OpenSim/Data/MSSQL/Resources/Avatar.migrations

@@ -13,5 +13,28 @@ PRIMARY KEY CLUSTERED
 ) ON [PRIMARY]
 
 
+COMMIT
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_Avatars
+	(
+	PrincipalID uniqueidentifier NOT NULL,
+	[Name] varchar(32) NOT NULL, 
+	Value text NOT NULL DEFAULT '',
+	)  ON [PRIMARY]
+	 TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.Avatars)
+	 EXEC('INSERT INTO dbo.Tmp_Avatars (PrincipalID, Name, Value)
+		SELECT PrincipalID, CONVERT(text, Name), Value FROM dbo.Avatars WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.Avatars
+
+EXECUTE sp_rename N'dbo.Tmp_Avatars', N'Avatars', 'OBJECT' 
+
+COMMIT
+
 
-COMMIT

OpenSim/Data/MSSQL/Resources/FriendsStore.migrations

@@ -15,6 +15,8 @@ COMMIT
 
 BEGIN TRANSACTION
 
-INSERT INTO Friends (PrincipalID, Friend, Flags, Offered) SELECT [ownerID], [friendID], [friendPerms], 0 FROM userfriends;
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[userfriends]') AND type in (N'U'))
+INSERT INTO Friends (PrincipalID, Friend, Flags, Offered) 
+SELECT [ownerID], [friendID], [friendPerms], 0 FROM userfriends;
 
 COMMIT

OpenSim/Data/MSSQL/Resources/GridStore.migrations

@@ -222,4 +222,17 @@ ALTER TABLE [regions] ADD [Token] varchar(255) NOT NULL DEFAULT 0;
 
 COMMIT
 
+:VERSION 8
 
+BEGIN TRANSACTION
+ALTER TABLE regions ALTER COLUMN regionName VarChar(128) 
+
+DROP INDEX IX_regions_name ON dbo.regions
+ALTER TABLE regions ALTER COLUMN regionName VarChar(128) null
+
+CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions
+	(
+	regionName
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT

OpenSim/Data/MSSQL/Resources/GridUserStore.migrations

@@ -0,0 +1,19 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN TRANSACTION
+
+CREATE TABLE "GridUser" (
+    "UserID" VARCHAR(255) NOT NULL,
+    "HomeRegionID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    "HomePosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "HomeLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "LastRegionID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    "LastPosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "LastLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    "Online" CHAR(5) NOT NULL DEFAULT 'false',
+    "Login" CHAR(16) NOT NULL DEFAULT '0',
+    "Logout" CHAR(16) NOT NULL DEFAULT '0',
+    PRIMARY KEY  ("UserID")
+) 
+
+COMMIT

OpenSim/Data/MSSQL/Resources/InventoryStore.migrations

@@ -238,7 +238,10 @@ alter table inventoryitems
 
 COMMIT	
    
- 
-
-
+:VERSION 8
 
+ALTER TABLE inventoryitems
+ADD CONSTRAINT DF_inventoryitems_creatorID 
+DEFAULT '00000000-0000-0000-0000-000000000000' FOR creatorID
+   
+:GO

OpenSim/Data/MSSQL/Resources/Presence.migrations

@@ -7,14 +7,7 @@ CREATE TABLE [Presence] (
 [RegionID] uniqueidentifier NOT NULL, 
 [SessionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
 [SecureSessionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-[Online] char(5) NOT NULL DEFAULT 'false',
-[Login] char(16) NOT NULL DEFAULT '0',
-[Logout] char(16) NOT NULL DEFAULT '0',
-[Position] char(64) NOT NULL DEFAULT '<0,0,0>',
-[LookAt] char(64) NOT NULL DEFAULT '<0,0,0>',
-[HomeRegionID] uniqueidentifier NOT NULL,
-[HomePosition] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
-[HomeLookAt] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+
 )
  ON [PRIMARY]
 
@@ -27,4 +20,12 @@ BEGIN TRANSACTION
 CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
 CREATE INDEX UserID ON Presence(UserID);
 
+COMMIT
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+ALTER TABLE Presence ADD LastSeen DateTime
+
 COMMIT

OpenSim/Data/MSSQL/Resources/RegionStore.migrations

@@ -1,4 +1,3 @@
-
 :VERSION 1
 
 CREATE TABLE [dbo].[prims](
@@ -926,11 +925,121 @@ ALTER TABLE regionsettings ADD loaded_creation_datetime int NOT NULL default 0
 COMMIT
 
 :VERSION 24
--- Added post 0.7
 
 BEGIN TRANSACTION
 
-ALTER TABLE prims ADD COLUMN MediaURL varchar(255)
-ALTER TABLE primshapes ADD COLUMN Media TEXT
+ALTER TABLE prims ADD  MediaURL varchar(255)
+ALTER TABLE primshapes ADD Media TEXT NULL
 
-COMMIT
+COMMIT
+
+:VERSION 25
+
+BEGIN TRANSACTION
+CREATE TABLE "regionwindlight" (
+  "region_id" varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000',
+  "water_color_r" [float] NOT NULL DEFAULT '4.000000',
+  "water_color_g" [float] NOT NULL DEFAULT '38.000000',
+  "water_color_b" [float] NOT NULL DEFAULT '64.000000',
+  "water_fog_density_exponent" [float] NOT NULL DEFAULT '4.0',
+  "underwater_fog_modifier" [float] NOT NULL DEFAULT '0.25',
+  "reflection_wavelet_scale_1" [float] NOT NULL DEFAULT '2.0',
+  "reflection_wavelet_scale_2" [float] NOT NULL DEFAULT '2.0',
+  "reflection_wavelet_scale_3" [float] NOT NULL DEFAULT '2.0',
+  "fresnel_scale" [float] NOT NULL DEFAULT '0.40',
+  "fresnel_offset" [float] NOT NULL DEFAULT '0.50',
+  "refract_scale_above" [float] NOT NULL DEFAULT '0.03',
+  "refract_scale_below" [float] NOT NULL DEFAULT '0.20',
+  "blur_multiplier" [float] NOT NULL DEFAULT '0.040',
+  "big_wave_direction_x" [float] NOT NULL DEFAULT '1.05',
+  "big_wave_direction_y" [float] NOT NULL DEFAULT '-0.42',
+  "little_wave_direction_x" [float] NOT NULL DEFAULT '1.11',
+  "little_wave_direction_y" [float] NOT NULL DEFAULT '-1.16',
+  "normal_map_texture" varchar(36) NOT NULL DEFAULT '822ded49-9a6c-f61c-cb89-6df54f42cdf4',
+  "horizon_r" [float] NOT NULL DEFAULT '0.25',
+  "horizon_g" [float] NOT NULL DEFAULT '0.25',
+  "horizon_b" [float] NOT NULL DEFAULT '0.32',
+  "horizon_i" [float] NOT NULL DEFAULT '0.32',
+  "haze_horizon" [float] NOT NULL DEFAULT '0.19',
+  "blue_density_r" [float] NOT NULL DEFAULT '0.12',
+  "blue_density_g" [float] NOT NULL DEFAULT '0.22',
+  "blue_density_b" [float] NOT NULL DEFAULT '0.38',
+  "blue_density_i" [float] NOT NULL DEFAULT '0.38',
+  "haze_density" [float] NOT NULL DEFAULT '0.70',
+  "density_multiplier" [float] NOT NULL DEFAULT '0.18',
+  "distance_multiplier" [float] NOT NULL DEFAULT '0.8',
+  "max_altitude" int NOT NULL DEFAULT '1605',
+  "sun_moon_color_r" [float] NOT NULL DEFAULT '0.24',
+  "sun_moon_color_g" [float] NOT NULL DEFAULT '0.26',
+  "sun_moon_color_b" [float] NOT NULL DEFAULT '0.30',
+  "sun_moon_color_i" [float] NOT NULL DEFAULT '0.30',
+  "sun_moon_position" [float] NOT NULL DEFAULT '0.317',
+  "ambient_r" [float] NOT NULL DEFAULT '0.35',
+  "ambient_g" [float] NOT NULL DEFAULT '0.35',
+  "ambient_b" [float] NOT NULL DEFAULT '0.35',
+  "ambient_i" [float] NOT NULL DEFAULT '0.35',
+  "east_angle" [float] NOT NULL DEFAULT '0.00',
+  "sun_glow_focus" [float] NOT NULL DEFAULT '0.10',
+  "sun_glow_size" [float] NOT NULL DEFAULT '1.75',
+  "scene_gamma" [float] NOT NULL DEFAULT '1.00',
+  "star_brightness" [float] NOT NULL DEFAULT '0.00',
+  "cloud_color_r" [float] NOT NULL DEFAULT '0.41',
+  "cloud_color_g" [float] NOT NULL DEFAULT '0.41',
+  "cloud_color_b" [float] NOT NULL DEFAULT '0.41',
+  "cloud_color_i" [float] NOT NULL DEFAULT '0.41',
+  "cloud_x" [float] NOT NULL DEFAULT '1.00',
+  "cloud_y" [float] NOT NULL DEFAULT '0.53',
+  "cloud_density" [float] NOT NULL DEFAULT '1.00',
+  "cloud_coverage" [float] NOT NULL DEFAULT '0.27',
+  "cloud_scale" [float] NOT NULL DEFAULT '0.42',
+  "cloud_detail_x" [float] NOT NULL DEFAULT '1.00',
+  "cloud_detail_y" [float] NOT NULL DEFAULT '0.53',
+  "cloud_detail_density" [float] NOT NULL DEFAULT '0.12',
+  "cloud_scroll_x" [float] NOT NULL DEFAULT '0.20',
+  "cloud_scroll_x_lock" tinyint NOT NULL DEFAULT '0',
+  "cloud_scroll_y" [float] NOT NULL DEFAULT '0.01',
+  "cloud_scroll_y_lock" tinyint NOT NULL DEFAULT '0',
+  "draw_classic_clouds" tinyint NOT NULL DEFAULT '1',
+  PRIMARY KEY ("region_id")
+)
+
+COMMIT TRANSACTION
+
+:VERSION 26
+
+BEGIN TRANSACTION
+
+ALTER TABLE regionsettings ADD map_tile_ID CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
+
+COMMIT
+
+:VERSION 27         #---------------------
+
+BEGIN TRANSACTION
+ALTER TABLE land ADD MediaType VARCHAR(32) NOT NULL DEFAULT 'none/none' 
+ALTER TABLE land ADD MediaDescription VARCHAR(255) NOT NULL DEFAULT ''
+ALTER TABLE land ADD MediaSize VARCHAR(16) NOT NULL DEFAULT '0,0'
+ALTER TABLE land ADD MediaLoop bit NOT NULL DEFAULT 0
+ALTER TABLE land ADD ObscureMusic bit NOT NULL DEFAULT 0
+ALTER TABLE land ADD ObscureMedia bit NOT NULL DEFAULT 0
+COMMIT
+
+:VERSION 28         #---------------------
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims 
+ADD CONSTRAINT DF_prims_CreatorID 
+DEFAULT '00000000-0000-0000-0000-000000000000' 
+FOR CreatorID
+
+ALTER TABLE prims  ALTER COLUMN CreatorID uniqueidentifier NOT NULL
+
+ALTER TABLE primitems
+ADD CONSTRAINT DF_primitems_CreatorID 
+DEFAULT '00000000-0000-0000-0000-000000000000' 
+FOR CreatorID
+
+ALTER TABLE primitems ALTER COLUMN CreatorID uniqueidentifier NOT NULL
+
+COMMIT

OpenSim/Data/MSSQL/Resources/UserAccount.migrations

@@ -19,7 +19,7 @@ CREATE TABLE [UserAccounts] (
 :VERSION 2
 
 BEGIN TRANSACTION
-
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[users]') AND type in (N'U'))
 INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created) SELECT [UUID] AS PrincipalID, '00000000-0000-0000-0000-000000000000' AS ScopeID, 
 username AS FirstName, 
 lastname AS LastName, 

OpenSim/Data/MySQL/MySQLGenericTableHandler.cs

@@ -264,18 +264,33 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public virtual bool Delete(string field, string val)
+        public virtual bool Delete(string field, string key)
         {
+            return Delete(new string[] { field }, new string[] { key });
+        }
+
+        public virtual bool Delete(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return false;
+
+            List<string> terms = new List<string>();
+
             using (MySqlCommand cmd = new MySqlCommand())
             {
+                for (int i = 0 ; i < fields.Length ; i++)
+                {
+                    cmd.Parameters.AddWithValue(fields[i], keys[i]);
+                    terms.Add("`" + fields[i] + "` = ?" + fields[i]);
+                }
 
-                cmd.CommandText = String.Format("delete from {0} where `{1}` = ?{1}", m_Realm, field);
-                cmd.Parameters.AddWithValue(field, val);
+                string where = String.Join(" and ", terms.ToArray());
 
-                if (ExecuteNonQuery(cmd) > 0)
-                    return true;
+                string query = String.Format("delete from {0} where {1}", m_Realm, where);
 
-                return false;
+                cmd.CommandText = query;
+
+                return ExecuteNonQuery(cmd) > 0;
             }
         }
     }

OpenSim/Data/MySQL/MySQLXInventoryData.cs

@@ -85,11 +85,21 @@ namespace OpenSim.Data.MySQL
             return m_Folders.Delete(field, val);
         }
 
+        public bool DeleteFolders(string[] fields, string[] vals)
+        {
+            return m_Folders.Delete(fields, vals);
+        }
+
         public bool DeleteItems(string field, string val)
         {
             return m_Items.Delete(field, val);
         }
 
+        public bool DeleteItems(string[] fields, string[] vals)
+        {
+            return m_Items.Delete(fields, vals);
+        }
+
         public bool MoveItem(string id, string newParent)
         {
             return m_Items.MoveItem(id, newParent);

OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs

@@ -258,17 +258,33 @@ namespace OpenSim.Data.SQLite
             return false;
         }
 
-        public bool Delete(string field, string val)
+        public virtual bool Delete(string field, string key)
         {
+            return Delete(new string[] { field }, new string[] { key });
+        }        
+
+        public bool Delete(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return false;
+
+            List<string> terms = new List<string>();
+
             SqliteCommand cmd = new SqliteCommand();
 
-            cmd.CommandText = String.Format("delete from {0} where `{1}` = :{1}", m_Realm, field);
-            cmd.Parameters.Add(new SqliteParameter(field, val));
+            for (int i = 0 ; i < fields.Length ; i++)
+            {
+                cmd.Parameters.Add(new SqliteParameter(":" + fields[i], keys[i]));
+                terms.Add("`" + fields[i] + "` = :" + fields[i]);
+            }
 
-            if (ExecuteNonQuery(cmd, m_Connection) > 0)
-                return true;
+            string where = String.Join(" and ", terms.ToArray());
 
-            return false;
+            string query = String.Format("delete * from {0} where {1}", m_Realm, where);
+
+            cmd.CommandText = query;
+
+            return ExecuteNonQuery(cmd, m_Connection) > 0;
         }
     }
 }

OpenSim/Data/SQLite/SQLiteXInventoryData.cs

@@ -91,11 +91,21 @@ namespace OpenSim.Data.SQLite
             return m_Folders.Delete(field, val);
         }
 
+        public bool DeleteFolders(string[] fields, string[] vals)
+        {
+            return m_Folders.Delete(fields, vals);
+        }
+
         public bool DeleteItems(string field, string val)
         {
             return m_Items.Delete(field, val);
         }
 
+        public bool DeleteItems(string[] fields, string[] vals)
+        {
+            return m_Items.Delete(fields, vals);
+        }        
+
         public bool MoveItem(string id, string newParent)
         {
             return m_Items.MoveItem(id, newParent);

OpenSim/Framework/Console/CommandConsole.cs

@@ -592,9 +592,7 @@ namespace OpenSim.Framework.Console
             string line = ReadLine(m_defaultPrompt + "# ", true, true);
 
             if (line != String.Empty)
-            {
-                m_log.Info("[CONSOLE] Invalid command");
-            }
+                Output("Invalid command");
         }
 
         public void RunCommand(string cmd)

OpenSim/Framework/IClientAPI.cs

@@ -77,7 +77,7 @@ namespace OpenSim.Framework
 
     public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag);
 
-    public delegate void RequestMapName(IClientAPI remoteClient, string mapName);
+    public delegate void RequestMapName(IClientAPI remoteClient, string mapName, uint flags);
 
     public delegate void TeleportLocationRequest(
         IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags);

OpenSim/Framework/RegionInfo.cs

@@ -96,251 +96,6 @@ namespace OpenSim.Framework
 
     }
 
-    [Serializable]
-    public class SimpleRegionInfo
-    {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
-        /// </summary>
-        public uint HttpPort
-        {
-            get { return m_httpPort; }
-            set { m_httpPort = value; }
-        }
-        protected uint m_httpPort;
-
-        /// <summary>
-        /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
-        /// </summary>
-        public string ServerURI
-        {
-            get { 
-                if ( m_serverURI != string.Empty ) {
-                    return m_serverURI;
-                } else {
-                    return "http://" + m_externalHostName + ":" + m_httpPort + "/";
-                }
-            }
-            set { 
-                if ( value.EndsWith("/") ) {
-                    m_serverURI = value;
-                } else {
-                    m_serverURI = value + '/';
-                }
-            }
-        }
-        protected string m_serverURI;
-
-        public string RegionName
-        {
-            get { return m_regionName; }
-            set { m_regionName = value; }
-        }
-        protected string m_regionName = String.Empty;
-
-        protected bool Allow_Alternate_Ports;
-        public bool m_allow_alternate_ports;
-        protected string m_externalHostName;
-
-        protected IPEndPoint m_internalEndPoint;
-        protected uint? m_regionLocX;
-        protected uint? m_regionLocY;
-        protected uint m_remotingPort;
-        public UUID RegionID = UUID.Zero;
-        public string RemotingAddress;
-        public UUID ScopeID = UUID.Zero;
-
-        public SimpleRegionInfo()
-        {
-            m_serverURI = string.Empty;
-        }
-
-        public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
-        {
-            m_regionLocX = regionLocX;
-            m_regionLocY = regionLocY;
-
-            m_internalEndPoint = internalEndPoint;
-            m_externalHostName = externalUri;
-            m_serverURI = string.Empty;
-        }
-
-        public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port)
-        {
-            m_regionLocX = regionLocX;
-            m_regionLocY = regionLocY;
-
-            m_externalHostName = externalUri;
-
-            m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
-            m_serverURI = string.Empty;
-        }
-
-        public SimpleRegionInfo(RegionInfo ConvertFrom)
-        {
-            m_regionName = ConvertFrom.RegionName;
-            m_regionLocX = ConvertFrom.RegionLocX;
-            m_regionLocY = ConvertFrom.RegionLocY;
-            m_internalEndPoint = ConvertFrom.InternalEndPoint;
-            m_externalHostName = ConvertFrom.ExternalHostName;
-            m_remotingPort = ConvertFrom.RemotingPort;
-            m_httpPort = ConvertFrom.HttpPort;
-            m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
-            RemotingAddress = ConvertFrom.RemotingAddress;
-            RegionID = UUID.Zero;
-            ServerURI = ConvertFrom.ServerURI;
-        }
-
-        public uint RemotingPort
-        {
-            get { return m_remotingPort; }
-            set { m_remotingPort = value; }
-        }
-
-        /// <value>
-        /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw.
-        ///
-        /// XXX Isn't this really doing too much to be a simple getter, rather than an explict method?
-        /// </value>
-        public IPEndPoint ExternalEndPoint
-        {
-            get
-            {
-                // Old one defaults to IPv6
-                //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port);
-
-                IPAddress ia = null;
-                // If it is already an IP, don't resolve it - just return directly
-                if (IPAddress.TryParse(m_externalHostName, out ia))
-                    return new IPEndPoint(ia, m_internalEndPoint.Port);
-
-                // Reset for next check
-                ia = null;
-                try
-                {
-                    foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
-                    {
-                        if (ia == null)
-                            ia = Adr;
-
-                        if (Adr.AddressFamily == AddressFamily.InterNetwork)
-                        {
-                            ia = Adr;
-                            break;
-                        }
-                    }
-                }
-                catch (SocketException e)
-                {
-                    throw new Exception(
-                        "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" +
-                        e + "' attached to this exception", e);
-                }
-
-                return new IPEndPoint(ia, m_internalEndPoint.Port);
-            }
-
-            set { m_externalHostName = value.ToString(); }
-        }
-
-        public string ExternalHostName
-        {
-            get { return m_externalHostName; }
-            set { m_externalHostName = value; }
-        }
-
-        public IPEndPoint InternalEndPoint
-        {
-            get { return m_internalEndPoint; }
-            set { m_internalEndPoint = value; }
-        }
-
-        public uint RegionLocX
-        {
-            get { return m_regionLocX.Value; }
-            set { m_regionLocX = value; }
-        }
-
-        public uint RegionLocY
-        {
-            get { return m_regionLocY.Value; }
-            set { m_regionLocY = value; }
-        }
-
-        public ulong RegionHandle
-        {
-            get { return Util.UIntsToLong((RegionLocX * (uint) Constants.RegionSize), (RegionLocY * (uint) Constants.RegionSize)); }
-        }
-
-        public int getInternalEndPointPort()
-        {
-            return m_internalEndPoint.Port;
-        }
-
-        public Dictionary<string, object> ToKeyValuePairs()
-        {
-            Dictionary<string, object> kvp = new Dictionary<string, object>();
-            kvp["uuid"] = RegionID.ToString();
-            kvp["locX"] = RegionLocX.ToString();
-            kvp["locY"] = RegionLocY.ToString();
-            kvp["external_ip_address"] = ExternalEndPoint.Address.ToString();
-            kvp["external_port"] = ExternalEndPoint.Port.ToString();
-            kvp["external_host_name"] = ExternalHostName;
-            kvp["http_port"] = HttpPort.ToString();
-            kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
-            kvp["internal_port"] = InternalEndPoint.Port.ToString();
-            kvp["alternate_ports"] = m_allow_alternate_ports.ToString();
-            kvp["server_uri"] = ServerURI;
-
-            return kvp;
-        }
-
-        public SimpleRegionInfo(Dictionary<string, object> kvp)
-        {
-            if ((kvp["external_ip_address"] != null) && (kvp["external_port"] != null))
-            {
-                int port = 0;
-                Int32.TryParse((string)kvp["external_port"], out port);
-                IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["external_ip_address"]), port);
-                ExternalEndPoint = ep;
-            }
-            else
-                ExternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
-
-            if (kvp["external_host_name"] != null)
-                ExternalHostName = (string)kvp["external_host_name"];
-
-            if (kvp["http_port"] != null)
-            {
-                UInt32 port = 0;
-                UInt32.TryParse((string)kvp["http_port"], out port);
-                HttpPort = port;
-            }
-
-            if ((kvp["internal_ip_address"] != null) && (kvp["internal_port"] != null))
-            {
-                int port = 0;
-                Int32.TryParse((string)kvp["internal_port"], out port);
-                IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["internal_ip_address"]), port);
-                InternalEndPoint = ep;
-            }
-            else
-                InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
-
-            if (kvp["alternate_ports"] != null)
-            {
-                bool alts = false;
-                Boolean.TryParse((string)kvp["alternate_ports"], out alts);
-                m_allow_alternate_ports = alts;
-            }
-
-            if (kvp["server_uri"] != null)
-                ServerURI = (string)kvp["server_uri"];
-        }
-    }
-
     public class RegionInfo
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

OpenSim/Framework/Servers/VersionInfo.cs

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

OpenSim/Framework/WebUtil.cs

@@ -140,19 +140,19 @@ namespace OpenSim.Framework
         /// PUT JSON-encoded data to a web service that returns LLSD or
         /// JSON data
         /// </summary>
-        public static OSDMap PutToService(string url, OSDMap data)
+        public static OSDMap PutToService(string url, OSDMap data, int timeout)
         {
-            return ServiceOSDRequest(url,data,"PUT",10000);
+            return ServiceOSDRequest(url,data, "PUT", timeout);
         }
-        
-        public static OSDMap PostToService(string url, OSDMap data)
+
+        public static OSDMap PostToService(string url, OSDMap data, int timeout)
         {
-            return ServiceOSDRequest(url,data,"POST",10000);
+            return ServiceOSDRequest(url, data, "POST", timeout);
         }
-        
-        public static OSDMap GetFromService(string url)
+
+        public static OSDMap GetFromService(string url, int timeout)
         {
-            return ServiceOSDRequest(url,null,"GET",10000);
+            return ServiceOSDRequest(url, null, "GET", timeout);
         }
         
         public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@@ -809,7 +809,7 @@ namespace OpenSim.Framework
             {
                 if ((verb == "POST") || (verb == "PUT"))
                 {
-                    request.ContentType = "text/www-form-urlencoded";
+                    request.ContentType = "application/x-www-form-urlencoded";
 
                     int length = 0;
                     using (StreamWriter writer = new StreamWriter(buffer))
@@ -944,7 +944,7 @@ namespace OpenSim.Framework
             {
                 using (WebResponse resp = request.GetResponse())
                 {
-                    if (resp.ContentLength > 0)
+                    if (resp.ContentLength != 0)
                     {
                         Stream respStream = resp.GetResponseStream();
                         XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));

OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs

@@ -1358,7 +1358,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
         {
-
             MapBlockData[] mapBlocks2 = mapBlocks.ToArray();
 
             int maxsend = 10;
@@ -1608,14 +1607,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]);
                 else
                 {
+//                    m_log.DebugFormat(
+//                        "[LLCLIENTVIEW]: Sending inventory folder details packet to {0} for folder {1}", Name, folderID);
                     OutPacket(currentPacket, ThrottleOutPacketType.Asset, false);
                     currentPacket = null;
                 }
-
             }
 
             if (currentPacket != null)
+            {
+//                m_log.DebugFormat(
+//                    "[LLCLIENTVIEW]: Sending inventory folder details packet to {0} for folder {1}", Name, folderID);
                 OutPacket(currentPacket, ThrottleOutPacketType.Asset, false);
+            }
         }
 
         private InventoryDescendentsPacket.FolderDataBlock CreateFolderDataBlock(InventoryFolderBase folder)
@@ -4764,7 +4768,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             data.RelativePosition.ToBytes(objectData, 0);
             data.Velocity.ToBytes(objectData, 12);
             data.Acceleration.ToBytes(objectData, 24);
-            data.RotationOffset.ToBytes(objectData, 36);
+            try
+            {
+                data.RotationOffset.ToBytes(objectData, 36);
+            }
+            catch (Exception e)
+            {
+                m_log.Warn("[LLClientView]: exception converting quaternion to bytes, using Quaternion.Identity. Exception: " + e.ToString());
+                OpenMetaverse.Quaternion.Identity.ToBytes(objectData, 36);
+            }
             data.AngularVelocity.ToBytes(objectData, 48);
 
             ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -5882,7 +5894,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 AvatarWearingArgs wearingArgs = new AvatarWearingArgs();
                 for (int i = 0; i < nowWearing.WearableData.Length; i++)
                 {
-                    m_log.DebugFormat("[XXX]: Wearable type {0} item {1}", nowWearing.WearableData[i].WearableType, nowWearing.WearableData[i].ItemID);
+                    //m_log.DebugFormat("[XXX]: Wearable type {0} item {1}", nowWearing.WearableData[i].WearableType, nowWearing.WearableData[i].ItemID);
                     AvatarWearingArgs.Wearable wearable =
                         new AvatarWearingArgs.Wearable(nowWearing.WearableData[i].ItemID,
                                                        nowWearing.WearableData[i].WearableType);
@@ -8164,13 +8176,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     return true;
             }
             #endregion
-
             string mapName = Util.UTF8.GetString(map.NameData.Name, 0,
                                                      map.NameData.Name.Length - 1);
             RequestMapName handlerMapNameRequest = OnMapNameRequest;
             if (handlerMapNameRequest != null)
             {
-                handlerMapNameRequest(this, mapName);
+                handlerMapNameRequest(this, mapName, map.AgentData.Flags);
             }
             return true;
         }

OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs

@@ -41,8 +41,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
     /// </summary>
     public class AgentAssetTransactions
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(
-//                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         // Fields
         private bool m_dumpAssetsToFile;
@@ -149,6 +148,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
                 if (asset != null)
                 {
+//                    m_log.DebugFormat(
+//                        "[AGENT ASSETS TRANSACTIONS]: Updating item {0} in {1} for transaction {2}", 
+//                        item.Name, part.Name, transactionID);
+                    
                     asset.FullID = UUID.Random();
                     asset.Name = item.Name;
                     asset.Description = item.Description;
@@ -156,8 +159,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                     item.AssetID = asset.FullID;
 
                     m_Scene.AssetService.Store(asset);
-
-                    part.Inventory.UpdateInventoryItem(item);
                 }
             }
         }

OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs

@@ -64,8 +64,8 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
             m_scene = scene;
             m_scene.RegisterModuleInterface<ICapabilitiesModule>(this);
             MainConsole.Instance.Commands.AddCommand("Capabilities", false, "show caps",
-                "show capabilities",
-                "Shows all  registered capabilities", CapabilitiesCommand);
+                "show caps",
+                "Shows all registered capabilities", CapabilitiesCommand);
         }
 
         public void RegionLoaded(Scene scene)

OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs

@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
             if (meshConfig == null)
                 return;
 
-            m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
+            m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
         }
 
         public void AddRegion(Scene pScene)

OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs

@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
             if (meshConfig == null)
                 return;
 
-            m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
+            m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
         }
 
         public void AddRegion(Scene pScene)

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs

@@ -150,7 +150,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             string serialization = UserInventoryItemSerializer.Serialize(inventoryItem, options, userAccountService);
             m_archiveWriter.WriteFile(filename, serialization);
 
-            m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids);
+            AssetType itemAssetType = (AssetType)inventoryItem.AssetType;
+            
+            // Don't chase down link asset items as they actually point to their target item IDs rather than an asset
+            if (itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder)
+                m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids);
         }
 
         /// <summary>

OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs

@@ -371,7 +371,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             }
 
             // This is a hook to do some per-asset post-processing for subclasses that need that
-            ExportAsset(remoteClient.AgentId, assetID);
+            if (remoteClient != null)
+                ExportAsset(remoteClient.AgentId, assetID);
             
             return assetID;
         }

OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs

@@ -62,8 +62,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
         {
             List<MapBlockData> mapBlocks = new List<MapBlockData>();
             List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                (minX - 4) * (int)Constants.RegionSize, (maxX + 4) * (int)Constants.RegionSize, 
-                (minY - 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize);
+                minX * (int)Constants.RegionSize, maxX * (int)Constants.RegionSize, 
+                minY * (int)Constants.RegionSize, maxY * (int)Constants.RegionSize);
 
             foreach (GridRegion r in regions)
             {
@@ -76,7 +76,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             FillInMap(mapBlocks, minX, minY, maxX, maxY);
             //
 
-            remoteClient.SendMapBlock(mapBlocks, flag);
+            remoteClient.SendMapBlock(mapBlocks, 0);
         }
 
 
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
                         mblock.X = (ushort)x;
                         mblock.Y = (ushort)y;
                         mblock.Name = "";
-                        mblock.Access = 254; // not here???
+                        mblock.Access = 254; // means 'simulator is offline'. We need this because the viewer ignores 255's
                         mblock.MapImageId = UUID.Zero;
                         mapBlocks.Add(mblock);
                     }

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs

@@ -182,9 +182,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
             InventoryCollection invCol = m_InventoryService.GetFolderContent(userID, folderID);
-            if (UserManager != null)
-                foreach (InventoryItemBase item in invCol.Items)
-                    UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+            Util.FireAndForget(delegate
+            {
+                if (UserManager != null)
+                    foreach (InventoryItemBase item in invCol.Items)
+                        UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+            });
 
             return invCol;
         }

OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs

@@ -46,10 +46,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private bool m_Enabled = false;
-        private bool m_Initialized = false;
-//        private Scene m_Scene;
+        private Scene m_Scene;
         private XInventoryServicesConnector m_RemoteConnector;
 
+        private IUserManagement m_UserManager;
+        private IUserManagement UserManager
+        {
+            get
+            {
+                if (m_UserManager == null)
+                {
+                    m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>();
+                }
+                return m_UserManager;
+            }
+        }
+
         public Type ReplaceableInterface 
         {
             get { return null; }
@@ -114,12 +126,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if (!m_Enabled)
                 return;
 
-            if (!m_Initialized)
-            {
-                m_Initialized = true;
-            }
-
             scene.RegisterModuleInterface<IInventoryService>(this);
+
+            if (m_Scene == null)
+                m_Scene = scene;
         }
 
         public void RemoveRegion(Scene scene)
@@ -173,7 +183,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public  InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
-            return m_RemoteConnector.GetFolderContent(userID, folderID);
+            InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID);
+            Util.FireAndForget(delegate
+            {
+                if (UserManager != null)
+                    foreach (InventoryItemBase item in invCol.Items)
+                        UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+            });
+
+            return invCol;
         }
 
         public  List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)

OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs

@@ -347,12 +347,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 
                 landData.Add(parcel);
             }
-            
-            if (!m_merge)                
-                m_scene.LandChannel.Clear(false);
+
+            if (!m_merge)
+            {
+                bool setupDefaultParcel = (landData.Count == 0);
+                m_scene.LandChannel.Clear(setupDefaultParcel);
+            }
             
             m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData);
-            m_log.InfoFormat("[ARCHIVER]: Restored {0} parcels.", landData.Count);            
+            m_log.InfoFormat("[ARCHIVER]: Restored {0} parcels.", landData.Count);
         }
 
         /// <summary>

OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs

@@ -230,6 +230,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <param name="asset"></param>
         public void AssetRequestCallback(string id, object sender, AssetBase asset)
         {
+            Culture.SetCurrentCulture();
+            
             try
             {
                 lock (this)
@@ -293,6 +295,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </summary>
         protected void PerformAssetsRequestCallback(object o)
         {
+            Culture.SetCurrentCulture();
+
             try
             {
                 m_assetsRequestCallback(m_foundAssetUuids, m_notFoundAssetUuids);

OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs

@@ -313,6 +313,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.That(loadedSoundAsset, Is.Not.Null, "loaded sound asset was null");
             Assert.That(loadedSoundAsset.Data, Is.EqualTo(soundData), "saved and loaded sound data do not match");
 
+            Assert.Greater(m_scene.LandChannel.AllParcels().Count, 0, "incorrect number of parcels");
+
             // Temporary
             Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
         }

OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs

@@ -668,14 +668,14 @@ namespace OpenSim.Region.CoreModules.World.Land
                     //m_scene.SimulationDataService.RemoveLandObject(lo.LandData.GlobalID);
                     m_scene.EventManager.TriggerLandObjectRemoved(lo.LandData.GlobalID);
                 }
-                
+
                 m_landList.Clear();
+
+                ResetSimLandObjects();
+
+                if (setupDefaultParcel)
+                    CreateDefaultParcel();
             }
-            
-            ResetSimLandObjects();
-            
-            if (setupDefaultParcel)
-                CreateDefaultParcel();
         }
 
         private void performFinalLandJoin(ILandObject master, ILandObject slave)
@@ -1391,8 +1391,11 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void EventManagerOnNoLandDataFromStorage()
         {
-            ResetSimLandObjects();
-            CreateDefaultParcel();
+            lock (m_landList)
+            {
+                ResetSimLandObjects();
+                CreateDefaultParcel();
+            }
         }
 
         #endregion

OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs

@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             client.OnMapNameRequest += OnMapNameRequest;
         }
 
-        private void OnMapNameRequest(IClientAPI remoteClient, string mapName)
+        private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags)
         {
             if (mapName.Length < 3)
             {
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             else if (regionInfos.Count == 0 && mapName.StartsWith("http://"))
                 remoteClient.SendAlertMessage("Hyperlink could not be established.");
 
-            m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
+            m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions. Flags={2}", mapName, regionInfos.Count, flags);
             List<MapBlockData> blocks = new List<MapBlockData>();
 
             MapBlockData data;
@@ -117,7 +117,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     data = new MapBlockData();
                     data.Agents = 0;
                     data.Access = info.Access;
-                    data.MapImageId = UUID.Zero; // could use info.TerrainImage but it seems to break viewer2
+                    if (flags == 2) // V2 sends this
+                        data.MapImageId = UUID.Zero; 
+                    else
+                        data.MapImageId = info.TerrainImage;
                     data.Name = info.RegionName;
                     data.RegionFlags = 0; // TODO not used?
                     data.WaterHeight = 0; // not used
@@ -139,9 +142,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             data.Y = 0;
             blocks.Add(data);
 
-            // not sure what the flags do here, but seems to be necessary
-            // to set to "2" for viewer 2
-            remoteClient.SendMapBlock(blocks, 2);
+            // flags are agent flags sent from the viewer.
+            // they have different values depending on different viewers, apparently
+            remoteClient.SendMapBlock(blocks, flags);
         }
 
 //        private Scene GetClientScene(IClientAPI client)

OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

@@ -205,8 +205,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
             //try
             //{
-                //m_log.DebugFormat("[MAPLAYER]: request: {0}, path: {1}, param: {2}, agent:{3}",
-                                  //request, path, param,agentID.ToString());
+            //m_log.DebugFormat("[MAPLAYER]: path: {0}, param: {1}, agent:{2}",
+            //                  path, param, agentID.ToString());
 
             // this is here because CAPS map requests work even beyond the 10,000 limit.
             ScenePresence avatarPresence = null;
@@ -784,7 +784,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <param name="maxY"></param>
         public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
-            if ((flag & 0x10000) != 0)  // user clicked on the map a tile that isn't visible
+            //m_log.ErrorFormat("[YYY] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
+            if ((flag & 0x10000) != 0)  // user clicked on qthe map a tile that isn't visible
             {
                 List<MapBlockData> response = new List<MapBlockData>();
 
@@ -819,7 +820,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     MapBlockData block = new MapBlockData();
                     block.X = (ushort)minX;
                     block.Y = (ushort)minY;
-                    block.Access = 254; // == not there
+                    block.Access = 254; // means 'simulator is offline'
                     response.Add(block);
                 }
                 remoteClient.SendMapBlock(response, 0);
@@ -845,7 +846,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 MapBlockFromGridRegion(block, r);
                 mapBlocks.Add(block);
             }
-            remoteClient.SendMapBlock(mapBlocks, flag);
+            remoteClient.SendMapBlock(mapBlocks, 0);
         }
 
         protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r)

OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

@@ -713,7 +713,7 @@ namespace OpenSim.Region.Framework.Scenes
                     newName = item.Name;
                 }
 
-                if (remoteClient.AgentId == oldAgentID)
+                if (remoteClient.AgentId == oldAgentID || (LibraryService != null && LibraryService.LibraryRootFolder != null && oldAgentID == LibraryService.LibraryRootFolder.Owner))
                 {
                     CreateNewInventoryItem(
                         remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType,
@@ -904,11 +904,29 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        /// <summary>
+        /// Link an inventory item to an existing item.
+        /// </summary>
+        /// <remarks>
+        /// The linkee item id is placed in the asset id slot.  This appears to be what the viewer expects when
+        /// it receives inventory information.
+        /// </remarks>
+        /// <param name="remoteClient"></param>
+        /// <param name="transActionID"></param>
+        /// <param name="folderID"></param>
+        /// <param name="callbackID"></param>
+        /// <param name="description"></param>
+        /// <param name="name"></param>
+        /// <param name="invType"></param>
+        /// <param name="type">/param>
+        /// <param name="olditemID"></param>
         private void HandleLinkInventoryItem(IClientAPI remoteClient, UUID transActionID, UUID folderID,
                                              uint callbackID, string description, string name,
                                              sbyte invType, sbyte type, UUID olditemID)
         {
-            m_log.DebugFormat("[AGENT INVENTORY]: Received request to create inventory item link {0} in folder {1} pointing to {2}", name, folderID, olditemID);
+//            m_log.DebugFormat(
+//                "[AGENT INVENTORY]: Received request from {0} to create inventory item link {1} in folder {2} pointing to {3}",
+//                remoteClient.Name, name, folderID, olditemID);
 
             if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
                 return;
@@ -916,7 +934,25 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence presence;
             if (TryGetScenePresence(remoteClient.AgentId, out presence))
             {
-//                byte[] data = null;
+                // Disabled the check for duplicate links.
+                //
+                // When outfits are being adjusted, the viewer rapidly sends delete link messages followed by
+                // create links.  However, since these are handled asynchronously, the deletes do not complete before
+                // the creates are handled.  Therefore, we cannot enforce a duplicate link check.
+//                InventoryItemBase existingLink = null;
+//                List<InventoryItemBase> existingItems = InventoryService.GetFolderItems(remoteClient.AgentId, folderID);
+//                foreach (InventoryItemBase item in existingItems)
+//                    if (item.AssetID == olditemID)
+//                        existingLink = item;
+//
+//                if (existingLink != null)
+//                {
+//                    m_log.WarnFormat(
+//                        "[AGENT INVENTORY]: Ignoring request from {0} to create item link {1} in folder {2} pointing to {3} since a link named {4} with id {5} already exists",
+//                        remoteClient.Name, name, folderID, olditemID, existingLink.Name, existingLink.ID);
+//
+//                    return;
+//                }
 
                 AssetBase asset = new AssetBase();
                 asset.FullID = olditemID;
@@ -944,7 +980,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="itemID"></param>
         private void RemoveInventoryItem(IClientAPI remoteClient, List<UUID> itemIDs)
         {
-            //m_log.Debug("[SCENE INVENTORY]: user " + remoteClient.AgentId);
+//            m_log.DebugFormat(
+//                "[AGENT INVENTORY]: Removing inventory items {0} for {1}",
+//                string.Join(",", itemIDs.ConvertAll<string>(uuid => uuid.ToString()).ToArray()),
+//                remoteClient.Name);
+
             InventoryService.DeleteItems(remoteClient.AgentId, itemIDs);
         }
 
@@ -1351,11 +1391,31 @@ namespace OpenSim.Region.Framework.Scenes
             InventoryFolderBase containingFolder = new InventoryFolderBase(folder.ID, client.AgentId);
             containingFolder = InventoryService.GetFolder(containingFolder);
 
-            //m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}",
-            //    contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName);
+//            m_log.DebugFormat("[AGENT INVENTORY]: Sending inventory folder contents ({0} nodes) for \"{1}\" to {2} {3}",
+//                contents.Folders.Count + contents.Items.Count, containingFolder.Name, client.FirstName, client.LastName);
 
             if (containingFolder != null && containingFolder != null)
+            {
+                // If the folder requested contains links, then we need to send those folders first, otherwise the links
+                // will be broken in the viewer.
+                HashSet<UUID> linkedItemFolderIdsToSend = new HashSet<UUID>();
+                foreach (InventoryItemBase item in contents.Items)
+                {
+                    if (item.AssetType == (int)AssetType.Link)
+                    {
+                        InventoryItemBase linkedItem = InventoryService.GetItem(new InventoryItemBase(item.AssetID));
+
+                        // Take care of genuinely broken links where the target doesn't exist
+                        if (linkedItem != null)
+                            linkedItemFolderIdsToSend.Add(linkedItem.Folder);
+                    }
+                }
+
+                foreach (UUID linkedItemFolderId in linkedItemFolderIdsToSend)
+                    SendInventoryUpdate(client, new InventoryFolderBase(linkedItemFolderId), false, true);
+
                 client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, containingFolder.Version, fetchFolders, fetchItems);
+            }
         }
 
         /// <summary>
@@ -1430,6 +1490,10 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else // Updating existing item with new perms etc
                 {
+//                    m_log.DebugFormat(
+//                        "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()", 
+//                        currentItem.Name, part.Name);
+                    
                     IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
                     if (agentTransactions != null)
                     {
@@ -2039,6 +2103,12 @@ namespace OpenSim.Region.Framework.Scenes
             if (rot != null)
                 group.UpdateGroupRotationR((Quaternion)rot);
             
+            // TODO: This needs to be refactored with the similar code in 
+            // SceneGraph.AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel)
+            // possibly by allowing this method to take a null rotation.
+            if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)
+                group.RootPart.ApplyImpulse((vel * group.GetMass()), false);
+            
             // We can only call this after adding the scene object, since the scene object references the scene
             // to find out if scripts should be activated at all.
             group.CreateScriptInstances(param, true, DefaultScriptEngine, 3);

OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs

@@ -499,6 +499,10 @@ namespace OpenSim.Region.Framework.Scenes
         public void HandleFetchInventoryDescendents(IClientAPI remoteClient, UUID folderID, UUID ownerID,
                                                     bool fetchFolders, bool fetchItems, int sortOrder)
         {
+//            m_log.DebugFormat(
+//                "[USER INVENTORY]: HandleFetchInventoryDescendents() for {0}, folder={1}, fetchFolders={2}, fetchItems={3}, sortOrder={4}",
+//                remoteClient.Name, folderID, fetchFolders, fetchItems, sortOrder);
+
             if (folderID == UUID.Zero)
                 return;
 

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -775,6 +775,8 @@ namespace OpenSim.Region.Framework.Scenes
             m_regInfo = regInfo;
             m_eventManager = new EventManager();
 
+            m_permissions = new ScenePermissions(this);
+
             m_lastUpdate = Util.EnvironmentTickCount();
         }
 

OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

@@ -693,8 +693,9 @@ namespace OpenSim.Region.Framework.Scenes
         {
             TaskInventoryItem it = GetInventoryItem(item.ItemID);
             if (it != null)
-
             {
+//                m_log.DebugFormat("[PRIM INVENTORY]: Updating item {0} in {1}", item.Name, m_part.Name);
+                
                 item.ParentID = m_part.UUID;
                 item.ParentPartID = m_part.UUID;
 
@@ -711,14 +712,16 @@ namespace OpenSim.Region.Framework.Scenes
                     m_items[item.ItemID] = item;
                     m_inventorySerial++;
                 }
-
+                
                 if (fireScriptEvents)
                     m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
+                
                 if (considerChanged)
                 {
                     HasInventoryChanged = true;
                     m_part.ParentGroup.HasGroupChanged = true;
                 }
+                
                 return true;
             }
             else

OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs

@@ -121,7 +121,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
         }
 
-
         /// <summary>
         /// Serialize a scene object to the original xml format
         /// </summary>
@@ -565,7 +564,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
         private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader)
         {
-            obj.Shape = ReadShape(reader, "Shape");
+            bool errors = false;
+            obj.Shape = ReadShape(reader, "Shape", out errors);
+
+            if (errors)
+                m_log.DebugFormat(
+                    "[SceneObjectSerializer]: Parsing PrimitiveBaseShape for object part {0} {1} encountered errors.  Please see earlier log entries.",
+                    obj.Name, obj.UUID);
         }
 
         private static void ProcessScale(SceneObjectPart obj, XmlTextReader reader)
@@ -1435,7 +1440,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     }
                     catch (Exception e)
                     {
-                        m_log.DebugFormat("[SceneObjectSerializer]: exception while parsing {0}: {1}", nodeName, e);
+                        m_log.DebugFormat(
+                            "[SceneObjectSerializer]: exception while parsing {0} in object {1} {2}: {3}{4}",
+                            obj.Name, obj.UUID, nodeName, e.Message, e.StackTrace);
                         if (reader.NodeType == XmlNodeType.EndElement)
                             reader.Read();
                     }
@@ -1493,8 +1500,17 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             return tinv;
         }
 
-        static PrimitiveBaseShape ReadShape(XmlTextReader reader, string name)
+        /// <summary>
+        /// Read a shape from xml input
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="name">The name of the xml element containing the shape</param>
+        /// <param name="errors">true if any errors were encountered during parsing, false otherwise</param>
+        /// <returns>The shape parsed</returns>
+        static PrimitiveBaseShape ReadShape(XmlTextReader reader, string name, out bool errors)
         {
+            errors = false;
+
             PrimitiveBaseShape shape = new PrimitiveBaseShape();
 
             if (reader.IsEmptyElement)
@@ -1519,7 +1535,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     }
                     catch (Exception e)
                     {
-                        m_log.DebugFormat("[SceneObjectSerializer]: exception while parsing Shape {0}: {1}", nodeName, e);
+                        errors = true;
+                        m_log.DebugFormat(
+                            "[SceneObjectSerializer]: exception while parsing Shape property {0}: {1}{2}",
+                            nodeName, e.Message, e.StackTrace);
+
                         if (reader.NodeType == XmlNodeType.EndElement)
                             reader.Read();
                     }

OpenSim/Region/Physics/Meshing/Meshmerizer.cs

@@ -88,7 +88,8 @@ namespace OpenSim.Region.Physics.Meshing
 
             decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
             cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
-            useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
+            if(mesh_config != null)
+                useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
 
             try
             {

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -9908,8 +9908,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llGetParcelMaxPrims(LSL_Vector pos, int sim_wide)
         {
             m_host.AddScriptLPS(1);
-            // Alondria: This currently just is utilizing the normal grid's 0.22 prims/m2 calculation
-            // Which probably will be irrelevent in OpenSim....
+
             LandData land = World.GetLandData((float)pos.x, (float)pos.y);
 
             float bonusfactor = (float)World.RegionInfo.RegionSettings.ObjectBonus;
@@ -9921,16 +9920,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (sim_wide != 0)
             {
-                decimal v = land.SimwideArea * (decimal)(0.22) * (decimal)bonusfactor;
+                int v = (int)((land.SimwideArea / 65536.0f) * (float)World.RegionInfo.ObjectCapacity * bonusfactor);
 
-                return (int)v;
+                return v;
             }
 
             else
             {
-                decimal v = land.Area * (decimal)(0.22) * (decimal)bonusfactor;
+                int v = (int)((land.Area / 65536.0f) * (float)World.RegionInfo.ObjectCapacity * bonusfactor);
 
-                return (int)v;
+                return v;
             }
 
         }

OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs

@@ -30,6 +30,7 @@ using System.Collections;
 using System.IO;
 using System.Net;
 using System.Reflection;
+using System.Security;
 using System.Text;
 using log4net;
 using Nini.Config;
@@ -143,7 +144,7 @@ namespace OpenSim.Server.Handlers.Grid
             sb.Append("<gridinfo>\n");
             foreach (string k in _info.Keys)
             {
-                sb.AppendFormat("<{0}>{1}</{0}>\n", k, _info[k]);
+                sb.AppendFormat("<{0}>{1}</{0}>\n", k, SecurityElement.Escape(_info[k].ToString()));
             }
             sb.Append("</gridinfo>\n");
 

OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs

@@ -314,7 +314,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
                 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
                 args["teleport_flags"] = OSD.FromString(flags.ToString());
 
-                OSDMap result = WebUtil.PostToService(uri,args);
+                OSDMap result = WebUtil.PostToService(uri, args, 20000);
                 if (result["Success"].AsBoolean())
                 {
                     OSDMap unpacked = (OSDMap)result["_Result"];

OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs

@@ -158,7 +158,10 @@ namespace OpenSim.Services.Connectors
         public InventoryCollection GetFolderContent(UUID principalID, UUID folderID)
         {
             InventoryCollection inventory = new InventoryCollection();
-            
+            inventory.Folders = new List<InventoryFolderBase>();
+            inventory.Items = new List<InventoryItemBase>();
+            inventory.UserID = principalID;
+
             try
             {
                 Dictionary<string,object> ret = MakeRequest("GETFOLDERCONTENT",
@@ -172,11 +175,6 @@ namespace OpenSim.Services.Connectors
                 if (ret.Count == 0)
                     return null;
 
-                
-                inventory.Folders = new List<InventoryFolderBase>();
-                inventory.Items = new List<InventoryItemBase>();
-                inventory.UserID = principalID;
-                
                 Dictionary<string,object> folders =
                         (Dictionary<string,object>)ret["FOLDERS"];
                 Dictionary<string,object> items =

OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs

@@ -102,7 +102,7 @@ namespace OpenSim.Services.Connectors.Simulation
                 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
                 args["teleport_flags"] = OSD.FromString(flags.ToString());
 
-                OSDMap result = WebUtil.PostToService(uri,args);
+                OSDMap result = WebUtil.PostToService(uri, args, 20000);
                 if (result["Success"].AsBoolean())
                     return true;
                 
@@ -126,7 +126,7 @@ namespace OpenSim.Services.Connectors.Simulation
         /// </summary>
         public bool UpdateAgent(GridRegion destination, AgentData data)
         {
-            return UpdateAgent(destination, (IAgentData)data);
+            return UpdateAgent(destination, (IAgentData)data, 200000); // yes, 200 seconds
         }
 
         /// <summary>
@@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors.Simulation
                     }
                 }
 
-                UpdateAgent(destination,(IAgentData)pos);
+                UpdateAgent(destination, (IAgentData)pos, 10000);
             }
 
             // unreachable
@@ -191,7 +191,7 @@ namespace OpenSim.Services.Connectors.Simulation
         /// <summary>
         /// This is the worker function to send AgentData to a neighbor region
         /// </summary>
-        private bool UpdateAgent(GridRegion destination, IAgentData cAgentData)
+        private bool UpdateAgent(GridRegion destination, IAgentData cAgentData, int timeout)
         {
             // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start");
 
@@ -207,7 +207,7 @@ namespace OpenSim.Services.Connectors.Simulation
                 args["destination_name"] = OSD.FromString(destination.RegionName);
                 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
 
-                OSDMap result = WebUtil.PutToService(uri,args);
+                OSDMap result = WebUtil.PutToService(uri, args, timeout);
                 return result["Success"].AsBoolean();
             }
             catch (Exception e)
@@ -233,7 +233,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
             try
             {
-                OSDMap result = WebUtil.GetFromService(uri);
+                OSDMap result = WebUtil.GetFromService(uri, 10000);
                 if (result["Success"].AsBoolean())
                 {
                     // OSDMap args = Util.GetOSDMap(result["_RawResult"].AsString());
@@ -384,7 +384,7 @@ namespace OpenSim.Services.Connectors.Simulation
                 args["destination_name"] = OSD.FromString(destination.RegionName);
                 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
 
-                WebUtil.PostToService(uri, args);
+                WebUtil.PostToService(uri, args, 40000);
             }
             catch (Exception e)
             {

OpenSim/Services/InventoryService/XInventoryService.cs

@@ -40,9 +40,9 @@ namespace OpenSim.Services.InventoryService
 {
     public class XInventoryService : ServiceBase, IInventoryService
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log =
+//                LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
 
         protected IXInventoryData m_Database;
         protected bool m_AllowDelete = true;
@@ -244,7 +244,7 @@ namespace OpenSim.Services.InventoryService
             // connector. So we disregard the principal and look
             // by ID.
             //
-            m_log.DebugFormat("[XINVENTORY SERVICE]: Fetch contents for folder {0}", folderID.ToString());
+            //m_log.DebugFormat("[XINVENTORY SERVICE]: Fetch contents for folder {0}", folderID.ToString());
             InventoryCollection inventory = new InventoryCollection();
             inventory.UserID = principalID;
             inventory.Folders = new List<InventoryFolderBase>();
@@ -411,12 +411,30 @@ namespace OpenSim.Services.InventoryService
         public virtual bool DeleteItems(UUID principalID, List<UUID> itemIDs)
         {
             if (!m_AllowDelete)
-                return false;
-
-            // Just use the ID... *facepalms*
-            //
-            foreach (UUID id in itemIDs)
-                m_Database.DeleteItems("inventoryID", id.ToString());
+            {
+                // We must still allow links and links to folders to be deleted, otherwise they will build up
+                // in the player's inventory until they can no longer log in.  Deletions of links due to code bugs or
+                // similar is inconvenient but on a par with accidental movement of items.  The original item is never
+                // touched.
+                foreach (UUID id in itemIDs)
+                {
+                    if (!m_Database.DeleteItems(
+                        new string[] { "inventoryID", "assetType" },
+                        new string[] { id.ToString(), ((sbyte)AssetType.Link).ToString() }))
+                    {
+                        m_Database.DeleteItems(
+                            new string[] { "inventoryID", "assetType" },
+                            new string[] { id.ToString(), ((sbyte)AssetType.LinkFolder).ToString() });
+                    }
+                }
+            }
+            else
+            {
+                // Just use the ID... *facepalms*
+                //
+                foreach (UUID id in itemIDs)
+                    m_Database.DeleteItems("inventoryID", id.ToString());
+            }
 
             return true;
         }

OpenSim/Tests/Common/Mock/TestLandChannel.cs

@@ -40,10 +40,12 @@ namespace OpenSim.Tests.Common.Mock
     public class TestLandChannel : ILandChannel
     {
         private Scene m_scene;
+        private List<ILandObject> m_parcels;
 
         public TestLandChannel(Scene scene)
         {
             m_scene = scene;
+            m_parcels = new List<ILandObject>();
         }
 
         public List<ILandObject> ParcelsNearPoint(Vector3 position)
@@ -53,12 +55,19 @@ namespace OpenSim.Tests.Common.Mock
 
         public List<ILandObject> AllParcels()
         {
-            return new List<ILandObject>();
+            return m_parcels;
         }
         
         public void Clear(bool setupDefaultParcel)
         {
-            // Intentionally blank since we don't save any parcel data in the test channel
+            m_parcels.Clear();
+
+            if (setupDefaultParcel)
+            {
+                ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
+                obj.LandData.Name = "Your Parcel";
+                m_parcels.Add(obj);
+            }
         }
 
         protected ILandObject GetNoLand()

README.txt

@@ -37,7 +37,7 @@ Now see the "Configuring OpenSim" section
 === Running OpenSim on Linux ===
 ================================
 
-You will need Mono >= 2.4.2 to run OpenSim.  On some Linux distributions you
+You will need Mono >= 2.4.3 to run OpenSim.  On some Linux distributions you
 may need to install additional packages.  See http://opensimulator.org/wiki/Dependencies
 for more information.
 

bin/OpenSim.exe.config

@@ -14,7 +14,7 @@
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date{HH:mm:ss} - %message" />
         <!-- console log with milliseconds.  Useful for debugging -->
-        <!-- <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
+<!--        <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
       </layout>
     </appender>