aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-01 00:15:30 +0100
committerJustin Clark-Casey (justincc)2011-10-01 00:15:30 +0100
commit246443773ae52420092b483603d0e1daf9b87f00 (patch)
tree38bdc94ce56ed73c5cb614d4711c4080ca0a117b /OpenSim/Region
parentcopy config information on allow/disallow individual os functions into OpenSi... (diff)
downloadopensim-SC_OLD-246443773ae52420092b483603d0e1daf9b87f00.zip
opensim-SC_OLD-246443773ae52420092b483603d0e1daf9b87f00.tar.gz
opensim-SC_OLD-246443773ae52420092b483603d0e1daf9b87f00.tar.bz2
opensim-SC_OLD-246443773ae52420092b483603d0e1daf9b87f00.tar.xz
minor: remove clutter null check from pass in config to AvatarFactoryModule.Initialize()
This is never null
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs13
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionModule.cs9
2 files changed, 14 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 0cadd83..d4e1736 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -64,15 +64,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
64 scene.RegisterModuleInterface<IAvatarFactory>(this); 64 scene.RegisterModuleInterface<IAvatarFactory>(this);
65 scene.EventManager.OnNewClient += NewClient; 65 scene.EventManager.OnNewClient += NewClient;
66 66
67 if (config != null) 67 IConfig sconfig = config.Configs["Startup"];
68 if (sconfig != null)
68 { 69 {
69 IConfig sconfig = config.Configs["Startup"]; 70 m_savetime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime)));
70 if (sconfig != null) 71 m_sendtime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime)));
71 { 72 // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime);
72 m_savetime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime)));
73 m_sendtime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime)));
74 // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime);
75 }
76 } 73 }
77 74
78 if (m_scene == null) 75 if (m_scene == null)
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
index e25a6e8..2bb0c75 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
@@ -35,7 +35,16 @@ namespace OpenSim.Region.Framework.Interfaces
35 /// </summary> 35 /// </summary>
36 public interface IRegionModule 36 public interface IRegionModule
37 { 37 {
38 /// <summary>
39 /// Initialize the module.
40 /// </summary>
41 /// <remarks>
42 /// For a shared module this can be called multiple times - once per scene.
43 /// </remarks>
44 /// <param name="scene"></param>
45 /// <param name="source">Configuration information. For a shared module this will be identical on every scene call</param>
38 void Initialise(Scene scene, IConfigSource source); 46 void Initialise(Scene scene, IConfigSource source);
47
39 void PostInitialise(); 48 void PostInitialise();
40 void Close(); 49 void Close();
41 string Name { get; } 50 string Name { get; }