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

renaming the increasingly ill-named ChatFromViewerArgs to OSChatMessage

0.6.0-stable
Dr Scofield 2008-07-25 10:05:50 +00:00
parent 50bc51b642
commit 24e15088ea
10 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/ChatFromViewerArgs.cs
View File

@ -12,7 +12,7 @@ namespace OpenSim.Framework
/// <summary> /// <summary>
/// ChatFromViewer Arguments /// ChatFromViewer Arguments
/// </summary> /// </summary>
public class ChatFromViewerArgs : EventArgs, IEventArgs public class OSChatMessage : EventArgs, IEventArgs
{ {
protected int m_channel; protected int m_channel;
protected string m_from; protected string m_from;
@ -25,7 +25,7 @@ namespace OpenSim.Framework
protected ChatTypeEnum m_type; protected ChatTypeEnum m_type;
protected LLUUID m_fromID; protected LLUUID m_fromID;
public ChatFromViewerArgs() public OSChatMessage()
{ {
m_position = new LLVector3(); m_position = new LLVector3();
} }

4
OpenSim/Framework/IClientAPI.cs
View File

@ -37,7 +37,7 @@ namespace OpenSim.Framework
public delegate void ViewerEffectEventHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args); public delegate void ViewerEffectEventHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args);
public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e); public delegate void ChatMessage(Object sender, OSChatMessage e);
public delegate void TextureRequest(Object sender, TextureRequestArgs e); public delegate void TextureRequest(Object sender, TextureRequestArgs e);
@ -347,7 +347,7 @@ namespace OpenSim.Framework
// [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")] // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")]
event ImprovedInstantMessage OnInstantMessage; event ImprovedInstantMessage OnInstantMessage;
// [Obsolete("LLClientView Specific - Replace with more bare-bones arguments. Rename OnChat.")] // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments. Rename OnChat.")]
event ChatFromViewer OnChatFromViewer; event ChatMessage OnChatFromViewer;
// [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")] // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")]
event TextureRequest OnRequestTexture; event TextureRequest OnRequestTexture;
// [Obsolete("LLClientView Specific - Remove bitbuckets. Adam, can you be more specific here.. as I don't see any bit buckets.")] // [Obsolete("LLClientView Specific - Remove bitbuckets. Adam, can you be more specific here.. as I don't see any bit buckets.")]

