diff options
| author | Robert Adams | 2012-08-03 15:10:55 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-08-03 15:10:55 -0700 |
| commit | 8730dc9d6a9ecd7f11f56fe41aeafa7a981a5c54 (patch) | |
| tree | c342a26f2658288270240fe1e44cf8955cd3d2ee /OpenSim | |
| parent | BulletSim: update DLLs and SOs (diff) | |
| parent | Update settings loading in AvatarFactoryModule which should have been in last... (diff) | |
| download | opensim-SC_OLD-8730dc9d6a9ecd7f11f56fe41aeafa7a981a5c54.zip opensim-SC_OLD-8730dc9d6a9ecd7f11f56fe41aeafa7a981a5c54.tar.gz opensim-SC_OLD-8730dc9d6a9ecd7f11f56fe41aeafa7a981a5c54.tar.bz2 opensim-SC_OLD-8730dc9d6a9ecd7f11f56fe41aeafa7a981a5c54.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -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 68a4cde..47d5c97 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 = appearanceConfig.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 | ||