diff options
author | Melanie Thielker | 2008-11-16 22:04:01 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-16 22:04:01 +0000 |
commit | 5e2e05a1c1cf083c52728798c809711f4e2f52ae (patch) | |
tree | a51ab47c0d6e83a31fc02e0b840911bf936fe802 /OpenSim/Region/Environment/Modules/Avatar/Groups | |
parent | - Fix a formatting error in a log message (Mantis#2635). (diff) | |
download | opensim-SC_OLD-5e2e05a1c1cf083c52728798c809711f4e2f52ae.zip opensim-SC_OLD-5e2e05a1c1cf083c52728798c809711f4e2f52ae.tar.gz opensim-SC_OLD-5e2e05a1c1cf083c52728798c809711f4e2f52ae.tar.bz2 opensim-SC_OLD-5e2e05a1c1cf083c52728798c809711f4e2f52ae.tar.xz |
Megapatch. Completely remove the multiparameter IM methods. Remove the insecure
fromAgentSession field.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs index c291c16..eea8e40 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs | |||
@@ -178,27 +178,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups | |||
178 | ActiveGroupTitle); | 178 | ActiveGroupTitle); |
179 | } | 179 | } |
180 | 180 | ||
181 | private void OnInstantMessage(IClientAPI client, UUID fromAgentID, | 181 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) |
182 | UUID fromAgentSession, UUID toAgentID, | ||
183 | UUID imSessionID, uint timestamp, string fromAgentName, | ||
184 | string message, byte dialog, bool fromGroup, byte offline, | ||
185 | uint ParentEstateID, Vector3 Position, UUID RegionID, | ||
186 | byte[] binaryBucket) | ||
187 | { | 182 | { |
188 | } | 183 | } |
189 | 184 | ||
190 | private void OnGridInstantMessage(GridInstantMessage msg) | 185 | private void OnGridInstantMessage(GridInstantMessage msg) |
191 | { | 186 | { |
192 | // Trigger the above event handler | 187 | // Trigger the above event handler |
193 | OnInstantMessage(null, new UUID(msg.fromAgentID), | 188 | OnInstantMessage(null, msg); |
194 | new UUID(msg.fromAgentSession), | ||
195 | new UUID(msg.toAgentID), new UUID(msg.imSessionID), | ||
196 | msg.timestamp, msg.fromAgentName, | ||
197 | msg.message, msg.dialog, msg.fromGroup, msg.offline, | ||
198 | msg.ParentEstateID, | ||
199 | new Vector3(msg.Position.X, msg.Position.Y, msg.Position.Z), | ||
200 | new UUID(msg.RegionID), | ||
201 | msg.binaryBucket); | ||
202 | } | 189 | } |
203 | 190 | ||
204 | private void HandleUUIDGroupNameRequest(UUID id,IClientAPI remote_client) | 191 | private void HandleUUIDGroupNameRequest(UUID id,IClientAPI remote_client) |