diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
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; | |||
40 | 40 | ||
41 | namespace OpenSim.Region.OptionalModules.WebSocketEchoModule | 41 | namespace OpenSim.Region.OptionalModules.WebSocketEchoModule |
42 | { | 42 | { |
43 | 43 | ||
44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebSocketEchoModule")] | 44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebSocketEchoModule")] |
45 | public class WebSocketEchoModule : ISharedRegionModule | 45 | public class WebSocketEchoModule : ISharedRegionModule |
46 | { | 46 | { |
@@ -111,7 +111,7 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule | |||
111 | obj.SendPingCheck(); | 111 | obj.SendPingCheck(); |
112 | } | 112 | } |
113 | 113 | ||
114 | 114 | ||
115 | private void HandlerOnOnUpgradeCompleted(object sender, UpgradeCompletedEventArgs completeddata) | 115 | private void HandlerOnOnUpgradeCompleted(object sender, UpgradeCompletedEventArgs completeddata) |
116 | { | 116 | { |
117 | WebSocketHttpServerHandler obj = sender as WebSocketHttpServerHandler; | 117 | WebSocketHttpServerHandler obj = sender as WebSocketHttpServerHandler; |
@@ -136,14 +136,14 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule | |||
136 | obj.Dispose(); | 136 | obj.Dispose(); |
137 | } | 137 | } |
138 | 138 | ||
139 | // Shutting down.. so shut down all sockets. | 139 | // Shutting down.. so shut down all sockets. |
140 | // Note.. this should be done outside of an ienumerable if you're also hook to the close event. | 140 | // Note.. this should be done outside of an ienumerable if you're also hook to the close event. |
141 | public void Close() | 141 | public void Close() |
142 | { | 142 | { |
143 | if (!enabled) | 143 | if (!enabled) |
144 | return; | 144 | return; |
145 | 145 | ||
146 | // We convert this to a for loop so we're not in in an IEnumerable when the close | 146 | // We convert this to a for loop so we're not in in an IEnumerable when the close |
147 | //call triggers an event which then removes item from _activeHandlers that we're enumerating | 147 | //call triggers an event which then removes item from _activeHandlers that we're enumerating |
148 | WebSocketHttpServerHandler[] items = new WebSocketHttpServerHandler[_activeHandlers.Count]; | 148 | WebSocketHttpServerHandler[] items = new WebSocketHttpServerHandler[_activeHandlers.Count]; |
149 | _activeHandlers.CopyTo(items); | 149 | _activeHandlers.CopyTo(items); |