aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar/Chat
diff options
context:
space:
mode:
authorDr Scofield2008-07-25 10:05:50 +0000
committerDr Scofield2008-07-25 10:05:50 +0000
commit24e15088ea796afec01a197c6812c1c52e2de324 (patch)
tree0ecc8cc29d5c0d0297c2f5bc5c36f0d097e07f9d /OpenSim/Region/Environment/Modules/Avatar/Chat
parentFrom: awebb (diff)
downloadopensim-SC_OLD-24e15088ea796afec01a197c6812c1c52e2de324.zip
opensim-SC_OLD-24e15088ea796afec01a197c6812c1c52e2de324.tar.gz
opensim-SC_OLD-24e15088ea796afec01a197c6812c1c52e2de324.tar.bz2
opensim-SC_OLD-24e15088ea796afec01a197c6812c1c52e2de324.tar.xz
renaming the increasingly ill-named ChatFromViewerArgs to OSChatMessage
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Chat')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs6
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;