10 files changed, 421 insertions, 26 deletions

diff --git a/OpenSim/Framework/IAssetCache.cs b/OpenSim/Framework/IAssetCache.cs
index 8477116..2df9199 100644
--- a/OpenSim/Framework/IAssetCache.cs
+++ b/OpenSim/Framework/IAssetCache.cs
@@ -47,8 +47,9 @@ namespace OpenSim.Framework
         /// Get an asset by its id.
         /// </summary>
         /// <param name='id'></param>
-        /// <returns>null if the asset does not exist.</returns>
-        AssetBase Get(string id);
+        /// <param name='asset'>Will be set to null if no asset was found</param>
+        /// <returns>False if the asset has been negative-cached</returns>
+        bool Get(string id, out AssetBase asset);
 
         /// <summary>
         /// Check whether an asset with the specified id exists in the cache.
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 1267993..5ca8c88 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Framework
     public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
 
     public delegate void DeRezObject(
-        IClientAPI remoteClient, List<uint> localIDs, UUID groupID, DeRezAction action, UUID destinationID);
+        IClientAPI remoteClient, List<uint> localIDs, UUID groupID, DeRezAction action, UUID destinationID, bool AddToReturns = true);
 
     public delegate void GenericCall5(IClientAPI remoteClient, bool status);
 
@@ -685,9 +685,10 @@ namespace OpenSim.Framework
         ExtraData = 1 << 20,
         Sound = 1 << 21,
         Joint = 1 << 22,
-        FullUpdate = 0x3fffffff,
-        CancelKill = 0x7fffffff,
-        Kill = 0x80000000
+        FullUpdate =    0x0fffffff,
+        SendInTransit = 0x20000000, 
+        CancelKill =    0x4fffffff, // 1 << 30 
+        Kill =          0x80000000 // 1 << 31
     }
 
 /* included in .net 4.0
@@ -1112,7 +1113,7 @@ namespace OpenSim.Framework
         /// <param name="localID"></param>
         void SendKillObject(List<uint> localID);
 
-        void SendPartFullUpdate(ISceneEntity ent, uint? parentID);
+//        void SendPartFullUpdate(ISceneEntity ent, uint? parentID);
 
         void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
         void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
@@ -1187,7 +1188,8 @@ namespace OpenSim.Framework
         void SetAgentThrottleSilent(int throttle, int setting);
         int GetAgentThrottleSilent(int throttle);
 
-        void SendAvatarDataImmediate(ISceneEntity avatar);
+        void SendEntityFullUpdateImmediate(ISceneEntity entity);
+        void SendEntityTerseUpdateImmediate(ISceneEntity entity);
 
         /// <summary>
         /// Send a positional, velocity, etc. update to the viewer for a given entity.
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 55c3276..a6b341f 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -47,6 +47,8 @@ namespace OpenSim.Framework.Monitoring
         // Subcommand used to list other stats.
         public const string ListSubCommand = "list";
 
+        public static string StatsPassword { get; set; }
+
         // All subcommands
         public static HashSet<string> SubCommands = new HashSet<string> { AllSubCommand, ListSubCommand };
 
@@ -302,6 +304,17 @@ namespace OpenSim.Framework.Monitoring
             int response_code = 200;
             string contenttype = "text/json";
 
+            if (StatsPassword != String.Empty && (!request.ContainsKey("pass") || request["pass"].ToString() != StatsPassword))
+            {
+                responsedata["int_response_code"] = response_code;
+                responsedata["content_type"] = "text/plain";
+                responsedata["keepalive"] = false;
+                responsedata["str_response_string"] = "Access denied";
+                responsedata["access_control_allow_origin"] = "*";
+
+                return responsedata;
+            }
+
             string pCategoryName = StatsManager.AllSubCommand;
             string pContainerName = StatsManager.AllSubCommand;
             string pStatName = StatsManager.AllSubCommand;
diff --git a/OpenSim/Framework/OutboundUrlFilter.cs b/OpenSim/Framework/OutboundUrlFilter.cs
index ee4707f..63ae361 100644
--- a/OpenSim/Framework/OutboundUrlFilter.cs
+++ b/OpenSim/Framework/OutboundUrlFilter.cs
@@ -212,7 +212,17 @@ namespace OpenSim.Framework
             // Check that we are permitted to make calls to this endpoint.
             bool foundIpv4Address = false;
 
-            IPAddress[] addresses = Dns.GetHostAddresses(url.Host);
+            IPAddress[] addresses = null;
+            
+            try
+            {
+                addresses = Dns.GetHostAddresses(url.Host);
+            }
+            catch
+            {
+                // If there is a DNS error, we can't stop the script!
+                return true;
+            }
 
             foreach (IPAddress addr in addresses)
             {
@@ -253,4 +263,4 @@ namespace OpenSim.Framework
             return allowed;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/PhysicsInertia.cs b/OpenSim/Framework/PhysicsInertia.cs
new file mode 100644
index 0000000..af70634
--- /dev/null
+++ b/OpenSim/Framework/PhysicsInertia.cs
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+using System.Text;
+using System.IO;
+using System.Xml;
+
+namespace OpenSim.Framework
+{
+    public class PhysicsInertiaData
+    {
+        public float TotalMass; // the total mass of a linkset
+        public Vector3 CenterOfMass;  // the center of mass position relative to root part position
+        public Vector3 Inertia; //  (Ixx, Iyy, Izz) moment of inertia relative to center of mass and principal axis in local coords
+        public Vector4 InertiaRotation; // if principal axis don't match local axis, the principal axis rotation
+                                        // or the upper triangle of the inertia tensor 
+                                        // Ixy (= Iyx), Ixz (= Izx), Iyz (= Izy))
+
+        public PhysicsInertiaData()
+        {
+        }
+
+        public PhysicsInertiaData(PhysicsInertiaData source)
+        {
+           TotalMass = source.TotalMass;
+           CenterOfMass = source.CenterOfMass;
+           Inertia = source.Inertia;
+           InertiaRotation = source.InertiaRotation;
+        }
+
+        private XmlTextWriter writer;
+
+        private void XWint(string name, int i)
+        {
+            writer.WriteElementString(name, i.ToString());
+        }
+
+        private void XWfloat(string name, float f)
+        {
+            writer.WriteElementString(name, f.ToString(Utils.EnUsCulture));
+        }
+
+        private void XWVector(string name, Vector3 vec)
+        {
+            writer.WriteStartElement(name);
+            writer.WriteElementString("X", vec.X.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Y", vec.Y.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Z", vec.Z.ToString(Utils.EnUsCulture));
+            writer.WriteEndElement();
+        }
+
+        private void XWVector4(string name, Vector4 quat)
+        {
+            writer.WriteStartElement(name);
+            writer.WriteElementString("X", quat.X.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Y", quat.Y.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Z", quat.Z.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("W", quat.W.ToString(Utils.EnUsCulture));
+            writer.WriteEndElement();
+        }
+
+        public void ToXml2(XmlTextWriter twriter)
+        {
+            writer = twriter;
+            writer.WriteStartElement("PhysicsInertia");
+
+            XWfloat("MASS", TotalMass);
+            XWVector("CM", CenterOfMass);
+            XWVector("INERTIA", Inertia);
+            XWVector4("IROT", InertiaRotation);
+
+            writer.WriteEndElement();
+            writer = null;
+        }
+
+        XmlReader reader;
+
+        private int XRint()
+        {
+            return reader.ReadElementContentAsInt();
+        }
+
+        private float XRfloat()
+        {
+            return reader.ReadElementContentAsFloat();
+        }
+
+        public Vector3 XRvector()
+        {
+            Vector3 vec;
+            reader.ReadStartElement();
+            vec.X = reader.ReadElementContentAsFloat();
+            vec.Y = reader.ReadElementContentAsFloat();
+            vec.Z = reader.ReadElementContentAsFloat();
+            reader.ReadEndElement();
+            return vec;
+        }
+
+        public Vector4 XRVector4()
+        {
+            Vector4 q;
+            reader.ReadStartElement();
+            q.X = reader.ReadElementContentAsFloat();
+            q.Y = reader.ReadElementContentAsFloat();
+            q.Z = reader.ReadElementContentAsFloat();
+            q.W = reader.ReadElementContentAsFloat();
+            reader.ReadEndElement();
+            return q;
+        }
+
+        public static bool EReadProcessors(
+            Dictionary<string, Action> processors,
+            XmlReader xtr)
+        {
+            bool errors = false;
+
+            string nodeName = string.Empty;
+            while (xtr.NodeType != XmlNodeType.EndElement)
+            {
+                nodeName = xtr.Name;
+
+                Action p = null;
+                if (processors.TryGetValue(xtr.Name, out p))
+                {
+                    try
+                    {
+                        p();
+                    }
+                    catch
+                    {
+                        errors = true;
+                        if (xtr.NodeType == XmlNodeType.EndElement)
+                            xtr.Read();
+                    }
+                }
+                else
+                {
+                    xtr.ReadOuterXml(); // ignore
+                }
+            }
+
+            return errors;
+        }
+
+        public string ToXml2()
+        {
+            using (StringWriter sw = new StringWriter())
+            {
+                using (XmlTextWriter xwriter = new XmlTextWriter(sw))
+                {
+                    ToXml2(xwriter);
+                }
+
+                return sw.ToString();
+            }
+        }
+
+        public static PhysicsInertiaData FromXml2(string text)
+        {
+            if (text == String.Empty)
+                return null;
+
+            UTF8Encoding enc = new UTF8Encoding();
+            MemoryStream ms = new MemoryStream(enc.GetBytes(text));
+            XmlTextReader xreader = new XmlTextReader(ms);
+
+            PhysicsInertiaData v = new PhysicsInertiaData();
+            bool error;
+
+            v.FromXml2(xreader, out error);
+
+            xreader.Close();
+
+            if (error)
+                return null;
+
+            return v;
+        }
+
+        public static PhysicsInertiaData FromXml2(XmlReader reader)
+        {
+            PhysicsInertiaData data = new PhysicsInertiaData();
+
+            bool errors = false;
+
+            data.FromXml2(reader, out errors);
+            if (errors)
+                return null;
+
+            return data;
+        }
+
+        private void FromXml2(XmlReader _reader, out bool errors)
+        {
+            errors = false;
+            reader = _reader;
+
+            Dictionary<string, Action> m_XmlProcessors = new Dictionary<string, Action>();
+
+            m_XmlProcessors.Add("MASS", ProcessXR_Mass);
+            m_XmlProcessors.Add("CM", ProcessXR_CM);
+            m_XmlProcessors.Add("INERTIA", ProcessXR_Inertia);
+            m_XmlProcessors.Add("IROT", ProcessXR_InertiaRotation);
+
+            reader.ReadStartElement("PhysicsInertia", String.Empty);
+
+            errors = EReadProcessors(
+                m_XmlProcessors,
+                reader);
+
+            reader.ReadEndElement();
+            reader = null;
+        }
+
+        private void ProcessXR_Mass()
+        {
+            TotalMass = XRfloat();
+        }
+
+        private void ProcessXR_CM()
+        {
+            CenterOfMass = XRvector();
+        }
+
+        private void ProcessXR_Inertia()
+        {
+            Inertia = XRvector();
+        }
+
+        private void ProcessXR_InertiaRotation()
+        {
+            InertiaRotation = XRVector4();
+        }
+    }
+}
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 29985d2..a830551 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -328,6 +328,70 @@ namespace OpenSim.Framework
             return shape;
         }
 
+        public static PrimitiveBaseShape CreateMesh(int numberOfFaces, UUID meshAssetID)
+        {
+            PrimitiveBaseShape shape = new PrimitiveBaseShape();
+
+            shape._pathScaleX = 100;
+            shape._pathScaleY = 100;
+
+            if(numberOfFaces <= 0) // oops ?
+                numberOfFaces = 1;
+
+            switch(numberOfFaces)
+            {
+                case 1: // torus 
+                    shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Curve1;
+                    break;
+
+                case 2: // torus with hollow (a sl viewer whould see 4 faces on a hollow sphere)
+                    shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Curve1;
+                    shape.ProfileHollow = 1;
+                    break;
+
+                case 3: // cylinder
+                    shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    break;
+
+                case 4: // cylinder with hollow
+                    shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    shape.ProfileHollow = 1;
+                    break;
+
+                case 5: // prism
+                    shape.ProfileCurve = (byte)ProfileShape.EquilateralTriangle | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    break;
+
+                case 6: // box
+                    shape.ProfileCurve = (byte)ProfileShape.Square  | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    break;
+
+                case 7: // box with hollow
+                    shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    shape.ProfileHollow = 1;
+                    break;
+
+                default: // 8 faces  box with cut
+                    shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    shape.ProfileBegin = 1;
+                    break;
+            }
+
+            shape.SculptEntry = true;
+            shape.SculptType = (byte)OpenMetaverse.SculptType.Mesh;
+            shape.SculptTexture = meshAssetID;
+
+            return shape;
+        }
+
         public void SetScale(float side)
         {
             _scale = new Vector3(side, side, side);
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 99e97e8..7de8c52 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Framework
         private float m_physPrimMin = 0;
         private int m_physPrimMax = 0;
         private bool m_clampPrimSize = false;
-        private int m_objectCapacity = 0;
+        private int m_objectCapacity = 15000;
         private int m_maxPrimsPerUser = -1;
         private int m_linksetCapacity = 0;
         private string m_regionType = String.Empty;
@@ -753,7 +753,7 @@ namespace OpenSim.Framework
             m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
             allKeys.Remove("ClampPrimSize");
 
-            m_objectCapacity = config.GetInt("MaxPrims", 15000);
+            m_objectCapacity = config.GetInt("MaxPrims", m_objectCapacity);
             allKeys.Remove("MaxPrims");
 
             m_maxPrimsPerUser = config.GetInt("MaxPrimsPerUser", -1);
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 8965e71..f627ae6 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -57,6 +57,7 @@ namespace OpenSim.Framework.Servers
 
         protected OpenSimAppender m_consoleAppender;
         protected FileAppender m_logFileAppender;
+        protected FileAppender m_statsLogFileAppender;
 
         protected DateTime m_startuptime;
         protected string m_startupDirectory = Environment.CurrentDirectory;
@@ -156,6 +157,10 @@ namespace OpenSim.Framework.Servers
                 {
                     m_logFileAppender = (FileAppender)appender;
                 }
+                else if (appender.Name == "StatsLogFileAppender")
+                {
+                    m_statsLogFileAppender = (FileAppender)appender;
+                }
             }
 
             if (null == m_consoleAppender)
@@ -185,6 +190,18 @@ namespace OpenSim.Framework.Servers
 
                 m_log.InfoFormat("[SERVER BASE]: Logging started to file {0}", m_logFileAppender.File);
             }
+
+            if (m_statsLogFileAppender != null && startupConfig != null)
+            {
+                string cfgStatsFileName = startupConfig.GetString("StatsLogFile", null);
+                if (cfgStatsFileName != null)
+                {
+                    m_statsLogFileAppender.File = cfgStatsFileName;
+                    m_statsLogFileAppender.ActivateOptions();
+                }
+
+                m_log.InfoFormat("[SERVER BASE]: Stats Logging started to file {0}", m_statsLogFileAppender.File);
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 6d679f2..0ec24e6 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -63,22 +63,34 @@ namespace OpenSim.Framework
         None = 0,
 
         // folded perms
-        foldedTransfer = 1,
-        foldedModify = 1 << 1,
-        foldedCopy = 1 << 2,
-
-        foldedMask = 0x07,
+        FoldedTransfer = 1,
+        FoldedModify = 1 << 1,
+        FoldedCopy = 1 << 2,
+        FoldedExport = 1 << 3,
+
+        // DO NOT USE THIS FOR NEW WORK. IT IS DEPRECATED AND
+        // EXISTS ONLY TO REACT TO EXISTING OBJECTS HAVING IT.
+        // NEW CODE SHOULD NEVER SET THIS BIT!
+        // Use InventoryItemFlags.ObjectSlamPerm in the Flags field of
+        // this legacy slam bit. It comes from prior incomplete
+        // understanding of the code and the prohibition on
+        // reading viewer code that used to be in place.
+        Slam = (1 << 4),
+
+        FoldedMask = 0x0f,
 
         //
-        Transfer = 1 << 13,
-        Modify = 1 << 14,
-        Copy = 1 << 15,
-        Export = 1 << 16,
-        Move = 1 << 19,
-        Damage = 1 << 20,
+        Transfer = 1 << 13, // 0x02000
+        Modify = 1 << 14,   // 0x04000
+        Copy = 1 << 15,     // 0x08000
+        Export = 1 << 16,   // 0x10000
+        Move = 1 << 19,     // 0x80000
+        Damage = 1 << 20,   // 0x100000 does not seem to be in use
         // All does not contain Export, which is special and must be
         // explicitly given
-        All = (1 << 13) | (1 << 14) | (1 << 15) | (1 << 19)
+        All = 0x8e000,
+        AllAndExport = 0x9e000,
+        AllEffective = 0x9e000
     }
 
     /// <summary>
@@ -1180,7 +1192,7 @@ namespace OpenSim.Framework
         {
             foreach (IAppender appender in LogManager.GetRepository().GetAppenders())
             {
-                if (appender is FileAppender)
+                if (appender is FileAppender && appender.Name == "LogFileAppender")
                 {
                     return ((FileAppender)appender).File;
                 }
@@ -1189,6 +1201,19 @@ namespace OpenSim.Framework
             return "./OpenSim.log";
         }
 
+        public static string statsLogFile()
+        {
+            foreach (IAppender appender in LogManager.GetRepository().GetAppenders())
+            {
+                if (appender is FileAppender && appender.Name == "StatsLogFileAppender")
+                {
+                    return ((FileAppender)appender).File;
+                }
+            }
+
+            return "./OpenSimStats.log";
+        }
+
         public static string logDir()
         {
             return Path.GetDirectoryName(logFile());
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
index ccaf69e..427e149 100644
--- a/OpenSim/Framework/WearableCacheItem.cs
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -113,7 +113,8 @@ namespace OpenSim.Framework
                 {
                     if (dataCache.Check(item.TextureID.ToString()))
                     {
-                        AssetBase assetItem = dataCache.Get(item.TextureID.ToString());
+                        AssetBase assetItem;
+                        dataCache.Get(item.TextureID.ToString(), out assetItem);
                         if (assetItem != null)
                         {
                             itemmap.Add("assetdata", OSD.FromBinary(assetItem.Data));