mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 02:05:34 +08:00
renaming the increasingly ill-named ChatFromViewerArgs to OSChatMessage
This commit is contained in:
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
|
||||
#endregion
|
||||
|
||||
#region ISimChat Members
|
||||
public void SimBroadcast(Object sender, ChatFromViewerArgs c)
|
||||
public void SimBroadcast(Object sender, OSChatMessage c)
|
||||
{
|
||||
// We only want to relay stuff on channel 0 and on the debug channel
|
||||
if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return;
|
||||
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
|
||||
});
|
||||
}
|
||||
|
||||
public void SimChat(Object sender, ChatFromViewerArgs e)
|
||||
public void SimChat(Object sender, OSChatMessage e)
|
||||
{
|
||||
// early return if not on public or debug channel
|
||||
if (e.Channel != 0 && e.Channel != DEBUG_CHANNEL) return;
|
||||
|
||||
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
|
||||
|
||||
#region ISimChat Members
|
||||
|
||||
public void SimChat(Object sender, ChatFromViewerArgs e)
|
||||
public void SimChat(Object sender, OSChatMessage e)
|
||||
{
|
||||
// We only want to relay stuff on channel 0
|
||||
if (e.Channel != 0) return;
|
||||
@@ -631,7 +631,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
|
||||
// Any chat ???
|
||||
if (data != null)
|
||||
{
|
||||
ChatFromViewerArgs c = new ChatFromViewerArgs();
|
||||
OSChatMessage c = new OSChatMessage();
|
||||
c.Message = data["msg"];
|
||||
c.Type = ChatTypeEnum.Say;
|
||||
c.Channel = 0;
|
||||
@@ -679,7 +679,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
|
||||
{
|
||||
try
|
||||
{
|
||||
ChatFromViewerArgs c = new ChatFromViewerArgs();
|
||||
OSChatMessage c = new OSChatMessage();
|
||||
c.From = sender;
|
||||
c.Message = String.Format(format, args);
|
||||
c.Type = ChatTypeEnum.Say;
|
||||
|
||||
@@ -322,7 +322,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
|
||||
*
|
||||
* *****************************************************************/
|
||||
|
||||
private void DeliverClientMessage(Object sender, ChatFromViewerArgs e)
|
||||
private void DeliverClientMessage(Object sender, OSChatMessage e)
|
||||
{
|
||||
DeliverMessage(e.Type,
|
||||
e.Channel,
|
||||
|
||||
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
|
||||
|
||||
private void SendOnChatFromViewer(string message, ChatTypeEnum chatType)
|
||||
{
|
||||
ChatFromViewerArgs chatFromViewer = new ChatFromViewerArgs();
|
||||
OSChatMessage chatFromViewer = new OSChatMessage();
|
||||
chatFromViewer.Channel = 0;
|
||||
chatFromViewer.From = Name;
|
||||
chatFromViewer.Message = message;
|
||||
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
|
||||
public event Action<IClientAPI> OnConnectionClosed;
|
||||
|
||||
public event ImprovedInstantMessage OnInstantMessage;
|
||||
public event ChatFromViewer OnChatFromViewer;
|
||||
public event ChatMessage OnChatFromViewer;
|
||||
public event TextureRequest OnRequestTexture;
|
||||
public event RezObject OnRezObject;
|
||||
public event ModifyTerrain OnModifyTerrain;
|
||||
|
||||
Reference in New Issue
Block a user