ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

renaming the increasingly ill-named ChatFromViewerArgs to OSChatMessage

Browse Source
This commit is contained in:
Dr Scofield
2008-07-25 10:05:50 +00:00
parent 50bc51b642
commit 24e15088ea
10 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
/// client.OnChatFromViewer).
/// </summary>
public delegate void ChatFromWorldEvent(Object sender, ChatFromViewerArgs chat);
public delegate void ChatFromWorldEvent(Object sender, OSChatMessage chat);
public event ChatFromWorldEvent OnChatFromWorld;
/// <summary>
/// ChatBroadcastEvent is called via Scene when a broadcast chat message
/// from world comes in (chat from viewer is available via client.OnChatFromViewer).
/// </summary>
public delegate void ChatBroadcastEvent(Object sender, ChatFromViewerArgs chat);
public delegate void ChatBroadcastEvent(Object sender, OSChatMessage chat);
public event ChatBroadcastEvent OnChatBroadcast;
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;
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;
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,
LLUUID fromID, bool fromAgent, bool broadcast)
{
ChatFromViewerArgs args = new ChatFromViewerArgs();
OSChatMessage args = new OSChatMessage();
args.Message = Helpers.FieldToUTF8String(message);
args.Channel = channel;
@@ -113,7 +113,8 @@ namespace OpenSim.Region.Environment.Scenes
((SceneObjectGroup) ent).GetProperties(remoteClient);
((SceneObjectGroup) ent).IsSelected = true;
// 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();
}
@@ -156,7 +157,8 @@ namespace OpenSim.Region.Environment.Scenes
{
((SceneObjectGroup) ent).IsSelected = false;
((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();
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(
source, destination, amount, transactiontype, description);
EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(source, destination, amount,
transactiontype, description);
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,
bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated)
{
EventManager.LandBuyArgs args = new EventManager.LandBuyArgs(
agentId, groupId, final, groupOwned, removeContribution, parcelLocalID, parcelArea, parcelPrice, authenticated);
EventManager.LandBuyArgs args = new EventManager.LandBuyArgs(agentId, groupId, final, groupOwned,
removeContribution, parcelLocalID, parcelArea,
parcelPrice, authenticated);
// First, allow all validators a stab at it
m_eventManager.TriggerValidateLandBuy(this, args);