aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorSean Dague2007-11-07 22:22:32 +0000
committerSean Dague2007-11-07 22:22:32 +0000
commit288411222755afaeb7e7a9a56c106f60edfa2506 (patch)
tree4093a323a70eb85c5472090676a21b0a7ebd12bc /OpenSim/Region/Environment/Scenes
parentUpdate of libraries MonoXnaCompactMaths and Modified BulletX cause an update ... (diff)
downloadopensim-SC-288411222755afaeb7e7a9a56c106f60edfa2506.zip
opensim-SC-288411222755afaeb7e7a9a56c106f60edfa2506.tar.gz
opensim-SC-288411222755afaeb7e7a9a56c106f60edfa2506.tar.bz2
opensim-SC-288411222755afaeb7e7a9a56c106f60edfa2506.tar.xz
move Sun into a Region Module, pass 1. Currently this works fine with
a fixed 30 minute day and the sun going East -> West again. It gets rid of super noon as well. It's a bit debug heavy right now, which I'll clean up tomorrow. I also plan to make time progression configurable in OpenSim.ini, but that will be tomorrow.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
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
324 if (m_frame%m_update_land == 0) 324 if (m_frame%m_update_land == 0)
325 UpdateLand(); 325 UpdateLand();
326 326
327 if (m_frame%m_update_avatars == 0) 327 // if (m_frame%m_update_avatars == 0)
328 UpdateInWorldTime(); 328 // UpdateInWorldTime();
329 } 329 }
330 catch (NotImplementedException) 330 catch (NotImplementedException)
331 { 331 {
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
855 { 855 {
856 SendOwnWearables( ); 856 SendOwnWearables( );
857 m_scene.SendAllSceneObjectsToClient(this); 857 m_scene.SendAllSceneObjectsToClient(this);
858 m_controllingClient.SendViewerTime(m_scene.TimePhase); 858 // TODO: remove this once the SunModule is slightly more tested
859 // m_controllingClient.SendViewerTime(m_scene.TimePhase);
859 } 860 }
860 861
861 /// <summary> 862 /// <summary>