diff options
author | Melanie Thielker | 2016-06-14 00:03:40 +0200 |
---|---|---|
committer | Melanie Thielker | 2016-06-14 00:03:40 +0200 |
commit | 141205532b0ea4a9f757dbb5317eda0517e40c49 (patch) | |
tree | 156cbd6bd3b164e2b7ba4ea04d1f3e052b4afa40 /OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |
parent | Mantis #7923. EDIT BEAMS ARE BACK! (diff) | |
download | opensim-SC_OLD-141205532b0ea4a9f757dbb5317eda0517e40c49.zip opensim-SC_OLD-141205532b0ea4a9f757dbb5317eda0517e40c49.tar.gz opensim-SC_OLD-141205532b0ea4a9f757dbb5317eda0517e40c49.tar.bz2 opensim-SC_OLD-141205532b0ea4a9f757dbb5317eda0517e40c49.tar.xz |
Make chat and instant message modules fully subclassable
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index ee0a4f8..fe0a243 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -45,18 +45,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
45 | private static readonly ILog m_log = | 45 | private static readonly ILog m_log = |
46 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | private const int DEBUG_CHANNEL = 2147483647; | 48 | protected const int DEBUG_CHANNEL = 2147483647; |
49 | 49 | ||
50 | private bool m_enabled = true; | 50 | protected bool m_enabled = true; |
51 | private int m_saydistance = 20; | 51 | protected int m_saydistance = 20; |
52 | private int m_shoutdistance = 100; | 52 | protected int m_shoutdistance = 100; |
53 | private int m_whisperdistance = 10; | 53 | protected int m_whisperdistance = 10; |
54 | private List<Scene> m_scenes = new List<Scene>(); | 54 | protected List<Scene> m_scenes = new List<Scene>(); |
55 | private List<string> FreezeCache = new List<string>(); | 55 | protected List<string> FreezeCache = new List<string>(); |
56 | private string m_adminPrefix = ""; | 56 | protected string m_adminPrefix = ""; |
57 | internal object m_syncy = new object(); | 57 | protected object m_syncy = new object(); |
58 | 58 | ||
59 | internal IConfig m_config; | 59 | protected IConfig m_config; |
60 | 60 | ||
61 | #region ISharedRegionModule Members | 61 | #region ISharedRegionModule Members |
62 | public virtual void Initialise(IConfigSource config) | 62 | public virtual void Initialise(IConfigSource config) |
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
134 | { | 134 | { |
135 | } | 135 | } |
136 | 136 | ||
137 | public Type ReplaceableInterface | 137 | public virtual Type ReplaceableInterface |
138 | { | 138 | { |
139 | get { return null; } | 139 | get { return null; } |
140 | } | 140 | } |
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
152 | client.OnChatFromClient += OnChatFromClient; | 152 | client.OnChatFromClient += OnChatFromClient; |
153 | } | 153 | } |
154 | 154 | ||
155 | protected OSChatMessage FixPositionOfChatMessage(OSChatMessage c) | 155 | protected virtual OSChatMessage FixPositionOfChatMessage(OSChatMessage c) |
156 | { | 156 | { |
157 | ScenePresence avatar; | 157 | ScenePresence avatar; |
158 | Scene scene = (Scene)c.Scene; | 158 | Scene scene = (Scene)c.Scene; |
@@ -324,7 +324,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
324 | fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully); | 324 | fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully); |
325 | } | 325 | } |
326 | 326 | ||
327 | static private Vector3 CenterOfRegion = new Vector3(128, 128, 30); | 327 | static protected Vector3 CenterOfRegion = new Vector3(128, 128, 30); |
328 | 328 | ||
329 | public virtual void OnChatBroadcast(Object sender, OSChatMessage c) | 329 | public virtual void OnChatBroadcast(Object sender, OSChatMessage c) |
330 | { | 330 | { |
@@ -437,7 +437,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
437 | } | 437 | } |
438 | 438 | ||
439 | Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>(); | 439 | Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>(); |
440 | public void ParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target) | 440 | public virtual void ParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target) |
441 | { | 441 | { |
442 | System.Threading.Timer Timer; | 442 | System.Threading.Timer Timer; |
443 | if (flags == 0) | 443 | if (flags == 0) |
@@ -456,7 +456,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
456 | } | 456 | } |
457 | } | 457 | } |
458 | 458 | ||
459 | private void OnEndParcelFrozen(object avatar) | 459 | protected virtual void OnEndParcelFrozen(object avatar) |
460 | { | 460 | { |
461 | UUID target = (UUID)avatar; | 461 | UUID target = (UUID)avatar; |
462 | FreezeCache.Remove(target.ToString()); | 462 | FreezeCache.Remove(target.ToString()); |
@@ -467,9 +467,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
467 | } | 467 | } |
468 | #region SimulatorFeaturesRequest | 468 | #region SimulatorFeaturesRequest |
469 | 469 | ||
470 | static OSDInteger m_SayRange, m_WhisperRange, m_ShoutRange; | 470 | protected static OSDInteger m_SayRange, m_WhisperRange, m_ShoutRange; |
471 | 471 | ||
472 | private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features) | 472 | protected virtual void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features) |
473 | { | 473 | { |
474 | OSD extras = new OSDMap(); | 474 | OSD extras = new OSDMap(); |
475 | if (features.ContainsKey("OpenSimExtras")) | 475 | if (features.ContainsKey("OpenSimExtras")) |