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/SceneViewer.cs | |
parent | Fix bug where prim items were not loaded in the new sqlite database handler (diff) | |
download | opensim-SC_OLD-bdeda18b52f7ab37501f1751573e26e85656a4e4.zip opensim-SC_OLD-bdeda18b52f7ab37501f1751573e26e85656a4e4.tar.gz opensim-SC_OLD-bdeda18b52f7ab37501f1751573e26e85656a4e4.tar.bz2 opensim-SC_OLD-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/SceneViewer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index 6f2bef9..e4296ef 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
31 | using OpenMetaverse; | 30 | using OpenMetaverse; |
32 | using log4net; | 31 | using log4net; |
33 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
@@ -40,8 +39,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
40 | { | 39 | { |
41 | public class SceneViewer : ISceneViewer | 40 | public class SceneViewer : ISceneViewer |
42 | { | 41 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
44 | |||
45 | protected ScenePresence m_presence; | 42 | protected ScenePresence m_presence; |
46 | protected UpdateQueue m_partsUpdateQueue = new UpdateQueue(); | 43 | protected UpdateQueue m_partsUpdateQueue = new UpdateQueue(); |
47 | protected Queue<SceneObjectGroup> m_pendingObjects; | 44 | protected Queue<SceneObjectGroup> m_pendingObjects; |
@@ -63,9 +60,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
63 | /// <param name="part"></param> | 60 | /// <param name="part"></param> |
64 | public void QueuePartForUpdate(SceneObjectPart part) | 61 | public void QueuePartForUpdate(SceneObjectPart part) |
65 | { | 62 | { |
66 | if (part.IsAttachment) | ||
67 | m_log.DebugFormat("[SCENE VIEWER]: Queueing part {0} {1} for update", part.Name, part.LocalId); | ||
68 | |||
69 | lock (m_partsUpdateQueue) | 63 | lock (m_partsUpdateQueue) |
70 | { | 64 | { |
71 | m_partsUpdateQueue.Enqueue(part); | 65 | m_partsUpdateQueue.Enqueue(part); |
@@ -140,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
140 | } | 134 | } |
141 | else if (update.LastTerseUpdateTime <= part.TimeStampTerse) | 135 | else if (update.LastTerseUpdateTime <= part.TimeStampTerse) |
142 | { | 136 | { |
143 | // m_log.DebugFormat(AddFullUpdateToAvatar | 137 | // m_log.DebugFormat( |
144 | // "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}", | 138 | // "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}", |
145 | // part.Name, part.UUID, part.TimeStampTerse); | 139 | // part.Name, part.UUID, part.TimeStampTerse); |
146 | 140 | ||