10 files changed, 55 insertions, 49 deletions

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 125910e..12c8ac0 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -296,11 +296,12 @@ namespace OpenSim.Framework
             if (args["start_pos"] != null)
                 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
 
-            m_log.InfoFormat("[AGENTCIRCUITDATA] agentid={0}, child={1}, startpos={2}",AgentID,child,startpos.ToString());
+            m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
             
-            try {
+            try
+            {
                 // Unpack various appearance elements
-                Appearance = new AvatarAppearance(AgentID);
+                Appearance = new AvatarAppearance();
 
                 // Eventually this code should be deprecated, use full appearance
                 // packing in packed_appearance
@@ -313,7 +314,9 @@ namespace OpenSim.Framework
                     m_log.InfoFormat("[AGENTCIRCUITDATA] unpacked appearance");
                 }
                 else
-                    m_log.Warn("[AGENTCIRCUITDATA] failed to find a valid packed_appearance");
+                {
+                    m_log.Warn("[AGENTCIRCUITDATA]: failed to find a valid packed_appearance");
+                }
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 716baab..73b068d 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -47,7 +47,6 @@ namespace OpenSim.Framework
         public readonly static int TEXTURE_COUNT = 21;
         public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 };
 
-        protected UUID m_owner;
         protected int m_serial = 0;
         protected byte[] m_visualparams;
         protected Primitive.TextureEntry m_texture;
@@ -56,12 +55,6 @@ namespace OpenSim.Framework
         protected float m_avatarHeight = 0;
         protected float m_hipOffset = 0;
 
-        public virtual UUID Owner
-        {
-            get { return m_owner; }
-            set { m_owner = value; }
-        }
-
         public virtual int Serial
         {
             get { return m_serial; }
@@ -77,7 +70,11 @@ namespace OpenSim.Framework
         public virtual Primitive.TextureEntry Texture
         {
             get { return m_texture; }
-            set { m_texture = value; }
+            set
+            {
+//                m_log.DebugFormat("[AVATAR APPEARANCE]: Set TextureEntry to {0}", value);
+                m_texture = value;
+            }
         }
 
         public virtual AvatarWearable[] Wearables
@@ -97,38 +94,31 @@ namespace OpenSim.Framework
             get { return m_hipOffset; }
         }
 
-        public AvatarAppearance() : this(UUID.Zero) {}
-
-        public AvatarAppearance(UUID owner)
+        public AvatarAppearance()
         {
-//            m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance for {0}",owner);
+//            m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance");
 
             m_serial = 0;
-            m_owner = owner;
-
             SetDefaultWearables();
             SetDefaultTexture();
             SetDefaultParams();
             SetHeight();
-
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
         }
 
-        public AvatarAppearance(UUID avatarID, OSDMap map)
+        public AvatarAppearance(OSDMap map)
         {
-//            m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance for {0} from OSDMap",avatarID);
+//            m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance from OSDMap");
 
-            m_owner = avatarID;
             Unpack(map);
             SetHeight();
         }
 
