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

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
This commit is contained in:
Melanie
2011-10-11 21:21:44 +01:00
parent 859a804d59 de19dc3024
commit cc1fe354d0
8 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1357,8 +1357,6 @@ namespace OpenSim.Region.Framework.Scenes
#endregion Public Properties with only Get
#region Private Methods
private uint ApplyMask(uint val, bool set, uint mask)
{
if (set)
@@ -1371,14 +1369,35 @@ namespace OpenSim.Region.Framework.Scenes
}
}
private void SendObjectPropertiesToClient(UUID AgentID)
/// <summary>
/// Clear all pending updates of parts to clients
/// </summary>
private void ClearUpdateSchedule()
{
m_updateFlag = 0;
}
/// <summary>
/// Send this part's properties (name, description, inventory serial, base mask, etc.) to a client
/// </summary>
/// <param name="client"></param>
public void SendPropertiesToClient(IClientAPI client)
{
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.ForEachScenePresence(delegate(ScenePresence avatar)
{
// Ugly reference :(
if (avatar.UUID == AgentID)
{
m_parentGroup.GetProperties(avatar.ControllingClient);
m_parentGroup.SendPropertiesToClient(avatar.ControllingClient);
}
});
}
@@ -1407,8 +1426,6 @@ namespace OpenSim.Region.Framework.Scenes
// }
// }
#endregion Private Methods
#region Public Methods
public void ResetExpire()
@@ -2077,11 +2094,6 @@ namespace OpenSim.Region.Framework.Scenes
return Vector3.Zero;
}
public void GetProperties(IClientAPI client)
{
client.SendObjectPropertiesReply(this);
}
/// <summary>
/// Method for a prim to get it's world position from the group.
/// </summary>
@@ -3500,7 +3512,7 @@ namespace OpenSim.Region.Framework.Scenes
{
_groupID = groupID;
if (client != null)
GetProperties(client);
SendPropertiesToClient(client);
m_updateFlag = 2;
}
@@ -4320,10 +4332,10 @@ namespace OpenSim.Region.Framework.Scenes
break;
}
SendFullUpdateToAllClients();
SendObjectPropertiesToClient(AgentID);
SendRootPartPropertiesToClient(AgentID);
}
}