Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-03-15 17:23:35 +00:00
89 changed files with 13161 additions and 3963 deletions

View File

@@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes
ApplyPhysics(m_scene.m_physicalPrim);
// Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
// for the same object with very different properties. The caller must schedule the update.
// for the same object with very different properties. The caller must schedule the update.
//ScheduleGroupForFullUpdate();
}
@@ -2185,11 +2185,11 @@ namespace OpenSim.Region.Framework.Scenes
/// Immediately send a full update for this scene object.
/// </summary>
public void SendGroupFullUpdate()
{
{
if (IsDeleted)
return;
// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
RootPart.SendFullUpdateToAllClients();