diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 5414322..0e397d6 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
105 | #endregion | 105 | #endregion |
106 | 106 | ||
107 | #region ISimChat Members | 107 | #region ISimChat Members |
108 | public void SimBroadcast(Object sender, ChatFromViewerArgs c) | 108 | public void SimBroadcast(Object sender, OSChatMessage c) |
109 | { | 109 | { |
110 | // We only want to relay stuff on channel 0 and on the debug channel | 110 | // We only want to relay stuff on channel 0 and on the debug channel |
111 | if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return; | 111 | if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return; |
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
140 | }); | 140 | }); |
141 | } | 141 | } |
142 | 142 | ||
143 | public void SimChat(Object sender, ChatFromViewerArgs e) | 143 | public void SimChat(Object sender, OSChatMessage e) |
144 | { | 144 | { |
145 | // early return if not on public or debug channel | 145 | // early return if not on public or debug channel |
146 | if (e.Channel != 0 && e.Channel != DEBUG_CHANNEL) return; | 146 | if (e.Channel != 0 && e.Channel != DEBUG_CHANNEL) return; |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs index aa1d80c..9df05e0 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs | |||
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
171 | 171 | ||
172 | #region ISimChat Members | 172 | #region ISimChat Members |
173 | 173 | ||
174 | public void SimChat(Object sender, ChatFromViewerArgs e) | 174 | public void SimChat(Object sender, OSChatMessage e) |
175 | { | 175 | { |
176 | // We only want to relay stuff on channel 0 | 176 | // We only want to relay stuff on channel 0 |
177 | if (e.Channel != 0) return; | 177 | if (e.Channel != 0) return; |
@@ -631,7 +631,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
631 | // Any chat ??? | 631 | // Any chat ??? |
632 | if (data != null) | 632 | if (data != null) |
633 | { | 633 | { |
634 | ChatFromViewerArgs c = new ChatFromViewerArgs(); | 634 | OSChatMessage c = new OSChatMessage(); |
635 | c.Message = data["msg"]; | 635 | c.Message = data["msg"]; |
636 | c.Type = ChatTypeEnum.Say; | 636 | c.Type = ChatTypeEnum.Say; |
637 | c.Channel = 0; | 637 | c.Channel = 0; |
@@ -679,7 +679,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
679 | { | 679 | { |
680 | try | 680 | try |
681 | { | 681 | { |
682 | ChatFromViewerArgs c = new ChatFromViewerArgs(); | 682 | OSChatMessage c = new OSChatMessage(); |
683 | c.From = sender; | 683 | c.From = sender; |
684 | c.Message = String.Format(format, args); | 684 | c.Message = String.Format(format, args); |
685 | c.Type = ChatTypeEnum.Say; | 685 | c.Type = ChatTypeEnum.Say; |