From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- .../BareBonesNonShared/BareBonesNonSharedModule.cs | 28 +++++++++---------- .../BareBonesShared/BareBonesSharedModule.cs | 32 +++++++++++----------- .../WebSocketEchoTest/WebSocketEchoModule.cs | 10 +++---- 3 files changed, 35 insertions(+), 35 deletions(-) (limited to 'OpenSim/Region/OptionalModules/Example') diff --git a/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs b/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs index bbf7168..95a2dd6 100644 --- a/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs +++ b/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs @@ -46,12 +46,12 @@ namespace OpenSim.Region.OptionalModules.Example.BareBonesNonShared /// /// /// This module is the simplest possible example of a non-shared region module (a module where each scene/region - /// in the simulator has its own copy). If anybody wants to create a more complex example in the future then + /// in the simulator has its own copy). If anybody wants to create a more complex example in the future then /// please create a separate class. - /// - /// This module is not active by default. If you want to see it in action, + /// + /// This module is not active by default. If you want to see it in action, /// then just uncomment the line below starting with [Extension(Path... - /// + /// /// When the module is enabled it will print messages when it receives certain events to the screen and the log /// file. /// @@ -59,34 +59,34 @@ namespace OpenSim.Region.OptionalModules.Example.BareBonesNonShared public class BareBonesNonSharedModule : INonSharedRegionModule { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - public string Name { get { return "Bare Bones Non Shared Module"; } } - + + public string Name { get { return "Bare Bones Non Shared Module"; } } + public Type ReplaceableInterface { get { return null; } } - + public void Initialise(IConfigSource source) { m_log.DebugFormat("[BARE BONES NON SHARED]: INITIALIZED MODULE"); } - + public void Close() { m_log.DebugFormat("[BARE BONES NON SHARED]: CLOSED MODULE"); } - + public void AddRegion(Scene scene) { m_log.DebugFormat("[BARE BONES NON SHARED]: REGION {0} ADDED", scene.RegionInfo.RegionName); } - + public void RemoveRegion(Scene scene) { m_log.DebugFormat("[BARE BONES NON SHARED]: REGION {0} REMOVED", scene.RegionInfo.RegionName); - } - + } + public void RegionLoaded(Scene scene) { m_log.DebugFormat("[BARE BONES NON SHARED]: REGION {0} LOADED", scene.RegionInfo.RegionName); - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs index 46fea3e..1271e3f 100644 --- a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs +++ b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs @@ -46,52 +46,52 @@ namespace OpenSim.Region.OptionalModules.Example.BareBonesShared /// /// /// This module is the simplest possible example of a shared region module (a module which is shared by every - /// scene/region running on the simulator). If anybody wants to create a more complex example in the future then + /// scene/region running on the simulator). If anybody wants to create a more complex example in the future then /// please create a separate class. - /// - /// This module is not active by default. If you want to see it in action, + /// + /// This module is not active by default. If you want to see it in action, /// then just uncomment the line below starting with [Extension(Path... - /// + /// /// When the module is enabled it will print messages when it receives certain events to the screen and the log /// file. /// //[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BareBonesSharedModule")] public class BareBonesSharedModule : ISharedRegionModule { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - public string Name { get { return "Bare Bones Shared Module"; } } - + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + + public string Name { get { return "Bare Bones Shared Module"; } } + public Type ReplaceableInterface { get { return null; } } - + public void Initialise(IConfigSource source) { m_log.DebugFormat("[BARE BONES SHARED]: INITIALIZED MODULE"); } - + public void PostInitialise() { m_log.DebugFormat("[BARE BONES SHARED]: POST INITIALIZED MODULE"); } - + public void Close() { m_log.DebugFormat("[BARE BONES SHARED]: CLOSED MODULE"); } - + public void AddRegion(Scene scene) { m_log.DebugFormat("[BARE BONES SHARED]: REGION {0} ADDED", scene.RegionInfo.RegionName); } - + public void RemoveRegion(Scene scene) { m_log.DebugFormat("[BARE BONES SHARED]: REGION {0} REMOVED", scene.RegionInfo.RegionName); - } - + } + public void RegionLoaded(Scene scene) { m_log.DebugFormat("[BARE BONES SHARED]: REGION {0} LOADED", scene.RegionInfo.RegionName); - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs b/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs index 5bf0ed4..0747cc0 100644 --- a/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs +++ b/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs @@ -40,7 +40,7 @@ using OpenSim.Framework.Servers.HttpServer; namespace OpenSim.Region.OptionalModules.WebSocketEchoModule { - + [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebSocketEchoModule")] public class WebSocketEchoModule : ISharedRegionModule { @@ -111,7 +111,7 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule obj.SendPingCheck(); } - + private void HandlerOnOnUpgradeCompleted(object sender, UpgradeCompletedEventArgs completeddata) { WebSocketHttpServerHandler obj = sender as WebSocketHttpServerHandler; @@ -136,14 +136,14 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule obj.Dispose(); } - // Shutting down.. so shut down all sockets. + // Shutting down.. so shut down all sockets. // Note.. this should be done outside of an ienumerable if you're also hook to the close event. public void Close() { if (!enabled) return; - - // We convert this to a for loop so we're not in in an IEnumerable when the close + + // We convert this to a for loop so we're not in in an IEnumerable when the close //call triggers an event which then removes item from _activeHandlers that we're enumerating WebSocketHttpServerHandler[] items = new WebSocketHttpServerHandler[_activeHandlers.Count]; _activeHandlers.CopyTo(items); -- cgit v1.1