diff options
Diffstat (limited to '')
8 files changed, 31 insertions, 27 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0c420b4..b9a00c0 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -122,8 +122,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
122 | 122 | ||
123 | private RequestAvatarProperties handlerRequestAvatarProperties = null; //OnRequestAvatarProperties; | 123 | private RequestAvatarProperties handlerRequestAvatarProperties = null; //OnRequestAvatarProperties; |
124 | private UpdateAvatarProperties handlerUpdateAvatarProperties = null; // OnUpdateAvatarProperties; | 124 | private UpdateAvatarProperties handlerUpdateAvatarProperties = null; // OnUpdateAvatarProperties; |
125 | private ChatFromViewer handlerChatFromViewer = null; //OnChatFromViewer; | 125 | private ChatMessage handlerChatFromViewer = null; //OnChatFromViewer; |
126 | private ChatFromViewer handlerChatFromViewer2 = null; //OnChatFromViewer; | 126 | private ChatMessage handlerChatFromViewer2 = null; //OnChatFromViewer; |
127 | private ImprovedInstantMessage handlerInstantMessage = null; //OnInstantMessage; | 127 | private ImprovedInstantMessage handlerInstantMessage = null; //OnInstantMessage; |
128 | private FriendActionDelegate handlerApproveFriendRequest = null; //OnApproveFriendRequest; | 128 | private FriendActionDelegate handlerApproveFriendRequest = null; //OnApproveFriendRequest; |
129 | private FriendshipTermination handlerTerminateFriendship = null; //OnTerminateFriendship; | 129 | private FriendshipTermination handlerTerminateFriendship = null; //OnTerminateFriendship; |
@@ -770,7 +770,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
770 | public event Action<IClientAPI> OnConnectionClosed; | 770 | public event Action<IClientAPI> OnConnectionClosed; |
771 | public event ViewerEffectEventHandler OnViewerEffect; | 771 | public event ViewerEffectEventHandler OnViewerEffect; |
772 | public event ImprovedInstantMessage OnInstantMessage; | 772 | public event ImprovedInstantMessage OnInstantMessage; |
773 | public event ChatFromViewer OnChatFromViewer; | 773 | public event ChatMessage OnChatFromViewer; |
774 | public event TextureRequest OnRequestTexture; | 774 | public event TextureRequest OnRequestTexture; |
775 | public event RezObject OnRezObject; | 775 | public event RezObject OnRezObject; |
776 | public event GenericCall4 OnDeRezObject; | 776 | public event GenericCall4 OnDeRezObject; |
@@ -3859,7 +3859,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3859 | 3859 | ||
3860 | if (OnChatFromViewer != null) | 3860 | if (OnChatFromViewer != null) |
3861 | { | 3861 | { |
3862 | ChatFromViewerArgs args = new ChatFromViewerArgs(); | 3862 | OSChatMessage args = new OSChatMessage(); |
3863 | args.Channel = channel; | 3863 | args.Channel = channel; |
3864 | args.From = fromName; | 3864 | args.From = fromName; |
3865 | args.Message = Helpers.FieldToUTF8String(message); | 3865 | args.Message = Helpers.FieldToUTF8String(message); |
@@ -3898,7 +3898,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3898 | byte[] msg = rdialog.Data.ButtonLabel; | 3898 | byte[] msg = rdialog.Data.ButtonLabel; |
3899 | if (OnChatFromViewer != null) | 3899 | if (OnChatFromViewer != null) |
3900 | { | 3900 | { |
3901 | ChatFromViewerArgs args = new ChatFromViewerArgs(); | 3901 | OSChatMessage args = new OSChatMessage(); |
3902 | args.Channel = ch; | 3902 | args.Channel = ch; |
3903 | args.From = String.Empty; | 3903 | args.From = String.Empty; |
3904 | args.Message = Helpers.FieldToUTF8String(msg); | 3904 | args.Message = Helpers.FieldToUTF8String(msg); |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 5414322..0e397d6 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
105 | #endregion | 105 | #endregion |
106 | 106 | ||
107 | #region ISimChat Members | 107 | #region ISimChat Members |
108 | public void SimBroadcast(Object sender, ChatFromViewerArgs c) | 108 | public void SimBroadcast(Object sender, OSChatMessage c) |
109 | { | 109 | { |
110 | // We only want to relay stuff on channel 0 and on the debug channel | 110 | // We only want to relay stuff on channel 0 and on the debug channel |
111 | if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return; | 111 | if (c.Channel != 0 && c.Channel != DEBUG_CHANNEL) return; |
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
140 | }); | 140 | }); |
141 | } | 141 | } |
142 | 142 | ||
143 | public void SimChat(Object sender, ChatFromViewerArgs e) | 143 | public void SimChat(Object sender, OSChatMessage e) |
144 | { | 144 | { |
145 | // early return if not on public or debug channel | 145 | // early return if not on public or debug channel |
146 | if (e.Channel != 0 && e.Channel != DEBUG_CHANNEL) return; | 146 | if (e.Channel != 0 && e.Channel != DEBUG_CHANNEL) return; |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs index aa1d80c..9df05e0 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs | |||
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
171 | 171 | ||
172 | #region ISimChat Members | 172 | #region ISimChat Members |
173 | 173 | ||
174 | public void SimChat(Object sender, ChatFromViewerArgs e) | 174 | public void SimChat(Object sender, OSChatMessage e) |
175 | { | 175 | { |
176 | // We only want to relay stuff on channel 0 | 176 | // We only want to relay stuff on channel 0 |
177 | if (e.Channel != 0) return; | 177 | if (e.Channel != 0) return; |
@@ -631,7 +631,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
631 | // Any chat ??? | 631 | // Any chat ??? |
632 | if (data != null) | 632 | if (data != null) |
633 | { | 633 | { |
634 | ChatFromViewerArgs c = new ChatFromViewerArgs(); | 634 | OSChatMessage c = new OSChatMessage(); |
635 | c.Message = data["msg"]; | 635 | c.Message = data["msg"]; |
636 | c.Type = ChatTypeEnum.Say; | 636 | c.Type = ChatTypeEnum.Say; |
637 | c.Channel = 0; | 637 | c.Channel = 0; |
@@ -679,7 +679,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
679 | { | 679 | { |
680 | try | 680 | try |
681 | { | 681 | { |
682 | ChatFromViewerArgs c = new ChatFromViewerArgs(); | 682 | OSChatMessage c = new OSChatMessage(); |
683 | c.From = sender; | 683 | c.From = sender; |
684 | c.Message = String.Format(format, args); | 684 | c.Message = String.Format(format, args); |
685 | c.Type = ChatTypeEnum.Say; | 685 | c.Type = ChatTypeEnum.Say; |
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs index 4afbdc4..2f67dee 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs | |||
@@ -322,7 +322,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm | |||
322 | * | 322 | * |
323 | * *****************************************************************/ | 323 | * *****************************************************************/ |
324 | 324 | ||
325 | private void DeliverClientMessage(Object sender, ChatFromViewerArgs e) | 325 | private void DeliverClientMessage(Object sender, OSChatMessage e) |
326 | { | 326 | { |
327 | DeliverMessage(e.Type, | 327 | DeliverMessage(e.Type, |
328 | e.Channel, | 328 | e.Channel, |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 2ae4ae0..d84283b 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
128 | 128 | ||
129 | private void SendOnChatFromViewer(string message, ChatTypeEnum chatType) | 129 | private void SendOnChatFromViewer(string message, ChatTypeEnum chatType) |
130 | { | 130 | { |
131 | ChatFromViewerArgs chatFromViewer = new ChatFromViewerArgs(); | 131 | OSChatMessage chatFromViewer = new OSChatMessage(); |
132 | chatFromViewer.Channel = 0; | 132 | chatFromViewer.Channel = 0; |
133 | chatFromViewer.From = Name; | 133 | chatFromViewer.From = Name; |
134 | chatFromViewer.Message = message; | 134 | chatFromViewer.Message = message; |
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
155 | public event Action<IClientAPI> OnConnectionClosed; | 155 | public event Action<IClientAPI> OnConnectionClosed; |
156 | 156 | ||
157 | public event ImprovedInstantMessage OnInstantMessage; | 157 | public event ImprovedInstantMessage OnInstantMessage; |
158 | public event ChatFromViewer OnChatFromViewer; | 158 | public event ChatMessage OnChatFromViewer; |
159 | public event TextureRequest OnRequestTexture; | 159 | public event TextureRequest OnRequestTexture; |
160 | public event RezObject OnRezObject; | 160 | public event RezObject OnRezObject; |
161 | public event ModifyTerrain OnModifyTerrain; | 161 | public event ModifyTerrain OnModifyTerrain; |
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index f3af0d1..2b1adee 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs | |||
@@ -235,13 +235,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
235 | /// from world comes in (chat from viewer is available via | 235 | /// from world comes in (chat from viewer is available via |
236 | /// client.OnChatFromViewer). | 236 | /// client.OnChatFromViewer). |
237 | /// </summary> | 237 | /// </summary> |
238 | public delegate void ChatFromWorldEvent(Object sender, ChatFromViewerArgs chat); | 238 | public delegate void ChatFromWorldEvent(Object sender, OSChatMessage chat); |
239 | public event ChatFromWorldEvent OnChatFromWorld; | 239 | public event ChatFromWorldEvent OnChatFromWorld; |
240 | /// <summary> | 240 | /// <summary> |
241 | /// ChatBroadcastEvent is called via Scene when a broadcast chat message | 241 | /// ChatBroadcastEvent is called via Scene when a broadcast chat message |
242 | /// from world comes in (chat from viewer is available via client.OnChatFromViewer). | 242 | /// from world comes in (chat from viewer is available via client.OnChatFromViewer). |
243 | /// </summary> | 243 | /// </summary> |
244 | public delegate void ChatBroadcastEvent(Object sender, ChatFromViewerArgs chat); | 244 | public delegate void ChatBroadcastEvent(Object sender, OSChatMessage chat); |
245 | public event ChatBroadcastEvent OnChatBroadcast; | 245 | public event ChatBroadcastEvent OnChatBroadcast; |
246 | 246 | ||
247 | public delegate float SunLindenHour(); | 247 | public delegate float SunLindenHour(); |
@@ -760,7 +760,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
760 | } | 760 | } |
761 | } | 761 | } |
762 | 762 | ||
763 | public void TriggerOnChatFromWorld(Object sender, ChatFromViewerArgs chat) | 763 | public void TriggerOnChatFromWorld(Object sender, OSChatMessage chat) |
764 | { | 764 | { |
765 | handlerChatFromWorld = OnChatFromWorld; | 765 | handlerChatFromWorld = OnChatFromWorld; |
766 | if (handlerChatFromWorld != null) | 766 | if (handlerChatFromWorld != null) |
@@ -769,7 +769,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
769 | } | 769 | } |
770 | } | 770 | } |
771 | 771 | ||
772 | public void TriggerOnChatBroadcast(Object sender, ChatFromViewerArgs chat) | 772 | public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat) |
773 | { | 773 | { |
774 | handlerChatBroadcast = OnChatBroadcast; | 774 | handlerChatBroadcast = OnChatBroadcast; |
775 | if (handlerChatBroadcast != null) | 775 | if (handlerChatBroadcast != null) |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 177d99c..db05430 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
37 | protected void SimChat(byte[] message, ChatTypeEnum type, int channel, LLVector3 fromPos, string fromName, | 37 | protected void SimChat(byte[] message, ChatTypeEnum type, int channel, LLVector3 fromPos, string fromName, |
38 | LLUUID fromID, bool fromAgent, bool broadcast) | 38 | LLUUID fromID, bool fromAgent, bool broadcast) |
39 | { | 39 | { |
40 | ChatFromViewerArgs args = new ChatFromViewerArgs(); | 40 | OSChatMessage args = new OSChatMessage(); |
41 | 41 | ||
42 | args.Message = Helpers.FieldToUTF8String(message); | 42 | args.Message = Helpers.FieldToUTF8String(message); |
43 | args.Channel = channel; | 43 | args.Channel = channel; |
@@ -113,7 +113,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
113 | ((SceneObjectGroup) ent).GetProperties(remoteClient); | 113 | ((SceneObjectGroup) ent).GetProperties(remoteClient); |
114 | ((SceneObjectGroup) ent).IsSelected = true; | 114 | ((SceneObjectGroup) ent).IsSelected = true; |
115 | // A prim is only tainted if it's allowed to be edited by the person clicking it. | 115 | // A prim is only tainted if it's allowed to be edited by the person clicking it. |
116 | if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) || ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)) | 116 | if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) |
117 | || ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)) | ||
117 | { | 118 | { |
118 | EventManager.TriggerParcelPrimCountTainted(); | 119 | EventManager.TriggerParcelPrimCountTainted(); |
119 | } | 120 | } |
@@ -156,7 +157,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
156 | { | 157 | { |
157 | ((SceneObjectGroup) ent).IsSelected = false; | 158 | ((SceneObjectGroup) ent).IsSelected = false; |
158 | ((SceneObjectGroup)ent).ScheduleGroupForFullUpdate(); | 159 | ((SceneObjectGroup)ent).ScheduleGroupForFullUpdate(); |
159 | if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) || ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)) | 160 | if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) |
161 | || ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)) | ||
160 | { | 162 | { |
161 | EventManager.TriggerParcelPrimCountTainted(); | 163 | EventManager.TriggerParcelPrimCountTainted(); |
162 | break; | 164 | break; |
@@ -166,10 +168,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
166 | } | 168 | } |
167 | } | 169 | } |
168 | 170 | ||
169 | public virtual void ProcessMoneyTransferRequest(LLUUID source, LLUUID destination, int amount, int transactiontype, string description) | 171 | public virtual void ProcessMoneyTransferRequest(LLUUID source, LLUUID destination, int amount, |
172 | int transactiontype, string description) | ||
170 | { | 173 | { |
171 | EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs( | 174 | EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(source, destination, amount, |
172 | source, destination, amount, transactiontype, description); | 175 | transactiontype, description); |
173 | 176 | ||
174 | EventManager.TriggerMoneyTransfer(this, args); | 177 | EventManager.TriggerMoneyTransfer(this, args); |
175 | } | 178 | } |
@@ -177,8 +180,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
177 | public virtual void ProcessParcelBuy(LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, | 180 | public virtual void ProcessParcelBuy(LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, |
178 | bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) | 181 | bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) |
179 | { | 182 | { |
180 | EventManager.LandBuyArgs args = new EventManager.LandBuyArgs( | 183 | EventManager.LandBuyArgs args = new EventManager.LandBuyArgs(agentId, groupId, final, groupOwned, |
181 | agentId, groupId, final, groupOwned, removeContribution, parcelLocalID, parcelArea, parcelPrice, authenticated); | 184 | removeContribution, parcelLocalID, parcelArea, |
185 | parcelPrice, authenticated); | ||
182 | 186 | ||
183 | // First, allow all validators a stab at it | 187 | // First, allow all validators a stab at it |
184 | m_eventManager.TriggerValidateLandBuy(this, args); | 188 | m_eventManager.TriggerValidateLandBuy(this, args); |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index f0442ac..ce4cd62 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
55 | public event Action<IClientAPI> OnConnectionClosed; | 55 | public event Action<IClientAPI> OnConnectionClosed; |
56 | 56 | ||
57 | public event ImprovedInstantMessage OnInstantMessage; | 57 | public event ImprovedInstantMessage OnInstantMessage; |
58 | public event ChatFromViewer OnChatFromViewer; | 58 | public event ChatMessage OnChatFromViewer; |
59 | public event TextureRequest OnRequestTexture; | 59 | public event TextureRequest OnRequestTexture; |
60 | public event RezObject OnRezObject; | 60 | public event RezObject OnRezObject; |
61 | public event ModifyTerrain OnModifyTerrain; | 61 | public event ModifyTerrain OnModifyTerrain; |
@@ -668,7 +668,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
668 | { | 668 | { |
669 | if (OnChatFromViewer != null) | 669 | if (OnChatFromViewer != null) |
670 | { | 670 | { |
671 | ChatFromViewerArgs args = new ChatFromViewerArgs(); | 671 | OSChatMessage args = new OSChatMessage(); |
672 | args.Message = "Hey You! Get out of my Home. This is my Region"; | 672 | args.Message = "Hey You! Get out of my Home. This is my Region"; |
673 | args.Channel = 0; | 673 | args.Channel = 0; |
674 | args.From = FirstName + " " + LastName; | 674 | args.From = FirstName + " " + LastName; |