Merge branch 'master' into careminster

avinationmerge
Melanie 2010-01-28 02:07:18 +00:00
commit 2d9b69c186
10 changed files with 72 additions and 68 deletions

View File

@ -87,7 +87,7 @@ using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.CoreModules.Scripting.WorldComm
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
public class WorldCommModule : INonSharedRegionModule, IWorldComm
public class WorldCommModule : ISharedRegionModule, IWorldComm
{
// private static readonly ILog m_log =
// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -127,6 +127,10 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
m_pending = Queue.Synchronized(m_pendingQ);
}
public void PostInitialise()
{
}
public void AddRegion(Scene scene)
{
m_scene = scene;