10
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -122,8 +122,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private RequestAvatarProperties handlerRequestAvatarProperties = null; //OnRequestAvatarProperties; private RequestAvatarProperties handlerRequestAvatarProperties = null; //OnRequestAvatarProperties;
private UpdateAvatarProperties handlerUpdateAvatarProperties = null; // OnUpdateAvatarProperties; private UpdateAvatarProperties handlerUpdateAvatarProperties = null; // OnUpdateAvatarProperties;
private ChatFromViewer handlerChatFromViewer = null; //OnChatFromViewer; private ChatMessage handlerChatFromViewer = null; //OnChatFromViewer;
private ChatFromViewer handlerChatFromViewer2 = null; //OnChatFromViewer; private ChatMessage handlerChatFromViewer2 = null; //OnChatFromViewer;
private ImprovedInstantMessage handlerInstantMessage = null; //OnInstantMessage; private ImprovedInstantMessage handlerInstantMessage = null; //OnInstantMessage;
private FriendActionDelegate handlerApproveFriendRequest = null; //OnApproveFriendRequest; private FriendActionDelegate handlerApproveFriendRequest = null; //OnApproveFriendRequest;
private FriendshipTermination handlerTerminateFriendship = null; //OnTerminateFriendship; private FriendshipTermination handlerTerminateFriendship = null; //OnTerminateFriendship;
@ -770,7 +770,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public event Action<IClientAPI> OnConnectionClosed; public event Action<IClientAPI> OnConnectionClosed;
public event ViewerEffectEventHandler OnViewerEffect; public event ViewerEffectEventHandler OnViewerEffect;
public event ImprovedInstantMessage OnInstantMessage; public event ImprovedInstantMessage OnInstantMessage;
public event ChatFromViewer OnChatFromViewer; public event ChatMessage OnChatFromViewer;
public event TextureRequest OnRequestTexture; public event TextureRequest OnRequestTexture;
public event RezObject OnRezObject; public event RezObject OnRezObject;
public event GenericCall4 OnDeRezObject; public event GenericCall4 OnDeRezObject;
@ -3859,7 +3859,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (OnChatFromViewer != null) if (OnChatFromViewer != null)
{ {
ChatFromViewerArgs args = new ChatFromViewerArgs(); OSChatMessage args = new OSChatMessage();
args.Channel = channel; args.Channel = channel;
args.From = fromName; args.From = fromName;
args.Message = Helpers.FieldToUTF8String(message); args.Message = Helpers.FieldToUTF8String(message);
@ -3898,7 +3898,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
byte[] msg = rdialog.Data.ButtonLabel; byte[] msg = rdialog.Data.ButtonLabel;
if (OnChatFromViewer != null) if (OnChatFromViewer != null)
{ {
ChatFromViewerArgs args = new ChatFromViewerArgs(); OSChatMessage args = new OSChatMessage();
args.Channel = ch; args.Channel = ch;
args.From = String.Empty; args.From = String.Empty;
args.Message = Helpers.FieldToUTF8String(msg); args.Message = Helpers.FieldToUTF8String(msg);

4
OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
View File

@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
#endregion #endregion
#region ISimChat Members #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 // We only want to relay stuff on channel 0 and on the debug channel
if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return; 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 // early return if not on public or debug channel
if (e.Channel != 0 && e.Channel != DEBUG_CHANNEL) return; if (e.Channel != 0 && e.Channel != DEBUG_CHANNEL) return;

6
OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
View File

@ -171,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
#region ISimChat Members #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 // We only want to relay stuff on channel 0
if (e.Channel != 0) return; if (e.Channel != 0) return;
@ -631,7 +631,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
// Any chat ??? // Any chat ???
if (data != null) if (data != null)
{ {
ChatFromViewerArgs c = new ChatFromViewerArgs(); OSChatMessage c = new OSChatMessage();
c.Message = data["msg"]; c.Message = data["msg"];
c.Type = ChatTypeEnum.Say; c.Type = ChatTypeEnum.Say;
c.Channel = 0; c.Channel = 0;
@ -679,7 +679,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
{ {
try try
{ {
ChatFromViewerArgs c = new ChatFromViewerArgs(); OSChatMessage c = new OSChatMessage();
c.From = sender; c.From = sender;
c.Message = String.Format(format, args); c.Message = String.Format(format, args);
c.Type = ChatTypeEnum.Say; c.Type = ChatTypeEnum.Say;

2
OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
View File

@ -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, DeliverMessage(e.Type,
e.Channel, e.Channel,

4
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@ -128,7 +128,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
private void SendOnChatFromViewer(string message, ChatTypeEnum chatType) private void SendOnChatFromViewer(string message, ChatTypeEnum chatType)
{ {
ChatFromViewerArgs chatFromViewer = new ChatFromViewerArgs(); OSChatMessage chatFromViewer = new OSChatMessage();
chatFromViewer.Channel = 0; chatFromViewer.Channel = 0;
chatFromViewer.From = Name; chatFromViewer.From = Name;
chatFromViewer.Message = message; chatFromViewer.Message = message;
@ -155,7 +155,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
public event Action<IClientAPI> OnConnectionClosed; public event Action<IClientAPI> OnConnectionClosed;
public event ImprovedInstantMessage OnInstantMessage; public event ImprovedInstantMessage OnInstantMessage;
public event ChatFromViewer OnChatFromViewer; public event ChatMessage OnChatFromViewer;
public event TextureRequest OnRequestTexture; public event TextureRequest OnRequestTexture;
public event RezObject OnRezObject; public event RezObject OnRezObject;
public event ModifyTerrain OnModifyTerrain; public event ModifyTerrain OnModifyTerrain;

8
OpenSim/Region/Environment/Scenes/EventManager.cs
View File

@ -235,13 +235,13 @@ namespace OpenSim.Region.Environment.Scenes
/// from world comes in (chat from viewer is available via /// from world comes in (chat from viewer is available via
/// client.OnChatFromViewer). /// client.OnChatFromViewer).
/// </summary> /// </summary>
public delegate void ChatFromWorldEvent(Object sender, ChatFromViewerArgs chat); public delegate void ChatFromWorldEvent(Object sender, OSChatMessage chat);
public event ChatFromWorldEvent OnChatFromWorld; public event ChatFromWorldEvent OnChatFromWorld;
/// <summary> /// <summary>
/// ChatBroadcastEvent is called via Scene when a broadcast chat message /// ChatBroadcastEvent is called via Scene when a broadcast chat message
/// from world comes in (chat from viewer is available via client.OnChatFromViewer). /// from world comes in (chat from viewer is available via client.OnChatFromViewer).
/// </summary> /// </summary>
public delegate void ChatBroadcastEvent(Object sender, ChatFromViewerArgs chat); public delegate void ChatBroadcastEvent(Object sender, OSChatMessage chat);
public event ChatBroadcastEvent OnChatBroadcast; public event ChatBroadcastEvent OnChatBroadcast;
public delegate float SunLindenHour(); public delegate float SunLindenHour();
@ -760,7 +760,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
public void TriggerOnChatFromWorld(Object sender, ChatFromViewerArgs chat) public void TriggerOnChatFromWorld(Object sender, OSChatMessage chat)
{ {
handlerChatFromWorld = OnChatFromWorld; handlerChatFromWorld = OnChatFromWorld;
if (handlerChatFromWorld != null) if (handlerChatFromWorld != null)
@ -769,7 +769,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
public void TriggerOnChatBroadcast(Object sender, ChatFromViewerArgs chat) public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat)
{ {
handlerChatBroadcast = OnChatBroadcast; handlerChatBroadcast = OnChatBroadcast;
if (handlerChatBroadcast != null) if (handlerChatBroadcast != null)

20
OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
View File

@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Scenes
protected void SimChat(byte[] message, ChatTypeEnum type, int channel, LLVector3 fromPos, string fromName, protected void SimChat(byte[] message, ChatTypeEnum type, int channel, LLVector3 fromPos, string fromName,
LLUUID fromID, bool fromAgent, bool broadcast) LLUUID fromID, bool fromAgent, bool broadcast)
{ {
ChatFromViewerArgs args = new ChatFromViewerArgs(); OSChatMessage args = new OSChatMessage();
args.Message = Helpers.FieldToUTF8String(message); args.Message = Helpers.FieldToUTF8String(message);
args.Channel = channel; args.Channel = channel;
@ -113,7 +113,8 @@ namespace OpenSim.Region.Environment.Scenes
((SceneObjectGroup) ent).GetProperties(remoteClient); ((SceneObjectGroup) ent).GetProperties(remoteClient);
((SceneObjectGroup) ent).IsSelected = true; ((SceneObjectGroup) ent).IsSelected = true;
// A prim is only tainted if it's allowed to be edited by the person clicking it. // A prim is only tainted if it's allowed to be edited by the person clicking it.
if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) || ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)) if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)
|| ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId))
{ {
EventManager.TriggerParcelPrimCountTainted(); EventManager.TriggerParcelPrimCountTainted();
} }
@ -156,7 +157,8 @@ namespace OpenSim.Region.Environment.Scenes
{ {
((SceneObjectGroup) ent).IsSelected = false; ((SceneObjectGroup) ent).IsSelected = false;
((SceneObjectGroup)ent).ScheduleGroupForFullUpdate(); ((SceneObjectGroup)ent).ScheduleGroupForFullUpdate();
if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) || ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)) if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)
|| ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId))
{ {
EventManager.TriggerParcelPrimCountTainted(); EventManager.TriggerParcelPrimCountTainted();
break; break;
@ -166,10 +168,11 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
public virtual void ProcessMoneyTransferRequest(LLUUID source, LLUUID destination, int amount, int transactiontype, string description) public virtual void ProcessMoneyTransferRequest(LLUUID source, LLUUID destination, int amount,
int transactiontype, string description)
{ {
EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs( EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(source, destination, amount,
source, destination, amount, transactiontype, description); transactiontype, description);
EventManager.TriggerMoneyTransfer(this, args); EventManager.TriggerMoneyTransfer(this, args);
} }
@ -177,8 +180,9 @@ namespace OpenSim.Region.Environment.Scenes
public virtual void ProcessParcelBuy(LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, public virtual void ProcessParcelBuy(LLUUID agentId, LLUUID groupId, bool final, bool groupOwned,
bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated)
{ {
EventManager.LandBuyArgs args = new EventManager.LandBuyArgs( EventManager.LandBuyArgs args = new EventManager.LandBuyArgs(agentId, groupId, final, groupOwned,
agentId, groupId, final, groupOwned, removeContribution, parcelLocalID, parcelArea, parcelPrice, authenticated); removeContribution, parcelLocalID, parcelArea,
parcelPrice, authenticated);
// First, allow all validators a stab at it // First, allow all validators a stab at it
m_eventManager.TriggerValidateLandBuy(this, args); m_eventManager.TriggerValidateLandBuy(this, args);

4
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Region.Examples.SimpleModule
public event Action<IClientAPI> OnConnectionClosed; public event Action<IClientAPI> OnConnectionClosed;
public event ImprovedInstantMessage OnInstantMessage; public event ImprovedInstantMessage OnInstantMessage;
public event ChatFromViewer OnChatFromViewer; public event ChatMessage OnChatFromViewer;
public event TextureRequest OnRequestTexture; public event TextureRequest OnRequestTexture;
public event RezObject OnRezObject; public event RezObject OnRezObject;
public event ModifyTerrain OnModifyTerrain; public event ModifyTerrain OnModifyTerrain;
@ -668,7 +668,7 @@ namespace OpenSim.Region.Examples.SimpleModule
{ {
if (OnChatFromViewer != null) if (OnChatFromViewer != null)
{ {
ChatFromViewerArgs args = new ChatFromViewerArgs(); OSChatMessage args = new OSChatMessage();
args.Message = "Hey You! Get out of my Home. This is my Region"; args.Message = "Hey You! Get out of my Home. This is my Region";
args.Channel = 0; args.Channel = 0;
args.From = FirstName + " " + LastName; args.From = FirstName + " " + LastName;