diff options
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index af2dd85..a0e5521 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -315,6 +315,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
315 | private int m_cachedTextureSerial; | 315 | private int m_cachedTextureSerial; |
316 | private PriorityQueue m_entityUpdates; | 316 | private PriorityQueue m_entityUpdates; |
317 | private Prioritizer m_prioritizer; | 317 | private Prioritizer m_prioritizer; |
318 | private bool m_disableFacelights = false; | ||
318 | 319 | ||
319 | /// <value> | 320 | /// <value> |
320 | /// List used in construction of data blocks for an object update packet. This is to stop us having to | 321 | /// List used in construction of data blocks for an object update packet. This is to stop us having to |
@@ -420,6 +421,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
420 | set { m_IsLoggingOut = value; } | 421 | set { m_IsLoggingOut = value; } |
421 | } | 422 | } |
422 | 423 | ||
424 | public bool DisableFacelights | ||
425 | { | ||
426 | get { return m_disableFacelights; } | ||
427 | set { m_disableFacelights = value; } | ||
428 | } | ||
429 | |||
423 | public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } } | 430 | public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } } |
424 | 431 | ||
425 | #endregion Properties | 432 | #endregion Properties |
@@ -3522,6 +3529,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3522 | SceneObjectPart part = (SceneObjectPart)update.Entity; | 3529 | SceneObjectPart part = (SceneObjectPart)update.Entity; |
3523 | if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId)) | 3530 | if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId)) |
3524 | continue; | 3531 | continue; |
3532 | |||
3533 | if (part.ParentGroup.IsAttachment && m_disableFacelights) | ||
3534 | { | ||
3535 | if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand && | ||
3536 | part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand) | ||
3537 | { | ||
3538 | part.Shape.LightEntry = false; | ||
3539 | } | ||
3540 | } | ||
3525 | } | 3541 | } |
3526 | 3542 | ||
3527 | ++updatesThisCall; | 3543 | ++updatesThisCall; |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 3b63bcd..bbbf0be 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -153,6 +153,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
153 | private int m_defaultRTO = 0; | 153 | private int m_defaultRTO = 0; |
154 | private int m_maxRTO = 0; | 154 | private int m_maxRTO = 0; |
155 | 155 | ||
156 | private bool m_disableFacelights = false; | ||
157 | |||
156 | public Socket Server { get { return null; } } | 158 | public Socket Server { get { return null; } } |
157 | 159 | ||
158 | public LLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager) | 160 | public LLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager) |
@@ -190,6 +192,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
190 | 192 | ||
191 | m_defaultRTO = config.GetInt("DefaultRTO", 0); | 193 | m_defaultRTO = config.GetInt("DefaultRTO", 0); |
192 | m_maxRTO = config.GetInt("MaxRTO", 0); | 194 | m_maxRTO = config.GetInt("MaxRTO", 0); |
195 | m_disableFacelights = config.GetBoolean("DisableFacelights", false); | ||
193 | } | 196 | } |
194 | else | 197 | else |
195 | { | 198 | { |
@@ -907,6 +910,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
907 | //this will prevent us from missing important messages | 910 | //this will prevent us from missing important messages |
908 | //before the modules are bound | 911 | //before the modules are bound |
909 | client.DeliverPackets = false; | 912 | client.DeliverPackets = false; |
913 | client.DisableFacelights = m_disableFacelights; | ||
910 | 914 | ||
911 | Util.FireAndForget( | 915 | Util.FireAndForget( |
912 | delegate | 916 | delegate |