OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
meta7 2010-08-07 20:14:58 -07:00
parent 0794c6a941 d2b3d45d76
commit 12dd97c9f8
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -315,6 +315,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private int m_cachedTextureSerial; private int m_cachedTextureSerial;
private PriorityQueue m_entityUpdates; private PriorityQueue m_entityUpdates;
private Prioritizer m_prioritizer; private Prioritizer m_prioritizer;
private bool m_disableFacelights = false;
/// <value> /// <value>
/// List used in construction of data blocks for an object update packet. This is to stop us having to /// 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
set { m_IsLoggingOut = value; } set { m_IsLoggingOut = value; }
} }
public bool DisableFacelights
{
get { return m_disableFacelights; }
set { m_disableFacelights = value; }
}
public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } } public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
#endregion Properties #endregion Properties
@ -3522,6 +3529,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
SceneObjectPart part = (SceneObjectPart)update.Entity; SceneObjectPart part = (SceneObjectPart)update.Entity;
if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId)) if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
continue; continue;
if (part.ParentGroup.IsAttachment && m_disableFacelights)
{
if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
{
part.Shape.LightEntry = false;
}
}
} }
++updatesThisCall; ++updatesThisCall;

4
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -153,6 +153,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private int m_defaultRTO = 0; private int m_defaultRTO = 0;
private int m_maxRTO = 0; private int m_maxRTO = 0;
private bool m_disableFacelights = false;
public Socket Server { get { return null; } } public Socket Server { get { return null; } }
public LLUDPServer(IPAddress listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, AgentCircuitManager circuitManager) 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
m_defaultRTO = config.GetInt("DefaultRTO", 0); m_defaultRTO = config.GetInt("DefaultRTO", 0);
m_maxRTO = config.GetInt("MaxRTO", 0); m_maxRTO = config.GetInt("MaxRTO", 0);
m_disableFacelights = config.GetBoolean("DisableFacelights", false);
} }
else else
{ {
@ -907,6 +910,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//this will prevent us from missing important messages //this will prevent us from missing important messages
//before the modules are bound //before the modules are bound
client.DeliverPackets = false; client.DeliverPackets = false;
client.DisableFacelights = m_disableFacelights;
Util.FireAndForget( Util.FireAndForget(
delegate delegate

7
bin/OpenSim.ini.example
View File

@ -390,6 +390,13 @@
; ;
;TextureSendLimit = 20 ;TextureSendLimit = 20
; Quash and remove any light properties from attachments not on the
; hands. This allows flashlights and lanterns to function, but kills
; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
; will also be affected.
;
;DisableFacelights = "false"
[Chat] [Chat]
; Controls whether the chat module is enabled. Default is true. ; Controls whether the chat module is enabled. Default is true.
enabled = true; enabled = true;