diff options
author | Master ScienceSim | 2010-10-28 12:00:04 -0700 |
---|---|---|
committer | Master ScienceSim | 2010-10-28 12:00:04 -0700 |
commit | 68666efd25f4d094949f31eae08ee17fd821b7e4 (patch) | |
tree | 434deb6cc46b270750a08f35399fe00a57088370 /OpenSim/Region/CoreModules | |
parent | Merge branch 'opensim-master' into dev-appearance (diff) | |
download | opensim-SC-68666efd25f4d094949f31eae08ee17fd821b7e4.zip opensim-SC-68666efd25f4d094949f31eae08ee17fd821b7e4.tar.gz opensim-SC-68666efd25f4d094949f31eae08ee17fd821b7e4.tar.bz2 opensim-SC-68666efd25f4d094949f31eae08ee17fd821b7e4.tar.xz |
Configuration of persistent baked textures and save/send delays.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 903e94b..5f8b4f6 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -48,20 +48,30 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
48 | private static readonly byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 }; | 48 | private static readonly byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 }; |
49 | private Scene m_scene = null; | 49 | private Scene m_scene = null; |
50 | 50 | ||
51 | private static readonly int m_savetime = 5; // seconds to wait before saving changed appearance | 51 | private int m_savetime = 5; // seconds to wait before saving changed appearance |
52 | private static readonly int m_sendtime = 2; // seconds to wait before sending changed appearance | 52 | private int m_sendtime = 2; // seconds to wait before sending changed appearance |
53 | 53 | ||
54 | private static readonly int m_checkTime = 500; // milliseconds to wait between checks for appearance updates | 54 | private int m_checkTime = 500; // milliseconds to wait between checks for appearance updates |
55 | private System.Timers.Timer m_updateTimer = new System.Timers.Timer(); | 55 | private System.Timers.Timer m_updateTimer = new System.Timers.Timer(); |
56 | private Dictionary<UUID,long> m_savequeue = new Dictionary<UUID,long>(); | 56 | private Dictionary<UUID,long> m_savequeue = new Dictionary<UUID,long>(); |
57 | private Dictionary<UUID,long> m_sendqueue = new Dictionary<UUID,long>(); | 57 | private Dictionary<UUID,long> m_sendqueue = new Dictionary<UUID,long>(); |
58 | 58 | ||
59 | #region RegionModule Members | 59 | #region RegionModule Members |
60 | 60 | ||
61 | public void Initialise(Scene scene, IConfigSource source) | 61 | public void Initialise(Scene scene, IConfigSource config) |
62 | { | 62 | { |
63 | scene.EventManager.OnNewClient += NewClient; | 63 | scene.EventManager.OnNewClient += NewClient; |
64 | 64 | ||
65 | if (config != null) | ||
66 | { | ||
67 | IConfig sconfig = config.Configs["Startup"]; | ||
68 | if (sconfig != null) | ||
69 | { | ||
70 | m_savetime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime))); | ||
71 | m_sendtime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime))); | ||
72 | } | ||
73 | } | ||
74 | |||
65 | if (m_scene == null) | 75 | if (m_scene == null) |
66 | m_scene = scene; | 76 | m_scene = scene; |
67 | } | 77 | } |