Stop generating client flags when we send out full object updates.
These were entirely unused.0.7.2-post-fixes
parent
b3cfc5b76e
commit
deb50cd410
|
@ -10327,6 +10327,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool HandleGroupRoleMembersRequest(IClientAPI sender, Packet Pack)
|
private bool HandleGroupRoleMembersRequest(IClientAPI sender, Packet Pack)
|
||||||
{
|
{
|
||||||
GroupRoleMembersRequestPacket groupRoleMembersRequest =
|
GroupRoleMembersRequestPacket groupRoleMembersRequest =
|
||||||
|
|
|
@ -1390,15 +1390,14 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
public void SendFullUpdateToClient(IClientAPI remoteClient)
|
public void SendFullUpdateToClient(IClientAPI remoteClient)
|
||||||
{
|
{
|
||||||
RootPart.SendFullUpdate(
|
RootPart.SendFullUpdate(remoteClient);
|
||||||
remoteClient, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID));
|
|
||||||
|
|
||||||
SceneObjectPart[] parts = m_parts.GetArray();
|
SceneObjectPart[] parts = m_parts.GetArray();
|
||||||
for (int i = 0; i < parts.Length; i++)
|
for (int i = 0; i < parts.Length; i++)
|
||||||
{
|
{
|
||||||
SceneObjectPart part = parts[i];
|
SceneObjectPart part = parts[i];
|
||||||
if (part != RootPart)
|
if (part != RootPart)
|
||||||
part.SendFullUpdate(remoteClient, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, part.UUID));
|
part.SendFullUpdate(remoteClient);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2861,8 +2861,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
/// Send a full update to the client for the given part
|
/// Send a full update to the client for the given part
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="remoteClient"></param>
|
/// <param name="remoteClient"></param>
|
||||||
/// <param name="clientFlags"></param>
|
protected internal void SendFullUpdate(IClientAPI remoteClient)
|
||||||
protected internal void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
|
|
||||||
{
|
{
|
||||||
if (m_parentGroup == null)
|
if (m_parentGroup == null)
|
||||||
return;
|
return;
|
||||||
|
@ -2874,16 +2873,16 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
if (m_parentGroup.IsAttachment)
|
if (m_parentGroup.IsAttachment)
|
||||||
{
|
{
|
||||||
SendFullUpdateToClient(remoteClient, AttachedPos, clientFlags);
|
SendFullUpdateToClient(remoteClient, AttachedPos);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SendFullUpdateToClient(remoteClient, AbsolutePosition, clientFlags);
|
SendFullUpdateToClient(remoteClient, AbsolutePosition);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SendFullUpdateToClient(remoteClient, clientFlags);
|
SendFullUpdateToClient(remoteClient);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2897,7 +2896,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
|
m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
|
||||||
{
|
{
|
||||||
SendFullUpdate(avatar.ControllingClient, avatar.GenerateClientFlags(UUID));
|
SendFullUpdate(avatar.ControllingClient);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2914,7 +2913,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
// Ugly reference :(
|
// Ugly reference :(
|
||||||
if (avatar.UUID != agentID)
|
if (avatar.UUID != agentID)
|
||||||
SendFullUpdate(avatar.ControllingClient, avatar.GenerateClientFlags(UUID));
|
SendFullUpdate(avatar.ControllingClient);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2922,12 +2921,9 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
/// Sends a full update to the client
|
/// Sends a full update to the client
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="remoteClient"></param>
|
/// <param name="remoteClient"></param>
|
||||||
/// <param name="clientFlags"></param>
|
public void SendFullUpdateToClient(IClientAPI remoteClient)
|
||||||
public void SendFullUpdateToClient(IClientAPI remoteClient, uint clientflags)
|
|
||||||
{
|
{
|
||||||
Vector3 lPos;
|
SendFullUpdateToClient(remoteClient, OffsetPosition);
|
||||||
lPos = OffsetPosition;
|
|
||||||
SendFullUpdateToClient(remoteClient, lPos, clientflags);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -2935,8 +2931,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="remoteClient"></param>
|
/// <param name="remoteClient"></param>
|
||||||
/// <param name="lPos"></param>
|
/// <param name="lPos"></param>
|
||||||
/// <param name="clientFlags"></param>
|
public void SendFullUpdateToClient(IClientAPI remoteClient, Vector3 lPos)
|
||||||
public void SendFullUpdateToClient(IClientAPI remoteClient, Vector3 lPos, uint clientFlags)
|
|
||||||
{
|
{
|
||||||
if (ParentGroup == null)
|
if (ParentGroup == null)
|
||||||
return;
|
return;
|
||||||
|
@ -2953,15 +2948,10 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
(ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38))
|
(ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
clientFlags &= ~(uint) PrimFlags.CreateSelected;
|
if (remoteClient.AgentId == OwnerID)
|
||||||
|
|
||||||
if (remoteClient.AgentId == _ownerID)
|
|
||||||
{
|
{
|
||||||
if ((Flags & PrimFlags.CreateSelected) != 0)
|
if ((Flags & PrimFlags.CreateSelected) != 0)
|
||||||
{
|
|
||||||
clientFlags |= (uint) PrimFlags.CreateSelected;
|
|
||||||
Flags &= ~PrimFlags.CreateSelected;
|
Flags &= ~PrimFlags.CreateSelected;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//bool isattachment = IsAttachment;
|
//bool isattachment = IsAttachment;
|
||||||
//if (LocalId != ParentGroup.RootPart.LocalId)
|
//if (LocalId != ParentGroup.RootPart.LocalId)
|
||||||
|
|
|
@ -761,16 +761,15 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
public void RegisterToEvents()
|
public void RegisterToEvents()
|
||||||
{
|
{
|
||||||
m_controllingClient.OnCompleteMovementToRegion += CompleteMovement;
|
ControllingClient.OnCompleteMovementToRegion += CompleteMovement;
|
||||||
//m_controllingClient.OnCompleteMovementToRegion += SendInitialData;
|
ControllingClient.OnAgentUpdate += HandleAgentUpdate;
|
||||||
m_controllingClient.OnAgentUpdate += HandleAgentUpdate;
|
ControllingClient.OnAgentRequestSit += HandleAgentRequestSit;
|
||||||
m_controllingClient.OnAgentRequestSit += HandleAgentRequestSit;
|
ControllingClient.OnAgentSit += HandleAgentSit;
|
||||||
m_controllingClient.OnAgentSit += HandleAgentSit;
|
ControllingClient.OnSetAlwaysRun += HandleSetAlwaysRun;
|
||||||
m_controllingClient.OnSetAlwaysRun += HandleSetAlwaysRun;
|
ControllingClient.OnStartAnim += HandleStartAnim;
|
||||||
m_controllingClient.OnStartAnim += HandleStartAnim;
|
ControllingClient.OnStopAnim += HandleStopAnim;
|
||||||
m_controllingClient.OnStopAnim += HandleStopAnim;
|
ControllingClient.OnForceReleaseControls += HandleForceReleaseControls;
|
||||||
m_controllingClient.OnForceReleaseControls += HandleForceReleaseControls;
|
ControllingClient.OnAutoPilotGo += MoveToTarget;
|
||||||
m_controllingClient.OnAutoPilotGo += MoveToTarget;
|
|
||||||
|
|
||||||
// ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
|
// ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
|
||||||
// ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
|
// ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
|
||||||
|
@ -806,11 +805,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
public uint GenerateClientFlags(UUID ObjectID)
|
|
||||||
{
|
|
||||||
return m_scene.Permissions.GenerateClientFlags(m_uuid, ObjectID);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Send updates to the client about prims which have been placed on the update queue. We don't
|
/// Send updates to the client about prims which have been placed on the update queue. We don't
|
||||||
/// necessarily send updates for all the parts on the queue, e.g. if an updates with a more recent
|
/// necessarily send updates for all the parts on the queue, e.g. if an updates with a more recent
|
||||||
|
@ -820,7 +814,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
m_sceneViewer.SendPrimUpdates();
|
m_sceneViewer.SendPrimUpdates();
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Status Methods
|
#region Status Methods
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
Loading…
Reference in New Issue