OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

type change from ChatFromViewerArgs -> OSChatMessage to line up with trunk.

0.6.0-stable
Sean Dague 2008-09-03 18:04:41 +00:00
parent 12beaccec7
commit 4ddc7d66d6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
View File

@ -180,8 +180,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
NewClient(view, (IClientAPI) currentJob.Data1); NewClient(view, (IClientAPI) currentJob.Data1);
break; break;
case WorkType.SIMCHAT: case WorkType.SIMCHAT:
m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- Message received: " + ((ChatFromViewerArgs) currentJob.Data1).Message); m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- Message received: " + ((OSChatMessage) currentJob.Data1).Message);
SimChat(model, view, (ChatFromViewerArgs) currentJob.Data1, channel); SimChat(model, view, (OSChatMessage) currentJob.Data1, channel);
break; break;
default: default:
m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- uuuuuuuuuh, what?"); m_log.Debug("[CONTENT MANAGEMENT] MAIN LOOP -- uuuuuuuuuh, what?");
@ -265,7 +265,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
/// <summary> /// <summary>
/// Only called by the MainLoop. Takes the message from a user sent to the channel and executes the proper command. /// Only called by the MainLoop. Takes the message from a user sent to the channel and executes the proper command.
/// </summary> /// </summary>
public void SimChat(CMModel model, CMView view, ChatFromViewerArgs e, int channel) public void SimChat(CMModel model, CMView view, OSChatMessage e, int channel)
{ {
if (e.Channel != channel) if (e.Channel != channel)
return; return;
@ -565,7 +565,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
} }
//This is stupid, the same information is contained in the first and second argument //This is stupid, the same information is contained in the first and second argument
protected void SimChatSent(Object x, ChatFromViewerArgs e) protected void SimChatSent(Object x, OSChatMessage e)
{ {
m_log.Debug("[CONTENT MANAGEMENT] SIMCHAT SENT !!!!!!!"); m_log.Debug("[CONTENT MANAGEMENT] SIMCHAT SENT !!!!!!!");
m_log.Debug("[CONTENT MANAGEMENT] message was: " + e.Message); m_log.Debug("[CONTENT MANAGEMENT] message was: " + e.Message);