diff options
| author | Melanie | 2012-08-04 03:00:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-04 03:00:20 +0100 |
| commit | b9c4a637b46d0c47d5348181dd75c4cc3d44f43d (patch) | |
| tree | 7cf26233b2aaea5556f9842d7a44e35860098a95 /OpenSim/Region/CoreModules/Avatar/AvatarFactory | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Strip experimental tag from --publish option of "save oar" region console com... (diff) | |
| download | opensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.zip opensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.gz opensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.bz2 opensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 89cc4f6..bd7bd82 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -66,11 +66,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 66 | scene.RegisterModuleInterface<IAvatarFactoryModule>(this); | 66 | scene.RegisterModuleInterface<IAvatarFactoryModule>(this); |
| 67 | scene.EventManager.OnNewClient += SubscribeToClientEvents; | 67 | scene.EventManager.OnNewClient += SubscribeToClientEvents; |
| 68 | 68 | ||
| 69 | IConfig sconfig = config.Configs["Startup"]; | 69 | IConfig appearanceConfig = config.Configs["Appearance"]; |
| 70 | if (sconfig != null) | 70 | if (appearanceConfig != null) |
| 71 | { | 71 | { |
| 72 | m_savetime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime))); | 72 | m_savetime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime))); |
| 73 | m_sendtime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime))); | 73 | m_sendtime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime))); |
| 74 | // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime); | 74 | // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime); |
| 75 | } | 75 | } |
| 76 | 76 | ||