-        public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams)
+        public AvatarAppearance(AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams)
         {
-//            m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID);
+//            m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance");
 
             m_serial = 0;
-            m_owner = avatarID;
 
             if (wearables != null)
                 m_wearables = wearables;
@@ -161,24 +151,21 @@ namespace OpenSim.Framework
             if (appearance == null)
             {
                 m_serial = 0;
-                m_owner = UUID.Zero;
-
                 SetDefaultWearables();
                 SetDefaultTexture();
                 SetDefaultParams();
                 SetHeight();
-
                 m_attachments = new Dictionary<int, List<AvatarAttachment>>();
 
                 return;
             }
 
             m_serial = appearance.Serial;
-            m_owner = appearance.Owner;
 
             m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
             for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
                 m_wearables[i] = new AvatarWearable();
+
             if (copyWearables && (appearance.Wearables != null))
             {
                 for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 710a57d..613db1c 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -593,7 +593,7 @@ namespace OpenSim.Framework
             //        AgentTextures[i++] = o.AsUUID();
             //}
 
-            Appearance = new AvatarAppearance(AgentID);
+            Appearance = new AvatarAppearance();
 
             // The code to unpack textures, visuals, wearables and attachments
             // should be removed; packed appearance contains the full appearance
@@ -635,7 +635,7 @@ namespace OpenSim.Framework
             // end of code to remove
 
             if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map)
-                Appearance = new AvatarAppearance(AgentID,(OSDMap)args["packed_appearance"]);
+                Appearance = new AvatarAppearance((OSDMap)args["packed_appearance"]);
             else
                 m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance");
 
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f6e2977..481e1bb 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -935,7 +935,7 @@ namespace OpenSim.Framework
         event ScriptReset OnScriptReset;
         event GetScriptRunning OnGetScriptRunning;
         event SetScriptRunning OnSetScriptRunning;
-        event UpdateVector OnAutoPilotGo;
+        event Action<Vector3> OnAutoPilotGo;
 
         event TerrainUnacked OnUnackedTerrain;
         event ActivateGesture OnActivateGesture;
@@ -1395,7 +1395,7 @@ namespace OpenSim.Framework
         void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt);
         
         void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
-        void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId);
+        void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId);
 
         void StopFlying(ISceneEntity presence);
 
diff --git a/OpenSim/Framework/InventoryFolderImpl.cs b/OpenSim/Framework/InventoryFolderImpl.cs
index 29c7682..139776b 100644
--- a/OpenSim/Framework/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/InventoryFolderImpl.cs
@@ -27,13 +27,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
 {
     public class InventoryFolderImpl : InventoryFolderBase
     {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public static readonly string PATH_DELIMITER = "/";
 
@@ -402,6 +404,10 @@ namespace OpenSim.Framework
             {
                 foreach (InventoryItemBase item in Items.Values)
                 {
+//                    m_log.DebugFormat(
+//                        "[INVENTORY FOLDER IMPL]: Returning item {0} {1}, OwnerPermissions {2:X}",
+//                        item.Name, item.ID, item.CurrentPermissions);
+
                     itemList.Add(item);
                 }
             }
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 7e2860e..41d17c5 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -144,6 +144,7 @@ namespace OpenSim.Framework
                 m_log.WarnFormat("[PACKETPOOL]: Failed to get packet of type {0}", type);
             else
                 packet.FromBytes(bytes, ref i, ref packetEnd, zeroBuffer);
+
             return packet;
         }
 
@@ -160,19 +161,18 @@ namespace OpenSim.Framework
                     case PacketType.ObjectUpdate:
                         ObjectUpdatePacket oup = (ObjectUpdatePacket)packet;
 
-                        foreach (ObjectUpdatePacket.ObjectDataBlock oupod in
-                                oup.ObjectData)
+                        foreach (ObjectUpdatePacket.ObjectDataBlock oupod in oup.ObjectData)
                             ReturnDataBlock<ObjectUpdatePacket.ObjectDataBlock>(oupod);
+
                         oup.ObjectData = null;
                         break;
 
                     case PacketType.ImprovedTerseObjectUpdate:
-                        ImprovedTerseObjectUpdatePacket itoup =
-                                (ImprovedTerseObjectUpdatePacket)packet;
+                        ImprovedTerseObjectUpdatePacket itoup = (ImprovedTerseObjectUpdatePacket)packet;
 
-                        foreach (ImprovedTerseObjectUpdatePacket.ObjectDataBlock
-                                itoupod in itoup.ObjectData)
+                        foreach (ImprovedTerseObjectUpdatePacket.ObjectDataBlock itoupod in itoup.ObjectData)
                             ReturnDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(itoupod);
+
                         itoup.ObjectData = null;
                         break;
                 }
@@ -194,6 +194,7 @@ namespace OpenSim.Framework
                             {
                                 pool[type] = new Stack<Packet>();
                             }
