more use of simpler xml encoder on inventory fetch, plus other cosmetics

3 files changed, 11 insertions, 75 deletions

diff --git a/OpenSim/Framework/Culture.cs b/OpenSim/Framework/Culture.cs
index 1a44660..483f735 100644
--- a/OpenSim/Framework/Culture.cs
+++ b/OpenSim/Framework/Culture.cs
@@ -1,66 +1 @@
-/*
- * 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.Globalization;
-using System.Threading;
-
-namespace OpenSim.Framework
-{
-    public class Culture
-    {
-        private static readonly CultureInfo m_cultureInfo = new CultureInfo("en-US", false);
-
-        public static NumberFormatInfo NumberFormatInfo
-        {
-            get { return m_cultureInfo.NumberFormat; }
-        }
-
-        public static IFormatProvider FormatProvider
-        {
-            get { return m_cultureInfo; }
-        }
-
-        /// <summary>
-        /// Set Culture to en-US to make string processing of numbers simpler.
-        /// </summary>
-        public static void SetCurrentCulture()
-        {
-            Thread.CurrentThread.CurrentCulture = m_cultureInfo;
-        }
-
-        public static void SetDefaultCurrentCulture()
-        {
-            CultureInfo.DefaultThreadCurrentCulture = m_cultureInfo;
-        }
-
-        public static CultureInfo GetDefaultCurrentCulture()
-        {
-            return CultureInfo.DefaultThreadCurrentCulture;
-        }
-    }
-}
\ No newline at end of file
+/*
 * 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.Globalization;
using System.Threading;

namespace OpenSim.Framework
{
    public class Culture
    {
        private static readonly CultureInfo m_cultureInfo = new CultureInfo("en-US", false);

        public static NumberFormatInfo NumberFormatInfo
        {
            get { return m_cultureInfo.NumberFormat; }
        }

        public static IFormatProvider FormatProvider
        {
            get { return m_cultureInfo; }
        }

        /// <summary>
        /// Set Culture to en-US to make string processing of numbers simpler.
        /// </summary>
        public static void SetCurrentCulture()
        {
            Thread.CurrentThread.CurrentCulture = m_cultureInfo;
        }

        public static void SetDefaultCurrentCulture()
        {
            CultureInfo.DefaultThreadCurrentCulture = m_cultureInfo;
        }

        public static CultureInfo GetDefaultCurrentCulture()
        {
            return CultureInfo.DefaultThreadCurrentCulture;
        }
    }
}
\ No newline at end of file
diff --git a/OpenSim/Framework/InventoryCollection.cs b/OpenSim/Framework/InventoryCollection.cs
index 59655eb..a55a1cb 100644
--- a/OpenSim/Framework/InventoryCollection.cs
+++ b/OpenSim/Framework/InventoryCollection.cs
@@ -40,5 +40,6 @@ namespace OpenSim.Framework
         public UUID OwnerID;
         public UUID FolderID;
         public int Version;
+        public int Descendents;
     }
 }
diff --git a/OpenSim/Framework/LLSDxmlEncode.cs b/OpenSim/Framework/LLSDxmlEncode.cs
index ed5c4db..35fc964 100644
--- a/OpenSim/Framework/LLSDxmlEncode.cs
+++ b/OpenSim/Framework/LLSDxmlEncode.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Framework
             else
             {
                 sb.Append("<real>");
-                sb.Append(e.ToString(CultureInfo.InvariantCulture));     
+                sb.Append(e.ToString(CultureInfo.InvariantCulture));
                 sb.Append("</real>");
             }
         }
@@ -173,7 +173,7 @@ namespace OpenSim.Framework
             else
             {
                 sb.Append("<real>");
-                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));     
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
                 sb.Append("</real><key>y</key>");
             }
 
@@ -196,7 +196,7 @@ namespace OpenSim.Framework
             else
             {
                 sb.Append("<real>");
-                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));     
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
                 sb.Append("</real><key>y</key>");
             }
 
@@ -228,7 +228,7 @@ namespace OpenSim.Framework
             else
             {
                 sb.Append("<real>");
-                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));     
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
                 sb.Append("</real><key>y</key>");
             }
 
@@ -347,7 +347,7 @@ namespace OpenSim.Framework
             else
                 format = "yyyy-MM-ddTHH:mm:ssZ";
             sb.Append("<date>");
-            sb.Append(u.ToString(format,CultureInfo.InvariantCulture));     
+            sb.Append(u.ToString(format,CultureInfo.InvariantCulture));
             sb.Append("</date>");
         }
 
@@ -478,7 +478,7 @@ namespace OpenSim.Framework
             else
             {
                 sb.Append("<real>");
-                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));     
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
                 sb.Append("</real><key>y</key>");
             }
 
@@ -503,7 +503,7 @@ namespace OpenSim.Framework
             else
             {
                 sb.Append("<real>");
-                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));     
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
                 sb.Append("</real><key>y</key>");
             }
 
@@ -537,7 +537,7 @@ namespace OpenSim.Framework
             else
             {
                 sb.Append("<real>");
-                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));     
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
                 sb.Append("</real><key>y</key>");
             }
 
@@ -680,7 +680,7 @@ namespace OpenSim.Framework
             else
                 format = "yyyy-MM-ddTHH:mm:ssZ";
             sb.Append("<date>");
-            sb.Append(u.ToString(format,CultureInfo.InvariantCulture));     
+            sb.Append(u.ToString(format,CultureInfo.InvariantCulture));
             sb.Append("</date>");
         }