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

Merge branch 'avination' into careminster

avinationmerge
Melanie 2012-08-20 15:58:47 +01:00
parent 914f97cb76 0a959343a5
commit 7f7f005da4
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
View File

@ -64,6 +64,8 @@ namespace OpenSim.Region.ClientStack.Linden
private Commands m_commands = new Commands(); private Commands m_commands = new Commands();
public ICommands Commands { get { return m_commands; } } public ICommands Commands { get { return m_commands; } }
public event ConsoleMessage OnConsoleMessage;
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
{ {
m_commands.AddCommand( "Help", false, "help", "help [<item>]", "Display help on a particular command or on a list of commands in a category", Help); m_commands.AddCommand( "Help", false, "help", "help [<item>]", "Display help on a particular command or on a list of commands in a category", Help);
@ -118,6 +120,11 @@ namespace OpenSim.Region.ClientStack.Linden
OSD osd = OSD.FromString(message); OSD osd = OSD.FromString(message);
m_eventQueue.Enqueue(EventQueueHelper.BuildEvent("SimConsoleResponse", osd), agentID); m_eventQueue.Enqueue(EventQueueHelper.BuildEvent("SimConsoleResponse", osd), agentID);
ConsoleMessage handlerConsoleMessage = OnConsoleMessage;
if (handlerConsoleMessage != null)
handlerConsoleMessage( agentID, message);
} }
public bool RunCommand(string command, UUID invokerID) public bool RunCommand(string command, UUID invokerID)

4
OpenSim/Region/Framework/Interfaces/IRegionConsole.cs
View File

@ -30,8 +30,12 @@ using OpenSim.Framework;
namespace OpenSim.Region.Framework.Interfaces namespace OpenSim.Region.Framework.Interfaces
{ {
public delegate void ConsoleMessage(UUID toAgentID, string message);
public interface IRegionConsole public interface IRegionConsole
{ {
event ConsoleMessage OnConsoleMessage;
bool RunCommand(string command, UUID invokerID); bool RunCommand(string command, UUID invokerID);
void SendConsoleOutput(UUID agentID, string message); void SendConsoleOutput(UUID agentID, string message);
void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn); void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn);

2
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
View File

@ -76,7 +76,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
if (m_console != null) if (m_console != null)
{ {
m_console.AddCommand("TempATtachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner os estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms); m_console.AddCommand("TempAttachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner os estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms);
} }
} }
else else