+
                             if ((pool[type]).Count < 50)
                             {
                                 (pool[type]).Push(packet);
@@ -223,6 +224,7 @@ namespace OpenSim.Framework
                 {
                     DataBlocks[typeof(T)] = new Stack<Object>();
                 }
+                
                 return new T();
             }
         }
@@ -234,6 +236,9 @@ namespace OpenSim.Framework
 
             lock (DataBlocks)
             {
+                if (!DataBlocks.ContainsKey(typeof(T)))
+                    DataBlocks[typeof(T)] = new Stack<Object>();
+
                 if (DataBlocks[typeof(T)].Count < 50)
                     DataBlocks[typeof(T)].Push(block);
             }
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 25ae6b0..421bd5d 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
                     clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
                 }
             }
-
+            
             return clone;
         }
 
diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
index 05d8469..0dce414 100644
--- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Tests
             SecureSessionId = UUID.Random();
             SessionId = UUID.Random();
 
-            AvAppearance = new AvatarAppearance(AgentId);
+            AvAppearance = new AvatarAppearance();
             VisualParams = new byte[218];
 
             //body
diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
index 6c98897..9615f1b 100644
--- a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Tests
 
             m_agentCircuitData1 = new AgentCircuitData();
             m_agentCircuitData1.AgentID = AgentId1;
-            m_agentCircuitData1.Appearance = new AvatarAppearance(AgentId1);
+            m_agentCircuitData1.Appearance = new AvatarAppearance();
             m_agentCircuitData1.BaseFolder = BaseFolder;
             m_agentCircuitData1.CapsPath = CapsPath;
             m_agentCircuitData1.child = false;
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Tests
 
             m_agentCircuitData2 = new AgentCircuitData();
             m_agentCircuitData2.AgentID = AgentId2;
-            m_agentCircuitData2.Appearance = new AvatarAppearance(AgentId2);
+            m_agentCircuitData2.Appearance = new AvatarAppearance();
             m_agentCircuitData2.BaseFolder = BaseFolder;
             m_agentCircuitData2.CapsPath = CapsPath;
             m_agentCircuitData2.child = false;
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index fce8999..984a7a8 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1499,25 +1499,30 @@ namespace OpenSim.Framework
 
         public static void FireAndForget(System.Threading.WaitCallback callback, object obj)
         {
+            // When OpenSim interacts with a database or sends data over the wire, it must send this in en_US culture
+            // so that we don't encounter problems where, for instance, data is saved with a culture that uses commas
+            // for decimals places but is read by a culture that treats commas as number seperators.
+            WaitCallback realCallback = delegate(object o) { Culture.SetCurrentCulture(); callback(o); };
+
             switch (FireAndForgetMethod)
             {
                 case FireAndForgetMethod.UnsafeQueueUserWorkItem:
-                    ThreadPool.UnsafeQueueUserWorkItem(callback, obj);
+                    ThreadPool.UnsafeQueueUserWorkItem(realCallback, obj);
                     break;
                 case FireAndForgetMethod.QueueUserWorkItem:
-                    ThreadPool.QueueUserWorkItem(callback, obj);
+                    ThreadPool.QueueUserWorkItem(realCallback, obj);
                     break;
                 case FireAndForgetMethod.BeginInvoke:
                     FireAndForgetWrapper wrapper = FireAndForgetWrapper.Instance;
-                    wrapper.FireAndForget(callback, obj);
+                    wrapper.FireAndForget(realCallback, obj);
                     break;
                 case FireAndForgetMethod.SmartThreadPool:
                     if (m_ThreadPool == null)
                         m_ThreadPool = new SmartThreadPool(2000, 15, 2);
-                    m_ThreadPool.QueueWorkItem(SmartThreadPoolCallback, new object[] { callback, obj });
+                    m_ThreadPool.QueueWorkItem(SmartThreadPoolCallback, new object[] { realCallback, obj });
                     break;
                 case FireAndForgetMethod.Thread:
-                    Thread thread = new Thread(delegate(object o) { callback(o); });
+                    Thread thread = new Thread(delegate(object o) { realCallback(o); });
                     thread.Start(obj);
                     break;
                 default: