diff options
Diffstat (limited to '')
3 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs index 73215cb..27ab32f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Scenes; | |||
38 | namespace OpenSim.Region.OptionalModules.Avatar.Chat | 38 | namespace OpenSim.Region.OptionalModules.Avatar.Chat |
39 | { | 39 | { |
40 | 40 | ||
41 | // An instance of this class exists for each unique combination of | 41 | // An instance of this class exists for each unique combination of |
42 | // IRC chat interface characteristics, as determined by the supplied | 42 | // IRC chat interface characteristics, as determined by the supplied |
43 | // configuration file. | 43 | // configuration file. |
44 | 44 | ||
@@ -266,11 +266,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
266 | ChannelState cs = p_cs; | 266 | ChannelState cs = p_cs; |
267 | 267 | ||
268 | // Check to see if we have an existing server/channel setup that can be used | 268 | // Check to see if we have an existing server/channel setup that can be used |
269 | // In the absence of variable substitution this will always resolve to the | 269 | // In the absence of variable substitution this will always resolve to the |
270 | // same ChannelState instance, and the table will only contains a single | 270 | // same ChannelState instance, and the table will only contains a single |
271 | // entry, so the performance considerations for the existing behavior are | 271 | // entry, so the performance considerations for the existing behavior are |
272 | // zero. Only the IRC connector is shared, the ChannelState still contains | 272 | // zero. Only the IRC connector is shared, the ChannelState still contains |
273 | // values that, while independent of the IRC connetion, do still distinguish | 273 | // values that, while independent of the IRC connetion, do still distinguish |
274 | // this region's behavior. | 274 | // this region's behavior. |
275 | 275 | ||
276 | lock (IRCBridgeModule.m_channels) | 276 | lock (IRCBridgeModule.m_channels) |
@@ -335,7 +335,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
335 | 335 | ||
336 | } | 336 | } |
337 | 337 | ||
338 | // These routines allow differentiating changes to | 338 | // These routines allow differentiating changes to |
339 | // the underlying channel state. If necessary, a | 339 | // the underlying channel state. If necessary, a |
340 | // new channel state will be created. | 340 | // new channel state will be created. |
341 | 341 | ||
@@ -426,7 +426,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
426 | } | 426 | } |
427 | 427 | ||
428 | // This level of obsessive matching allows us to produce | 428 | // This level of obsessive matching allows us to produce |
429 | // a minimal overhead int he case of a server which does | 429 | // a minimal overhead int he case of a server which does |
430 | // need to differentiate IRC at a region level. | 430 | // need to differentiate IRC at a region level. |
431 | 431 | ||
432 | private bool IsAPerfectMatchFor(ChannelState cs) | 432 | private bool IsAPerfectMatchFor(ChannelState cs) |
@@ -447,8 +447,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
447 | ); | 447 | ); |
448 | } | 448 | } |
449 | 449 | ||
450 | // This function implements the variable substitution mechanism | 450 | // This function implements the variable substitution mechanism |
451 | // for the configuration values. Each string read from the | 451 | // for the configuration values. Each string read from the |
452 | // configuration file is scanned for '[...]' enclosures. Each | 452 | // configuration file is scanned for '[...]' enclosures. Each |
453 | // one that is found is replaced by either a runtime variable | 453 | // one that is found is replaced by either a runtime variable |
454 | // (%xxx) or an existing configuration key. When no further | 454 | // (%xxx) or an existing configuration key. When no further |
@@ -585,7 +585,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
585 | 585 | ||
586 | } | 586 | } |
587 | 587 | ||
588 | // This function is lifted from the IRCConnector because it | 588 | // This function is lifted from the IRCConnector because it |
589 | // contains information that is not differentiating from an | 589 | // contains information that is not differentiating from an |
590 | // IRC point-of-view. | 590 | // IRC point-of-view. |
591 | 591 | ||
@@ -598,7 +598,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
598 | { | 598 | { |
599 | 599 | ||
600 | // Scan through the set of unique channel configuration for those | 600 | // Scan through the set of unique channel configuration for those |
601 | // that belong to this connector. And then forward the message to | 601 | // that belong to this connector. And then forward the message to |
602 | // all regions known to those channels. | 602 | // all regions known to those channels. |
603 | // Note that this code is responsible for completing some of the | 603 | // Note that this code is responsible for completing some of the |
604 | // settings for the inbound OSChatMessage | 604 | // settings for the inbound OSChatMessage |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs index 941379f..ffbebe7 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs | |||
@@ -97,14 +97,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
97 | 97 | ||
98 | // How many regions depend upon this connection | 98 | // How many regions depend upon this connection |
99 | // This count is updated by the ChannelState object and reflects the sum | 99 | // This count is updated by the ChannelState object and reflects the sum |
100 | // of the region clients associated with the set of associated channel | 100 | // of the region clients associated with the set of associated channel |
101 | // state instances. That's why it cannot be managed here. | 101 | // state instances. That's why it cannot be managed here. |
102 | 102 | ||
103 | internal int depends = 0; | 103 | internal int depends = 0; |
104 | 104 | ||
105 | // This variable counts the number of resets that have been performed | 105 | // This variable counts the number of resets that have been performed |
106 | // on the connector. When a listener thread terminates, it checks to | 106 | // on the connector. When a listener thread terminates, it checks to |
107 | // see of the reset count has changed before it schedules another | 107 | // see of the reset count has changed before it schedules another |
108 | // reset. | 108 | // reset. |
109 | 109 | ||
110 | internal int m_resetk = 0; | 110 | internal int m_resetk = 0; |
@@ -428,7 +428,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
428 | public void PrivMsg(string pattern, string from, string region, string msg) | 428 | public void PrivMsg(string pattern, string from, string region, string msg) |
429 | { | 429 | { |
430 | 430 | ||
431 | // m_log.DebugFormat("[IRC-Connector-{0}] PrivMsg to IRC from {1}: <{2}>", idn, from, | 431 | // m_log.DebugFormat("[IRC-Connector-{0}] PrivMsg to IRC from {1}: <{2}>", idn, from, |
432 | // String.Format(pattern, m_ircChannel, from, region, msg)); | 432 | // String.Format(pattern, m_ircChannel, from, region, msg)); |
433 | 433 | ||
434 | // One message to the IRC server | 434 | // One message to the IRC server |
@@ -510,7 +510,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
510 | c.Sender = null; | 510 | c.Sender = null; |
511 | c.SenderUUID = UUID.Zero; | 511 | c.SenderUUID = UUID.Zero; |
512 | 512 | ||
513 | // Is message "\001ACTION foo bar\001"? | 513 | // Is message "\001ACTION foo bar\001"? |
514 | // Then change to: "/me foo bar" | 514 | // Then change to: "/me foo bar" |
515 | 515 | ||
516 | if ((1 == c.Message[0]) && c.Message.Substring(1).StartsWith("ACTION")) | 516 | if ((1 == c.Message[0]) && c.Message.Substring(1).StartsWith("ACTION")) |
@@ -608,8 +608,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
608 | string parms = String.Empty; | 608 | string parms = String.Empty; |
609 | 609 | ||
610 | // ":" indicates that a prefix is present | 610 | // ":" indicates that a prefix is present |
611 | // There are NEVER more than 17 real | 611 | // There are NEVER more than 17 real |
612 | // fields. A parameter that starts with | 612 | // fields. A parameter that starts with |
613 | // ":" indicates that the remainder of the | 613 | // ":" indicates that the remainder of the |
614 | // line is a single parameter value. | 614 | // line is a single parameter value. |
615 | 615 | ||
@@ -873,7 +873,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
873 | } | 873 | } |
874 | 874 | ||
875 | // Being marked connected is not enough to ping. Socket establishment can sometimes take a long | 875 | // Being marked connected is not enough to ping. Socket establishment can sometimes take a long |
876 | // time, in which case the watch dog might try to ping the server before the socket has been | 876 | // time, in which case the watch dog might try to ping the server before the socket has been |
877 | // set up, with nasty side-effects. | 877 | // set up, with nasty side-effects. |
878 | 878 | ||
879 | else if (_pdk_ == 0) | 879 | else if (_pdk_ == 0) |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs index 5505001..a3ef83b 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs | |||
@@ -414,7 +414,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
414 | } | 414 | } |
415 | } | 415 | } |
416 | 416 | ||
417 | // This method gives the region an opportunity to interfere with | 417 | // This method gives the region an opportunity to interfere with |
418 | // message delivery. For now we just enforce the enable/disable | 418 | // message delivery. For now we just enforce the enable/disable |
419 | // flag. | 419 | // flag. |
420 | 420 | ||
@@ -428,7 +428,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
428 | } | 428 | } |
429 | } | 429 | } |
430 | 430 | ||
431 | // This supports any local message traffic that might be needed in | 431 | // This supports any local message traffic that might be needed in |
432 | // support of command processing. At present there is none. | 432 | // support of command processing. At present there is none. |
433 | 433 | ||
434 | internal void LocalChat(string msg) | 434 | internal void LocalChat(string msg) |