aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorDiva Canto2013-03-02 17:54:19 -0800
committerDiva Canto2013-03-02 17:54:19 -0800
commite70c71a1758ed450444a6272f9afe4528ccf3abc (patch)
tree5dcdc7e8a3f94b7f6d83ae7fa5d8b6a2d05be668 /OpenSim/Region/OptionalModules
parentFixed typos in TempAttachmentsModule. No changes. (diff)
parentAdded existance and default value for [XEngine]MinTimerInterval to OpenSimDef... (diff)
downloadopensim-SC_OLD-e70c71a1758ed450444a6272f9afe4528ccf3abc.zip
opensim-SC_OLD-e70c71a1758ed450444a6272f9afe4528ccf3abc.tar.gz
opensim-SC_OLD-e70c71a1758ed450444a6272f9afe4528ccf3abc.tar.bz2
opensim-SC_OLD-e70c71a1758ed450444a6272f9afe4528ccf3abc.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs b/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
index 112ba4e..5bf0ed4 100644
--- a/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
+++ b/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
@@ -45,6 +45,7 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule
45 public class WebSocketEchoModule : ISharedRegionModule 45 public class WebSocketEchoModule : ISharedRegionModule
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48
48 private bool enabled; 49 private bool enabled;
49 public string Name { get { return "WebSocketEchoModule"; } } 50 public string Name { get { return "WebSocketEchoModule"; } }
50 51
@@ -55,9 +56,9 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule
55 56
56 public void Initialise(IConfigSource pConfig) 57 public void Initialise(IConfigSource pConfig)
57 { 58 {
58 enabled =(pConfig.Configs["WebSocketEcho"] != null); 59 enabled = (pConfig.Configs["WebSocketEcho"] != null);
59 if (enabled) 60// if (enabled)
60 m_log.DebugFormat("[WebSocketEchoModule]: INITIALIZED MODULE"); 61// m_log.DebugFormat("[WebSocketEchoModule]: INITIALIZED MODULE");
61 } 62 }
62 63
63 /// <summary> 64 /// <summary>
@@ -158,17 +159,17 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule
158 159
159 public void AddRegion(Scene scene) 160 public void AddRegion(Scene scene)
160 { 161 {
161 m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName); 162// m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
162 } 163 }
163 164
164 public void RemoveRegion(Scene scene) 165 public void RemoveRegion(Scene scene)
165 { 166 {
166 m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName); 167// m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
167 } 168 }
168 169
169 public void RegionLoaded(Scene scene) 170 public void RegionLoaded(Scene scene)
170 { 171 {
171 m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} LOADED", scene.RegionInfo.RegionName); 172// m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} LOADED", scene.RegionInfo.RegionName);
172 } 173 }
173 } 174 }
174} \ No newline at end of file 175} \ No newline at end of file