Skip to content
This repository has been archived by the owner on Aug 19, 2018. It is now read-only.

Cleanup #56

Merged
merged 7 commits into from
Oct 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions InWorldz/Halcyon/Application.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ public static void Main(string[] args)
if (logConfigFile != String.Empty)
{
XmlConfigurator.Configure(new System.IO.FileInfo(logConfigFile));
m_log.InfoFormat("[OPENSIM MAIN]: configured log4net using \"{0}\" as configuration file",
m_log.InfoFormat("[HALCYON MAIN]: configured log4net using \"{0}\" as configuration file",
logConfigFile);
}
else
{
XmlConfigurator.Configure();
m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config");
m_log.Info("[HALCYON MAIN]: configured log4net using default Halcyon.exe.config");
}

m_log.Info("Performing compatibility checks... ");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,27 @@ namespace InWorldz.ApplicationPlugins.AvatarRemoteCommandModule
/// Command [ app -> regionhost ] (HTTP POST)
///
/// {
/// “id”:”[command_id]”
/// “userId”:”[user_uuid]”
/// “sessionId”:”[session_uuid]”
/// ”regionId”:”[region_uuid]”
/// }
///
/// “id”:”[command_id]”
/// “userId”:”[user_uuid]”
/// “sessionId”:”[session_uuid]”
/// ”regionId”:”[region_uuid]”
/// }
///
/// <param name="id">the command type (RemoteCommandType)</param>
/// <param name="userId">the user’s ID</param>
/// <param name="sessionId">the user's current grid session id to verify this is a legitimate message</param>
/// <param name="regionId">the user’s current regionID</param>
///
///
/// More info can be added on, as shown below for the AvatarChatCommand.
///
/// The response to this request will be in the following format:
///
/// CommandReply [ regionhost -> app ] (REPLY TO HTTP POST)
///
/// {
/// "status":"OK|MOVED|NOTFOUND|UNAUTHORIZED"
/// "data":"[new_region_hostname/ip]"
/// "newRegionId":"[new region id if set]"
/// "status":"OK|MOVED|NOTFOUND|UNAUTHORIZED"
/// "data":"[new_region_hostname/ip]"
/// "newRegionId":"[new region id if set]"
/// }
///
/// <param name="status">The status of the command (RemoteCommandResponse)</param>
Expand All @@ -87,12 +87,12 @@ namespace InWorldz.ApplicationPlugins.AvatarRemoteCommandModule
/// AvatarChatCommand [ app -> regionhost ] (HTTP POST)
///
/// {
/// “id”:”[command_id]”
/// “userId”:”[user_uuid]”
/// “sessionId”:”[session_uuid]”
/// ”regionId”:”[region_uuid]”
/// “id”:”[command_id]”
/// “userId”:”[user_uuid]”
/// “sessionId”:”[session_uuid]”
/// ”regionId”:”[region_uuid]”
/// “channel”:”[chat_channel]”
/// “text”:”[text to be said]”
/// “text”:”[text to be said]”
/// }
///
/// <param name="chat_channel">the channel number to say the chat on</param>
Expand All @@ -103,7 +103,7 @@ namespace InWorldz.ApplicationPlugins.AvatarRemoteCommandModule
/// [AvatarRemoteCommands]
/// Enabled = true
///
/// to your OpenSim.ini file
/// to your Halcyon.ini file
/// </remarks>
public class AvatarRemoteCommandModule : ISharedRegionModule
{
Expand Down Expand Up @@ -160,7 +160,7 @@ private class LeavingRegionInfo

#region INonSharedRegionModule members

public void Initialise(IConfigSource source)
public void Initialize(IConfigSource source)
{
IConfig config = source.Configs["AvatarRemoteCommands"];
if (config == null || !config.GetBoolean("Enabled", false))
Expand All @@ -169,7 +169,7 @@ public void Initialise(IConfigSource source)
_enabled = true;
}

public void PostInitialise()
public void PostInitialize()
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace InWorldz.ApplicationPlugins.ChatFilterModule
/// [ChatFilterModule]
/// Enabled = true
///
/// into OpenSim.ini.
/// into Halcyon.ini.
/// </summary>
public class ChatFilterModule : INonSharedRegionModule
{
Expand Down Expand Up @@ -90,7 +90,7 @@ public Type ReplaceableInterface
get { return null; }
}

public void Initialise(IConfigSource source)
public void Initialize(IConfigSource source)
{
IConfig config = source.Configs[Name];
if (config == null) return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace InWorldz.ApplicationPlugins.ChatLog
/// SeedNode3 = x.host.com
/// SeedNode4 = x.host.com
///
/// into OpenSim.ini.
/// into Halcyon.ini.
/// </summary>
public class InworldzChatLogMessageCassandra12Backend : IApplicationPlugin, IChatMessageLogBackend
{
Expand Down Expand Up @@ -80,7 +80,7 @@ private static readonly log4net.ILog m_log

#region IApplicationPlugin Members

public void Initialise(OpenSimBase openSim)
public void Initialize(OpenSimBase openSim)
{
IConfig config = openSim.ConfigSource.Source.Configs["ChatLogModule"];
if (config == null) return;
Expand Down Expand Up @@ -125,7 +125,7 @@ private void ExtractSeedNodesFromConfig(IConfig config)
}
}

public void PostInitialise()
public void PostInitialize()
{
}

Expand All @@ -139,7 +139,7 @@ public string Name
get { return "InworldzChatLogMessageCassandra12Backend"; }
}

public void Initialise()
public void Initialize()
{
}

Expand All @@ -159,13 +159,13 @@ public void LogChatMessage(ChatMessageLog log)
{
/*
* CREATE TABLE messages (
* message_id uuid PRIMARY KEY,
* from_agent uuid,
* to_agent uuid,
* region_id uuid,
* chat_type int,
* sent_on int,
* sent_on_day timestamp,
* message_id uuid PRIMARY KEY,
* from_agent uuid,
* to_agent uuid,
* region_id uuid,
* chat_type int,
* sent_on int,
* sent_on_day timestamp,
* message text
* );
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace InWorldz.ApplicationPlugins.ChatLog
/// Backend = FileBackend
/// File = Chat.log
///
/// into OpenSim.ini.
/// into Halcyon.ini.
/// </summary>
public class InworldzChatLogMessageFileBackend : IApplicationPlugin, IChatMessageLogBackend
{
Expand All @@ -65,7 +65,7 @@ public class InworldzChatLogMessageFileBackend : IApplicationPlugin, IChatMessag

#region IApplicationPlugin Members

public void Initialise(OpenSimBase openSim)
public void Initialize(OpenSimBase openSim)
{
IConfig config = openSim.ConfigSource.Source.Configs["ChatLogModule"];
if (config == null) return;
Expand All @@ -80,7 +80,7 @@ public void Initialise(OpenSimBase openSim)
}
}

public void PostInitialise()
public void PostInitialize()
{
}

Expand All @@ -94,7 +94,7 @@ public string Name
get { return "InworldzChatLogMessageFileBackend"; }
}

public void Initialise()
public void Initialize()
{
}

Expand Down
4 changes: 2 additions & 2 deletions InWorldz/InWorldz.ApplicationPlugins/ChatLog/ChatLogModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace InWorldz.ApplicationPlugins.ChatLog
/// [ChatLogModule]
/// Enabled = true
///
/// into OpenSim.ini.
/// into Halcyon.ini.
/// </summary>
public class InWorldzChatLogModule : INonSharedRegionModule
{
Expand All @@ -72,7 +72,7 @@ public Type ReplaceableInterface
get { return null; }
}

public void Initialise(IConfigSource source)
public void Initialize(IConfigSource source)
{
IConfig config = source.Configs[Name];
if (config == null) return;
Expand Down
4 changes: 2 additions & 2 deletions InWorldz/InWorldz.ApplicationPlugins/Guest/GuestModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace InWorldz.ApplicationPlugins.GuestModule
/// [GuestModule]
/// Enabled = true
///
/// into OpenSim.ini.
/// into Halcyon.ini.
/// </summary>
public class GuestModule : INonSharedRegionModule
{
Expand Down Expand Up @@ -79,7 +79,7 @@ public Type ReplaceableInterface
get { return null; }
}

public void Initialise(IConfigSource source)
public void Initialize(IConfigSource source)
{
IConfig config = source.Configs[Name];
if (config == null) return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ internal Cache.DiskWriteBackCache DiskWriteBackCache



public void Initialise(ConfigSettings settings)
public void Initialize(ConfigSettings settings)
{
//if this is being called, we were loaded as a plugin instead of the StratusAssetClient
//we shouldnt be loaded like this, throw.
Expand Down Expand Up @@ -602,7 +602,7 @@ public string Name
get { return "InWorldz.Data.Assets.Stratus.CloudFilesAssetClient"; }
}

public void Initialise()
public void Initialize()
{
}

Expand Down
4 changes: 2 additions & 2 deletions InWorldz/InWorldz.Data.Assets.Stratus/StratusAssetClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public class StratusAssetClient : IAssetServer, IAssetReceiver

private IAssetReceiver _assetReceiver;

public void Initialise(ConfigSettings settings)
public void Initialize(ConfigSettings settings)
{
IConfig stratusConfig = settings.SettingsFile["InWorldz.Data.Assets.Stratus"];
if (stratusConfig != null && stratusConfig.GetBoolean("enabled", true))
Expand Down Expand Up @@ -264,7 +264,7 @@ public string Name
get { return "InWorldz.Data.Assets.Stratus.StratusAssetClient"; }
}

public void Initialise()
public void Initialize()
{
}

Expand Down
6 changes: 3 additions & 3 deletions InWorldz/InWorldz.Data.Assets.Stratus/StratusPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ namespace InWorldz.Data.Assets.Stratus
{
public class StratusPlugin : IApplicationPlugin
{
public void Initialise(OpenSimBase openSim)
public void Initialize(OpenSimBase openSim)
{
}

public void PostInitialise()
public void PostInitialize()
{
}

Expand All @@ -56,7 +56,7 @@ public string Name
get { return "StratusPlugin"; }
}

public void Initialise()
public void Initialize()
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public string Name
get { return "InWorldz.Data.Inventory.Cassandra"; }
}

public void Initialise()
public void Initialize()
{

}
Expand Down
2 changes: 1 addition & 1 deletion InWorldz/InWorldz.Phlox.Engine/EngineInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public Type ReplaceableInterface
get { return null; }
}

public void Initialise(Nini.Config.IConfigSource source)
public void Initialize(Nini.Config.IConfigSource source)
{
_configSource = source;

Expand Down
2 changes: 1 addition & 1 deletion InWorldz/InWorldz.Phlox.Engine/ExecutionScheduler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ internal void FinishedLoading(LoadUnloadRequest loadRequest, VM.CompiledScript s

//no state means we need to fire state entry
interp.ScriptState.RunState = VM.RuntimeState.Status.Running;
sysApi.OnScriptReset(); // there is no state, initialize LSL (reset) as a new script (e.g. runtime perms)
sysApi.OnScriptReset(); // there is no state, initialize LSL (reset) as a new script (e.g. runtime perms)
this.PostEvent(interp.ItemId, new VM.PostedEvent { EventType = Types.SupportedEventList.Events.STATE_ENTRY, Args = new object[0] });
}
}
Expand Down
Loading