ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bigmerge

Browse Source
This commit is contained in:
Melanie
2011-11-10 23:44:19 +00:00
parent 008b213ec0 2bd4eaeb19
commit e9055cec17
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -1391,22 +1391,6 @@ namespace OpenSim.Region.Framework.Scenes
client.SendObjectPropertiesReply(this);
}
/// <summary>
/// For the scene object group to which this part belongs, send that scene object's root part properties to a client.
/// </summary>
/// <param name="AgentID"></param>
private void SendRootPartPropertiesToClient(UUID AgentID)
{
m_parentGroup.Scene.ForEachClient(delegate(IClientAPI client)
{
// Ugly reference :(
if (client.AgentId == AgentID)
{
m_parentGroup.SendPropertiesToClient(client);
}
});
}
// TODO: unused:
// private void handleTimerAccounting(uint localID, double interval)
// {
@@ -4268,6 +4252,15 @@ namespace OpenSim.Region.Framework.Scenes
}
}
/// <summary>
/// Update permissions on the SOP. Should only be called from SOG.UpdatePermissions because the SOG
/// will handle the client notifications once all of its parts are updated.
/// </summary>
/// <param name="AgentID"></param>
/// <param name="field"></param>
/// <param name="localID"></param>
/// <param name="mask"></param>
/// <param name="addRemTF"></param>
public void UpdatePermissions(UUID AgentID, byte field, uint localID, uint mask, byte addRemTF)
{
bool set = addRemTF == 1;
@@ -4316,8 +4309,6 @@ namespace OpenSim.Region.Framework.Scenes
}
SendFullUpdateToAllClients();
SendRootPartPropertiesToClient(AgentID);
}
}