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

One more module converted: GodsModule.

integration
Diva Canto 2012-11-10 17:34:42 -08:00
parent cdcb67a952
commit 562c585bc6
2 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
View File

@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System;
using System.Collections.Generic; using System.Collections.Generic;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
@ -32,28 +33,58 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using Mono.Addins;
namespace OpenSim.Region.CoreModules.Avatar.Gods namespace OpenSim.Region.CoreModules.Avatar.Gods
{ {
public class GodsModule : IRegionModule, IGodsModule [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
public class GodsModule : INonSharedRegionModule, IGodsModule
{ {
/// <summary>Special UUID for actions that apply to all agents</summary> /// <summary>Special UUID for actions that apply to all agents</summary>
private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb"); private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb");
protected Scene m_scene; protected Scene m_scene;
protected IDialogModule m_dialogModule; protected IDialogModule m_dialogModule;
protected IDialogModule DialogModule
{
get
{
if (m_dialogModule == null)
m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
public void Initialise(Scene scene, IConfigSource source) return m_dialogModule;
}
}
public void Initialise(IConfigSource source)
{
}
public void AddRegion(Scene scene)
{ {
m_scene = scene; m_scene = scene;
m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
m_scene.RegisterModuleInterface<IGodsModule>(this); m_scene.RegisterModuleInterface<IGodsModule>(this);
m_scene.EventManager.OnNewClient += SubscribeToClientEvents; m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
} }
public void PostInitialise() {} public void RemoveRegion(Scene scene)
{
m_scene.UnregisterModuleInterface<IGodsModule>(this);
m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
m_scene = null;
}
public void RegionLoaded(Scene scene)
{
}
public void Close() {} public void Close() {}
public string Name { get { return "Gods Module"; } } public string Name { get { return "Gods Module"; } }
public bool IsSharedModule { get { return false; } }
public Type ReplaceableInterface
{
get { return null; }
}
public void SubscribeToClientEvents(IClientAPI client) public void SubscribeToClientEvents(IClientAPI client)
{ {
@ -96,8 +127,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
} }
else else
{ {
if (m_dialogModule != null) if (DialogModule != null)
m_dialogModule.SendAlertToUser(agentID, "Request for god powers denied"); DialogModule.SendAlertToUser(agentID, "Request for god powers denied");
} }
} }
} }
@ -121,7 +152,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
if (sp != null || agentID == kickUserID) if (sp != null || agentID == kickUserID)
{ {
m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
if (m_scene.Permissions.IsGod(godID)) if (m_scene.Permissions.IsGod(godID))
{ {
if (kickflags == 0) if (kickflags == 0)
@ -163,27 +193,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
if (kickflags == 1) if (kickflags == 1)
{ {
sp.AllowMovement = false; sp.AllowMovement = false;
if (m_dialogModule != null) if (DialogModule != null)
{ {
m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason)); DialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
m_dialogModule.SendAlertToUser(godID, "User Frozen"); DialogModule.SendAlertToUser(godID, "User Frozen");
} }
} }
if (kickflags == 2) if (kickflags == 2)
{ {
sp.AllowMovement = true; sp.AllowMovement = true;
if (m_dialogModule != null) if (DialogModule != null)
{ {
m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason)); DialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
m_dialogModule.SendAlertToUser(godID, "User Unfrozen"); DialogModule.SendAlertToUser(godID, "User Unfrozen");
} }
} }
} }
else else
{ {
if (m_dialogModule != null) if (DialogModule != null)
m_dialogModule.SendAlertToUser(godID, "Kick request denied"); DialogModule.SendAlertToUser(godID, "Kick request denied");
} }
} }
} }

6
OpenSim/Tests/Common/Helpers/SceneHelpers.cs
View File

@ -141,9 +141,9 @@ namespace OpenSim.Tests.Common
TestScene testScene = new TestScene( TestScene testScene = new TestScene(
regInfo, m_acm, scs, m_simDataService, m_estateDataService, null, false, configSource, null); regInfo, m_acm, scs, m_simDataService, m_estateDataService, null, false, configSource, null);
IRegionModule godsModule = new GodsModule(); INonSharedRegionModule godsModule = new GodsModule();
godsModule.Initialise(testScene, new IniConfigSource()); godsModule.Initialise(new IniConfigSource());
testScene.AddModule(godsModule.Name, godsModule); godsModule.AddRegion(testScene);
// Add scene to services // Add scene to services
m_assetService.AddRegion(testScene); m_assetService.AddRegion(testScene);