diff options
author | Justin Clark-Casey (justincc) | 2011-12-19 23:03:45 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-12-19 23:03:45 +0000 |
commit | 87a2d8d51b66db12a487014deb8447fb2432e2a3 (patch) | |
tree | 88b5985189fcd4af3849e1031e9d1e74ccedfc37 /OpenSim/Region/OptionalModules | |
parent | Stop sending the viewer its own AvatarAppearance packet. (diff) | |
download | opensim-SC_OLD-87a2d8d51b66db12a487014deb8447fb2432e2a3.zip opensim-SC_OLD-87a2d8d51b66db12a487014deb8447fb2432e2a3.tar.gz opensim-SC_OLD-87a2d8d51b66db12a487014deb8447fb2432e2a3.tar.bz2 opensim-SC_OLD-87a2d8d51b66db12a487014deb8447fb2432e2a3.tar.xz |
Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs as this is updating SOG/SOP.GroupID, which is arguably generic.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index e959821..740dbdd 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -218,7 +218,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
218 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 218 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
219 | 219 | ||
220 | client.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest; | 220 | client.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest; |
221 | client.OnObjectGroupRequest += HandleObjectGroupUpdate; | ||
222 | client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest; | 221 | client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest; |
223 | client.OnDirFindQuery += OnDirFindQuery; | 222 | client.OnDirFindQuery += OnDirFindQuery; |
224 | client.OnRequestAvatarProperties += OnRequestAvatarProperties; | 223 | client.OnRequestAvatarProperties += OnRequestAvatarProperties; |
@@ -329,35 +328,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
329 | remoteClient.SendGroupNameReply(GroupID, GroupName); | 328 | remoteClient.SendGroupNameReply(GroupID, GroupName); |
330 | } | 329 | } |
331 | 330 | ||
332 | private void HandleObjectGroupUpdate( | ||
333 | IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage) | ||
334 | { | ||
335 | // XXX: Might be better to get rid of this special casing and have GetMembershipData return something | ||
336 | // reasonable for a UUID.Zero group. | ||
337 | if (GroupID != UUID.Zero) | ||
338 | { | ||
339 | GroupMembershipData gmd = GetMembershipData(GroupID, remoteClient.AgentId); | ||
340 | |||
341 | if (gmd == null) | ||
342 | { | ||
343 | // m_log.WarnFormat( | ||
344 | // "[GROUPS]: User {0} is not a member of group {1} so they can't update {2} to this group", | ||
345 | // remoteClient.Name, GroupID, objectLocalID); | ||
346 | |||
347 | return; | ||
348 | } | ||
349 | } | ||
350 | |||
351 | SceneObjectGroup so = ((Scene)remoteClient.Scene).GetGroupByPrim(objectLocalID); | ||
352 | if (so != null) | ||
353 | { | ||
354 | if (so.OwnerID == remoteClient.AgentId) | ||
355 | { | ||
356 | so.SetGroup(GroupID, remoteClient); | ||
357 | } | ||
358 | } | ||
359 | } | ||
360 | |||
361 | private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im) | 331 | private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im) |
362 | { | 332 | { |
363 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 333 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |