2 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d436bb3..7e1bbfa 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -324,8 +324,8 @@ namespace OpenSim.Region.Environment.Scenes
                 if (m_frame%m_update_land == 0)
                     UpdateLand();
 
-                if (m_frame%m_update_avatars == 0)
-                    UpdateInWorldTime();
+                // if (m_frame%m_update_avatars == 0)
+                //   UpdateInWorldTime();
             }
             catch (NotImplementedException)
             {
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index b08f39f..789bd68 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -855,7 +855,8 @@ namespace OpenSim.Region.Environment.Scenes
         {
             SendOwnWearables( );
             m_scene.SendAllSceneObjectsToClient(this);
-            m_controllingClient.SendViewerTime(m_scene.TimePhase);
+            // TODO: remove this once the SunModule is slightly more tested
+            // m_controllingClient.SendViewerTime(m_scene.TimePhase);
         }
 
         /// <summary>