Added option (on my default) to the clone avatar function so that the clothes and attachments that the target avatar is wearing, to begin with, are removed. So the end result isn't a merger of those clothes/attachments and the ones the template avatar is wearing.

Added IPAddress ListenIPAddress property to BaseHttpServer so that the listening/binding IP can be set.

2 files changed, 23 insertions, 1 deletions

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index ec31018..aee16c4 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -242,6 +242,15 @@ namespace OpenSim.Framework
             m_wearables[PANTS].ItemID = PANTS_ITEM;
         }
 
+        public virtual void ClearWearables()
+        {
+            for (int i = 0; i < 13; i++)
+            {
+                m_wearables[i].AssetID = UUID.Zero;
+                m_wearables[i].ItemID = UUID.Zero;
+            }
+        }
+
         public virtual void SetDefaultParams(byte[] vparams)
         {
             // TODO: Figure out better values then 'fat scientist 150' or 'alien 0'
@@ -583,6 +592,11 @@ namespace OpenSim.Framework
                 m_attachments.Remove(attachpoint);
         }
 
+        public void ClearAttachments()
+        {
+            m_attachments.Clear();
+        }
+
         string GetAttachmentsString()
         {
             List<string> strings = new List<string>();
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index e18fd55..0f7ff79 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -70,6 +70,8 @@ namespace OpenSim.Framework.Servers.HttpServer
         protected bool m_firstcaps = true;
         protected string m_SSLCommonName = "";
 
+        protected IPAddress m_listenIPAddress = IPAddress.Any;
+
         public uint SSLPort
         {
             get { return m_sslport; }
@@ -90,6 +92,12 @@ namespace OpenSim.Framework.Servers.HttpServer
             get { return m_ssl; }
         }
 
+        public IPAddress ListenIPAddress
+        {
+            get { return m_listenIPAddress; }
+            set { m_listenIPAddress = value; }
+        }
+
         public BaseHttpServer(uint port)
         {
             m_port = port;
@@ -1397,7 +1405,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     //m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
                     //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/");
-                    m_httpListener2 = new CoolHTTPListener(IPAddress.Any, (int)m_port);
+                    m_httpListener2 = new CoolHTTPListener(m_listenIPAddress, (int)m_port);
                     m_httpListener2.ExceptionThrown += httpServerException;
                     m_httpListener2.LogWriter = httpserverlog;