diff options
author | Justin Clark-Casey (justincc) | 2010-06-04 18:54:48 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-04 18:54:58 +0100 |
commit | bdeda18b52f7ab37501f1751573e26e85656a4e4 (patch) | |
tree | f9b3a76e6f1e5d49f3ae2c56c269ddd9a23ae43c /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Fix bug where prim items were not loaded in the new sqlite database handler (diff) | |
download | opensim-SC-bdeda18b52f7ab37501f1751573e26e85656a4e4.zip opensim-SC-bdeda18b52f7ab37501f1751573e26e85656a4e4.tar.gz opensim-SC-bdeda18b52f7ab37501f1751573e26e85656a4e4.tar.bz2 opensim-SC-bdeda18b52f7ab37501f1751573e26e85656a4e4.tar.xz |
Revert "commit code which stops full updates being fired multiple times when attachments cross standalone region boundaries"
This reverts commit 5074d290e4aeb583560272cadc8ba09aa8337210.
This gets rid of the massive amount of scene object log spam - sorry about that, folks
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index ba3fde7..602b811 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1494,10 +1494,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1494 | 1494 | ||
1495 | public void SendFullUpdateToClient(IClientAPI remoteClient) | 1495 | public void SendFullUpdateToClient(IClientAPI remoteClient) |
1496 | { | 1496 | { |
1497 | if (IsAttachment) | ||
1498 | m_log.DebugFormat( | ||
1499 | "[SOG]: Sending full update to client {0} for {1} {2}", remoteClient.Name, Name, LocalId); | ||
1500 | |||
1501 | SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID)); | 1497 | SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID)); |
1502 | 1498 | ||
1503 | lock (m_parts) | 1499 | lock (m_parts) |
@@ -1517,9 +1513,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1517 | /// <param name="part"></param> | 1513 | /// <param name="part"></param> |
1518 | internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags) | 1514 | internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags) |
1519 | { | 1515 | { |
1520 | if (IsAttachment) | 1516 | // m_log.DebugFormat( |
1521 | m_log.DebugFormat( | 1517 | // "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId); |
1522 | "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId); | ||
1523 | 1518 | ||
1524 | if (m_rootPart.UUID == part.UUID) | 1519 | if (m_rootPart.UUID == part.UUID) |
1525 | { | 1520 | { |
@@ -1999,8 +1994,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1999 | 1994 | ||
2000 | public void ScheduleFullUpdateToAvatar(ScenePresence presence) | 1995 | public void ScheduleFullUpdateToAvatar(ScenePresence presence) |
2001 | { | 1996 | { |
2002 | if (IsAttachment) | 1997 | // m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name); |
2003 | m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name); | ||
2004 | 1998 | ||
2005 | RootPart.AddFullUpdateToAvatar(presence); | 1999 | RootPart.AddFullUpdateToAvatar(presence); |
2006 | 2000 | ||
@@ -2032,8 +2026,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2032 | /// </summary> | 2026 | /// </summary> |
2033 | public void ScheduleGroupForFullUpdate() | 2027 | public void ScheduleGroupForFullUpdate() |
2034 | { | 2028 | { |
2035 | if (IsAttachment) | 2029 | // m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID); |
2036 | m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID); | ||
2037 | 2030 | ||
2038 | checkAtTargets(); | 2031 | checkAtTargets(); |
2039 | RootPart.ScheduleFullUpdate(); | 2032 | RootPart.ScheduleFullUpdate(); |