aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs14
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs10
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
242 m_wearables[PANTS].ItemID = PANTS_ITEM; 242 m_wearables[PANTS].ItemID = PANTS_ITEM;
243 } 243 }
244 244
245 public virtual void ClearWearables()
246 {
247 for (int i = 0; i < 13; i++)
248 {
249 m_wearables[i].AssetID = UUID.Zero;
250 m_wearables[i].ItemID = UUID.Zero;
251 }
252 }
253
245 public virtual void SetDefaultParams(byte[] vparams) 254 public virtual void SetDefaultParams(byte[] vparams)
246 { 255 {
247 // TODO: Figure out better values then 'fat scientist 150' or 'alien 0' 256 // TODO: Figure out better values then 'fat scientist 150' or 'alien 0'
@@ -583,6 +592,11 @@ namespace OpenSim.Framework
583 m_attachments.Remove(attachpoint); 592 m_attachments.Remove(attachpoint);
584 } 593 }
585 594
595 public void ClearAttachments()
596 {
597 m_attachments.Clear();
598 }
599
586 string GetAttachmentsString() 600 string GetAttachmentsString()
587 { 601 {
588 List<string> strings = new List<string>(); 602 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
70 protected bool m_firstcaps = true; 70 protected bool m_firstcaps = true;
71 protected string m_SSLCommonName = ""; 71 protected string m_SSLCommonName = "";
72 72
73 protected IPAddress m_listenIPAddress = IPAddress.Any;
74
73 public uint SSLPort 75 public uint SSLPort
74 { 76 {
75 get { return m_sslport; } 77 get { return m_sslport; }
@@ -90,6 +92,12 @@ namespace OpenSim.Framework.Servers.HttpServer
90 get { return m_ssl; } 92 get { return m_ssl; }
91 } 93 }
92 94
95 public IPAddress ListenIPAddress
96 {
97 get { return m_listenIPAddress; }
98 set { m_listenIPAddress = value; }
99 }
100
93 public BaseHttpServer(uint port) 101 public BaseHttpServer(uint port)
94 { 102 {
95 m_port = port; 103 m_port = port;
@@ -1397,7 +1405,7 @@ namespace OpenSim.Framework.Servers.HttpServer
1397 { 1405 {
1398 //m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 1406 //m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
1399 //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/"); 1407 //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/");
1400 m_httpListener2 = new CoolHTTPListener(IPAddress.Any, (int)m_port); 1408 m_httpListener2 = new CoolHTTPListener(m_listenIPAddress, (int)m_port);
1401 m_httpListener2.ExceptionThrown += httpServerException; 1409 m_httpListener2.ExceptionThrown += httpServerException;
1402 m_httpListener2.LogWriter = httpserverlog; 1410 m_httpListener2.LogWriter = httpserverlog;
1403 1411