diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs index 465741f..d3ca3cf 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs | |||
@@ -180,8 +180,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
180 | NewClient(view, (IClientAPI) currentJob.Data1); | 180 | NewClient(view, (IClientAPI) currentJob.Data1); |
181 | break; | 181 | break; |
182 | case WorkType.SIMCHAT: | 182 | case WorkType.SIMCHAT: |
183 | m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- Message received: " + ((ChatFromViewerArgs) currentJob.Data1).Message); | 183 | m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- Message received: " + ((OSChatMessage) currentJob.Data1).Message); |
184 | SimChat(model, view, (ChatFromViewerArgs) currentJob.Data1, channel); | 184 | SimChat(model, view, (OSChatMessage) currentJob.Data1, channel); |
185 | break; | 185 | break; |
186 | default: | 186 | default: |
187 | m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- uuuuuuuuuh, what?"); | 187 | m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- uuuuuuuuuh, what?"); |
@@ -265,7 +265,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
265 | /// <summary> | 265 | /// <summary> |
266 | /// Only called by the MainLoop. Takes the message from a user sent to the channel and executes the proper command. | 266 | /// Only called by the MainLoop. Takes the message from a user sent to the channel and executes the proper command. |
267 | /// </summary> | 267 | /// </summary> |
268 | public void SimChat(CMModel model, CMView view, ChatFromViewerArgs e, int channel) | 268 | public void SimChat(CMModel model, CMView view, OSChatMessage e, int channel) |
269 | { | 269 | { |
270 | if (e.Channel != channel) | 270 | if (e.Channel != channel) |
271 | return; | 271 | return; |
@@ -565,7 +565,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
565 | } | 565 | } |
566 | 566 | ||
567 | //This is stupid, the same information is contained in the first and second argument | 567 | //This is stupid, the same information is contained in the first and second argument |
568 | protected void SimChatSent(Object x, ChatFromViewerArgs e) | 568 | protected void SimChatSent(Object x, OSChatMessage e) |
569 | { | 569 | { |
570 | m_log.Debug("[CONTENT MANAGEMENT] SIMCHAT SENT !!!!!!!"); | 570 | m_log.Debug("[CONTENT MANAGEMENT] SIMCHAT SENT !!!!!!!"); |
571 | m_log.Debug("[CONTENT MANAGEMENT] message was: " + e.Message); | 571 | m_log.Debug("[CONTENT MANAGEMENT] message was: " + e.Message); |