aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneViewer.cs
diff options
context:
space:
mode:
authorMic Bowman2011-08-29 09:55:34 -0700
committerMic Bowman2011-08-29 09:55:34 -0700
commit648866b59761cfbd76e2bd267011c935812770d0 (patch)
tree4ff1227fb7fbe684b42deabd07de5831ae6497da /OpenSim/Region/Framework/Scenes/SceneViewer.cs
parentBulletSim: add mesh representation. Use meshes for static objects and switch ... (diff)
parentMove GetMeshKey from buried inside Meshmerizer to a public method on Primitiv... (diff)
downloadopensim-SC_OLD-648866b59761cfbd76e2bd267011c935812770d0.zip
opensim-SC_OLD-648866b59761cfbd76e2bd267011c935812770d0.tar.gz
opensim-SC_OLD-648866b59761cfbd76e2bd267011c935812770d0.tar.bz2
opensim-SC_OLD-648866b59761cfbd76e2bd267011c935812770d0.tar.xz
Merge branch 'master' into bulletsim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 7c067ca..997845b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -120,8 +120,7 @@ namespace OpenSim.Region.Framework.Scenes
120 // We deal with the possibility that two updates occur at 120 // We deal with the possibility that two updates occur at
121 // the same unix time at the update point itself. 121 // the same unix time at the update point itself.
122 122
123 if ((update.LastFullUpdateTime < part.TimeStampFull) || 123 if ((update.LastFullUpdateTime < part.TimeStampFull) || part.ParentGroup.IsAttachment)
124 part.IsAttachment)
125 { 124 {
126 // m_log.DebugFormat( 125 // m_log.DebugFormat(
127 // "[SCENE PRESENCE]: Fully updating prim {0}, {1} - part timestamp {2}", 126 // "[SCENE PRESENCE]: Fully updating prim {0}, {1} - part timestamp {2}",