diff options
author | Adam Frisby | 2008-05-01 16:35:00 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 16:35:00 +0000 |
commit | 13526097f24b7a8ad63b1d482c44b44397fa055f (patch) | |
tree | 7a82c20ed7c63e2aea5ad3863325e37f64e1cbea /OpenSim/Region/Environment/Modules/Scripting/WorldComm | |
parent | * Breaking all the code, breaking all the code..! (diff) | |
download | opensim-SC-13526097f24b7a8ad63b1d482c44b44397fa055f.zip opensim-SC-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.gz opensim-SC-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.bz2 opensim-SC-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.xz |
* Spring cleaning on Region.Environment.
* Converted a large number of read-only fields to be actually, readonly.
* Reformatted code sections.
* Removed redundant code.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Scripting/WorldComm')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs index e79b2bd..c4c1718 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs | |||
@@ -75,10 +75,6 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm | |||
75 | private Queue m_pendingQ; | 75 | private Queue m_pendingQ; |
76 | private Scene m_scene; | 76 | private Scene m_scene; |
77 | 77 | ||
78 | public WorldCommModule() | ||
79 | { | ||
80 | } | ||
81 | |||
82 | #region IRegionModule Members | 78 | #region IRegionModule Members |
83 | 79 | ||
84 | public void Initialise(Scene scene, IConfigSource config) | 80 | public void Initialise(Scene scene, IConfigSource config) |
@@ -324,8 +320,8 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm | |||
324 | public class ListenerManager | 320 | public class ListenerManager |
325 | { | 321 | { |
326 | //private Dictionary<int, ListenerInfo> m_listeners; | 322 | //private Dictionary<int, ListenerInfo> m_listeners; |
323 | private readonly Hashtable m_listeners = Hashtable.Synchronized(new Hashtable()); | ||
327 | private object ListenersLock = new object(); | 324 | private object ListenersLock = new object(); |
328 | private Hashtable m_listeners = Hashtable.Synchronized(new Hashtable()); | ||
329 | private int m_MaxListeners = 100; | 325 | private int m_MaxListeners = 100; |
330 | 326 | ||
331 | public int AddListener(uint localID, LLUUID itemID, LLUUID hostID, int channel, string name, string id, string msg) | 327 | public int AddListener(uint localID, LLUUID itemID, LLUUID hostID, int channel, string name, string id, string msg) |
@@ -485,6 +481,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm | |||
485 | 481 | ||
486 | public class ListenerInfo | 482 | public class ListenerInfo |
487 | { | 483 | { |
484 | private readonly LLUUID m_sourceItemID; // ID of the scenePart or avatar source of the message | ||
488 | private bool m_active; // Listener is active or not | 485 | private bool m_active; // Listener is active or not |
489 | private int m_channel; // Channel | 486 | private int m_channel; // Channel |
490 | private int m_handle; // Assigned handle of this listener | 487 | private int m_handle; // Assigned handle of this listener |
@@ -494,7 +491,6 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm | |||
494 | private uint m_localID; // Local ID from script engine | 491 | private uint m_localID; // Local ID from script engine |
495 | private string m_message; // The message | 492 | private string m_message; // The message |
496 | private string m_name; // Object name to filter messages from | 493 | private string m_name; // Object name to filter messages from |
497 | private LLUUID m_sourceItemID; // ID of the scenePart or avatar source of the message | ||
498 | 494 | ||
499 | public ListenerInfo(uint localID, int handle, LLUUID ItemID, LLUUID hostID, int channel, string name, LLUUID id, string message) | 495 | public ListenerInfo(uint localID, int handle, LLUUID ItemID, LLUUID hostID, int channel, string name, LLUUID id, string message) |
500 | { | 496 | { |