OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge

avinationmerge
Melanie 2011-10-11 23:15:17 +01:00
parent ae8504f8d9 246443773a
commit ae67eb0a1f
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@ -64,15 +64,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
scene.RegisterModuleInterface<IAvatarFactory>(this); scene.RegisterModuleInterface<IAvatarFactory>(this);
scene.EventManager.OnNewClient += NewClient; scene.EventManager.OnNewClient += NewClient;
if (config != null) IConfig sconfig = config.Configs["Startup"];
if (sconfig != null)
{ {
IConfig sconfig = config.Configs["Startup"]; m_savetime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime)));
if (sconfig != null) m_sendtime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime)));
{ // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime);
m_savetime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime)));
m_sendtime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime)));
// m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime);
}
} }
if (m_scene == null) if (m_scene == null)

9
OpenSim/Region/Framework/Interfaces/IRegionModule.cs
View File

@ -35,7 +35,16 @@ namespace OpenSim.Region.Framework.Interfaces
/// </summary> /// </summary>
public interface IRegionModule public interface IRegionModule
{ {
/// <summary>
/// Initialize the module.
/// </summary>
/// <remarks>
/// For a shared module this can be called multiple times - once per scene.
/// </remarks>
/// <param name="scene"></param>
/// <param name="source">Configuration information. For a shared module this will be identical on every scene call</param>
void Initialise(Scene scene, IConfigSource source); void Initialise(Scene scene, IConfigSource source);
void PostInitialise(); void PostInitialise();
void Close(); void Close();
string Name { get; } string Name { get; }