Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-12-20 02:49:31 +0000
committer: Melanie 2010-12-20 02:49:31 +0000
commit: 11eabf0e51c213a07cf9cc2048ae67b68ea573ef (patch)
tree: bd046ac4dbfd93ae8801d29318a58b3b52432330 /OpenSim/Region/Framework/Scenes/Scene.cs
parent: fix 'system.exception: unknown type in list.size: system.uint32' (diff)
parent: Put the coarse location updates back to 50 frames, otherwise the dots on the ... (diff)
download: opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.zip
opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.gz
opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.bz2
opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3776d47..d915807 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.Framework.Scenes
        private int m_update_backup = 200;
        private int m_update_terrain = 50;
 //        private int m_update_land = 1;
-        private int m_update_coarse_locations = 80;
+        private int m_update_coarse_locations = 50;
        private int frameMS;
        private int physicsMS2;
author	Melanie	2010-12-20 02:49:31 +0000
committer	Melanie	2010-12-20 02:49:31 +0000
commit	11eabf0e51c213a07cf9cc2048ae67b68ea573ef (patch)
tree	bd046ac4dbfd93ae8801d29318a58b3b52432330 /OpenSim/Region/Framework/Scenes/Scene.cs
parent	fix 'system.exception: unknown type in list.size: system.uint32' (diff)
parent	Put the coarse location updates back to 50 frames, otherwise the dots on the ... (diff)
download	opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.zip opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.gz opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.bz2 opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 3776d47..d915807 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.Framework.Scenes
152	private int m_update_backup = 200;	152	private int m_update_backup = 200;
153	private int m_update_terrain = 50;	153	private int m_update_terrain = 50;
154	// private int m_update_land = 1;	154	// private int m_update_land = 1;
155	private int m_update_coarse_locations = 80;	155	private int m_update_coarse_locations = 50;
156		156
157	private int frameMS;	157	private int frameMS;
158	private int physicsMS2;	158	private int physicsMS2;