6 files changed, 16 insertions, 82 deletions

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 940ae3b..3f4214e 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -380,13 +380,13 @@ namespace OpenSim.Framework
         /// <summary>
         /// Set up appearance textures and avatar parameters, including a height calculation
         /// </summary>
-        /// <param name="texture"></param>
-        /// <param name="visualParam"></param>
-        public virtual void SetAppearance(byte[] texture, List<byte> visualParam)
+        public virtual void SetAppearance(Primitive.TextureEntry textureEntry, byte[] visualParams)
         {
-            Primitive.TextureEntry textureEnt = new Primitive.TextureEntry(texture, 0, texture.Length);
-            m_texture = textureEnt;
-            m_visualparams = visualParam.ToArray();
+            if (textureEntry != null)
+                m_texture = textureEntry;
+            if (visualParams != null)
+                m_visualparams = visualParams;
+
             m_avatarHeight = 1.23077f  // Shortest possible avatar height
                            + 0.516945f * (float)m_visualparams[(int)VPElement.SHAPE_HEIGHT] / 255.0f   // Body height
                            + 0.072514f * (float)m_visualparams[(int)VPElement.SHAPE_HEAD_SIZE] / 255.0f  // Head size
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index e03229b..857930a 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -66,7 +66,9 @@ namespace OpenSim.Framework
                 if (m_pqueue.Count > 0)
                     return m_pqueue.Dequeue();
                 
-                return m_queue.Dequeue();
+                if (m_queue.Count > 0)
+                                        return m_queue.Dequeue();
+                                return default(T);
             }
         }
 
@@ -119,6 +121,7 @@ namespace OpenSim.Framework
             {
                 m_pqueue.Clear();
                 m_queue.Clear();
+                                Monitor.Pulse(m_queueSync);
             }
         }
     }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 4bc35e6..d3bd9e7 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Framework
 
     public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes);
 
-    public delegate void SetAppearance(byte[] texture, List<byte> visualParamList);
+    public delegate void SetAppearance(Primitive.TextureEntry textureEntry, byte[] visualParams);
 
     public delegate void StartAnim(IClientAPI remoteClient, UUID animID);
 
@@ -1127,7 +1127,6 @@ namespace OpenSim.Framework
 
         void SetClientOption(string option, string value);
         string GetClientOption(string option);
-        void Terminate();
 
         void SendSetFollowCamProperties(UUID objectID, SortedDictionary<int, float> parameters);
         void SendClearFollowCamProperties(UUID objectID);
@@ -1175,5 +1174,7 @@ namespace OpenSim.Framework
         void KillEndDone();
 
         bool AddGenericPacketHandler(string MethodName, GenericMessage handler);
+
+        void SendRebakeAvatarTextures(UUID textureID);
     }
 }
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 8075ce6..7e2860e 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -234,7 +234,8 @@ namespace OpenSim.Framework
 
             lock (DataBlocks)
             {
-                DataBlocks[typeof(T)].Push(block);
+                if (DataBlocks[typeof(T)].Count < 50)
+                    DataBlocks[typeof(T)].Push(block);
             }
         }
     }
diff --git a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
deleted file mode 100644
index 2fa118d..0000000
--- a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs
+++ /dev/null
@@ -1,70 +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 NUnit.Framework;
-using OpenSim.Tests.Common.Setup;
-
-namespace OpenSim.Framework.Servers.HttpServer.Tests
-{
-    [TestFixture]
-    public class BaseRequestHandlerTests
-    {
-        private const string BASE_PATH = "/testpath";
-
-        private class BaseRequestHandlerImpl : BaseRequestHandler
-        {
-            public BaseRequestHandlerImpl(string httpMethod, string path) : base(httpMethod, path)
-            {
-            }
-        }
-
-        [Test]
-        public void TestConstructor()
-        {
-            new BaseRequestHandlerImpl(null, null);
-        }
-
-        [Test]
-        public void TestGetParams()
-        {
-            BaseRequestHandlerImpl handler = new BaseRequestHandlerImpl(null, BASE_PATH);
-
-            BaseRequestHandlerTestHelper.BaseTestGetParams(handler, BASE_PATH);
-        }
-
-        [Test]
-        public void TestSplitParams()
-        {
-            BaseRequestHandlerImpl handler = new BaseRequestHandlerImpl(null, BASE_PATH);
-
-            BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, BASE_PATH);
-        }
-    }
-}
diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
index ecd35c0..2fda6f3 100644
--- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -227,8 +227,7 @@ namespace OpenSim.Framework.Tests
                 wearbyte.Add(VisualParams[i]);
             }
 
-
-            AvAppearance.SetAppearance(AvAppearance.Texture.GetBytes(), wearbyte);
+            AvAppearance.SetAppearance(AvAppearance.Texture, (byte[])VisualParams.Clone());
         }
 
         /// <summary>