Merge branch 'master' into bulletsim

5 files changed, 104 insertions, 39 deletions

diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 5f68cda..e8c85c9 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -273,6 +273,7 @@ namespace OpenSim.Framework
 
                 return m_id;
             }
+            
             set
             {
                 UUID uuid = UUID.Zero;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 659d42f..f6e2977 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -737,7 +737,7 @@ namespace OpenSim.Framework
         bool IsActive { get; set; }
 
         /// <value>
-        /// Determines whether the client is logging out or not.
+        /// Determines whether the client is or has been removed from a given scene
         /// </value>
         bool IsLoggingOut { get; set; }
         
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 7b5fb2e..d873071 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -213,6 +213,8 @@ namespace OpenSim.Framework
         /// <param name="prim"></param>
         public PrimitiveBaseShape(Primitive prim)
         {
+//            m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Creating from {0}", prim.ID);
+
             PCode = (byte)prim.PrimData.PCode;
             ExtraParams = new byte[1];
 
@@ -376,7 +378,7 @@ namespace OpenSim.Framework
             _pathEnd = Primitive.PackEndCut(end);
         }
 
-        public void SetSculptData(byte sculptType, UUID SculptTextureUUID)
+        public void SetSculptProperties(byte sculptType, UUID SculptTextureUUID)
         {
             _sculptType = sculptType;
             _sculptTexture = SculptTextureUUID;
@@ -613,29 +615,39 @@ namespace OpenSim.Framework
             }
         }
 
-        public byte SculptType {
-            get {
+        public byte SculptType
+        {
+            get
+            {
                 return _sculptType;
             }
-            set {
+            set
+            {
                 _sculptType = value;
             }
         }
 
-        public byte[] SculptData {
-            get {
+        public byte[] SculptData
+        {
+            get
+            {
                 return _sculptData;
             }
-            set {
+            set
+            {
+//                m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Setting SculptData to data with length {0}", value.Length);
                 _sculptData = value;
             }
         }
 
-        public int FlexiSoftness {
-            get {
+        public int FlexiSoftness
+        {
+            get
+            {
                 return _flexiSoftness;
             }
-            set {
+            set
+            {
                 _flexiSoftness = value;
             }
         }
@@ -849,6 +861,8 @@ namespace OpenSim.Framework
 
         public byte[] ExtraParamsToBytes()
         {
+//            m_log.DebugFormat("[EXTRAPARAMS]: Called ExtraParamsToBytes()");
+
             ushort FlexiEP = 0x10;
             ushort LightEP = 0x20;
             ushort SculptEP = 0x30;
@@ -864,18 +878,21 @@ namespace OpenSim.Framework
                 TotalBytesLength += 16;// data
                 TotalBytesLength += 2 + 4; // type
             }
+
             if (_lightEntry)
             {
                 ExtraParamsNum++;
                 TotalBytesLength += 16;// data
                 TotalBytesLength += 2 + 4; // type
             }
+
             if (_sculptEntry)
             {
                 ExtraParamsNum++;
                 TotalBytesLength += 17;// data
                 TotalBytesLength += 2 + 4; // type
             }
+
             if (_projectionEntry)
             {
                 ExtraParamsNum++;
@@ -885,7 +902,6 @@ namespace OpenSim.Framework
 
             byte[] returnbytes = new byte[TotalBytesLength];
 
-
             // uint paramlength = ExtraParamsNum;
 
             // Stick in the number of parameters
@@ -905,6 +921,7 @@ namespace OpenSim.Framework
                 Array.Copy(FlexiData, 0, returnbytes, i, FlexiData.Length);
                 i += FlexiData.Length;
             }
+
             if (_lightEntry)
             {
                 byte[] LightData = GetLightBytes();
@@ -919,6 +936,7 @@ namespace OpenSim.Framework
                 Array.Copy(LightData, 0, returnbytes, i, LightData.Length);
                 i += LightData.Length;
             }
+
             if (_sculptEntry)
             {
                 byte[] SculptData = GetSculptBytes();
@@ -933,6 +951,7 @@ namespace OpenSim.Framework
                 Array.Copy(SculptData, 0, returnbytes, i, SculptData.Length);
                 i += SculptData.Length;
             }
+
             if (_projectionEntry)
             {
                 byte[] ProjectionData = GetProjectionBytes();
@@ -946,6 +965,7 @@ namespace OpenSim.Framework
                 Array.Copy(ProjectionData, 0, returnbytes, i, ProjectionData.Length);
                 i += ProjectionData.Length;
             }
+
             if (!_flexiEntry && !_lightEntry && !_sculptEntry && !_projectionEntry)
             {
                 byte[] returnbyte = new byte[1];
@@ -953,10 +973,7 @@ namespace OpenSim.Framework
                 return returnbyte;
             }
 
-
             return returnbytes;
-            //m_log.Info("[EXTRAPARAMS]: Length = " + m_shape.ExtraParams.Length.ToString());
-
         }
 
         public void ReadInUpdateExtraParam(ushort type, bool inUse, byte[] data)
@@ -1027,7 +1044,6 @@ namespace OpenSim.Framework
                 extraParamCount = data[i++];
             }
 
-
             for (int k = 0; k < extraParamCount; k++)
             {
                 ushort epType = Utils.BytesToUInt16(data, i);
@@ -1071,7 +1087,6 @@ namespace OpenSim.Framework
                 _sculptEntry = false;
             if (!lGotFilter)
                 _projectionEntry = false;
-
         }
 
         public void ReadSculptData(byte[] data, int pos)
@@ -1100,6 +1115,7 @@ namespace OpenSim.Framework
                 if (_sculptType != (byte)1 && _sculptType != (byte)2 && _sculptType != (byte)3 && _sculptType != (byte)4)
                     _sculptType = 4;
             }
+
             _sculptTexture = SculptUUID;
             _sculptType = SculptTypel;
             //m_log.Info("[SCULPT]:" + SculptUUID.ToString());
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 21e1e09..688be3f 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -31,6 +31,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Timers;
 using log4net;
@@ -124,7 +125,6 @@ namespace OpenSim.Framework.Servers
                     m_logFileAppender = appender;
                 }
             }
-
         }
         
         /// <summary>
@@ -443,45 +443,68 @@ namespace OpenSim.Framework.Servers
         {
             string buildVersion = string.Empty;
 
-            // Add commit hash and date information if available
-            // The commit hash and date are stored in a file bin/.version
-            // This file can automatically created by a post
-            // commit script in the opensim git master repository or
-            // by issuing the follwoing command from the top level
-            // directory of the opensim repository
-            // git log -n 1 --pretty="format:%h: %ci" >bin/.version
-            // For the full git commit hash use %H instead of %h
-            //
             // The subversion information is deprecated and will be removed at a later date
             // Add subversion revision information if available
             // Try file "svn_revision" in the current directory first, then the .svn info.
             // This allows to make the revision available in simulators not running from the source tree.
             // FIXME: Making an assumption about the directory we're currently in - we do this all over the place
             // elsewhere as well
+            string gitDir = "../.git/";
+            string gitRefPointerPath = gitDir + "HEAD";
+
             string svnRevisionFileName = "svn_revision";
             string svnFileName = ".svn/entries";
-            string gitCommitFileName = ".version";
+            string manualVersionFileName = ".version";
             string inputLine;
             int strcmp;
 
-            if (File.Exists(gitCommitFileName))
+            if (File.Exists(manualVersionFileName))
             {
-                StreamReader CommitFile = File.OpenText(gitCommitFileName);
-                buildVersion = CommitFile.ReadLine();
-                CommitFile.Close();
+                using (StreamReader CommitFile = File.OpenText(manualVersionFileName))
+                    buildVersion = CommitFile.ReadLine();
+
                 m_version += buildVersion ?? "";
             }
+            else if (File.Exists(gitRefPointerPath))
+            {
+//                m_log.DebugFormat("[OPENSIM]: Found {0}", gitRefPointerPath);
+
+                string rawPointer = "";
+
+                using (StreamReader pointerFile = File.OpenText(gitRefPointerPath))
+                    rawPointer = pointerFile.ReadLine();
+
+//                m_log.DebugFormat("[OPENSIM]: rawPointer [{0}]", rawPointer);
+
+                Match m = Regex.Match(rawPointer, "^ref: (.+)$");
+
+                if (m.Success)
+                {
+//                    m_log.DebugFormat("[OPENSIM]: Matched [{0}]", m.Groups[1].Value);
+
+                    string gitRef = m.Groups[1].Value;
+                    string gitRefPath = gitDir + gitRef;
+                    if (File.Exists(gitRefPath))
+                    {
+//                        m_log.DebugFormat("[OPENSIM]: Found gitRefPath [{0}]", gitRefPath);
 
-            // Remove the else logic when subversion mirror is no longer used
+                        using (StreamReader refFile = File.OpenText(gitRefPath))
+                        {
+                            string gitHash = refFile.ReadLine();
+                            m_version += gitHash.Substring(0, 7);
+                        }
+                    }
+                }
+            }
             else
             {
+                // Remove the else logic when subversion mirror is no longer used
                 if (File.Exists(svnRevisionFileName))
                 {
                     StreamReader RevisionFile = File.OpenText(svnRevisionFileName);
                     buildVersion = RevisionFile.ReadLine();
                     buildVersion.Trim();
                     RevisionFile.Close();
-
                 }
 
                 if (string.IsNullOrEmpty(buildVersion) && File.Exists(svnFileName))
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index e5ff27a..fce8999 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -324,10 +324,25 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
+        /// Debug utility function to convert OSD into formatted XML for debugging purposes.
+        /// </summary>
+        /// <param name="osd">
+        /// A <see cref="OSD"/>
+        /// </param>
+        /// <returns>
+        /// A <see cref="System.String"/>
+        /// </returns>
+        public static string GetFormattedXml(OSD osd)
+        {
+            return GetFormattedXml(OSDParser.SerializeLLSDXmlString(osd));
+        }
+
+        /// <summary>
         /// Debug utility function to convert unbroken strings of XML into something human readable for occasional debugging purposes.
-        ///
-        /// Please don't delete me even if I appear currently unused!
         /// </summary>
+        /// <remarks>
+        /// Please don't delete me even if I appear currently unused!
+        /// </remarks>
         /// <param name="rawXml"></param>
         /// <returns></returns>
         public static string GetFormattedXml(string rawXml)
@@ -425,20 +440,30 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Return an SHA1 hash of the given string
+        /// Return an SHA1 hash
         /// </summary>
         /// <param name="data"></param>
         /// <returns></returns>
         public static string SHA1Hash(string data)
         {
+            return SHA1Hash(Encoding.Default.GetBytes(data));
+        }
+
+        /// <summary>
+        /// Return an SHA1 hash
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public static string SHA1Hash(byte[] data)
+        {
             byte[] hash = ComputeSHA1Hash(data);
             return BitConverter.ToString(hash).Replace("-", String.Empty);
         }
 
-        private static byte[] ComputeSHA1Hash(string src)
+        private static byte[] ComputeSHA1Hash(byte[] src)
         {
             SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider();
-            return SHA1.ComputeHash(Encoding.Default.GetBytes(src));
+            return SHA1.ComputeHash(src);
         }
 
         public static int fast_distance2d(int x, int y)