diff options
author | Diva Canto | 2010-04-03 12:03:34 -0700 |
---|---|---|
committer | Diva Canto | 2010-04-03 12:03:34 -0700 |
commit | 6485c576a177d521ec26df7c0a5e374e22682396 (patch) | |
tree | 48a9001e64cdea1556e172afd61d42c2ec801381 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |
parent | Don't append ACKs to zerocoded packets. Although this should fine in theory, ... (diff) | |
download | opensim-SC_OLD-6485c576a177d521ec26df7c0a5e374e22682396.zip opensim-SC_OLD-6485c576a177d521ec26df7c0a5e374e22682396.tar.gz opensim-SC_OLD-6485c576a177d521ec26df7c0a5e374e22682396.tar.bz2 opensim-SC_OLD-6485c576a177d521ec26df7c0a5e374e22682396.tar.xz |
* Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.
* Removed Store service from the UserAccount handler.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 6b942cb..b2b8110 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -601,14 +601,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
601 | public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) | 601 | public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) |
602 | { | 602 | { |
603 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 603 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
604 | List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID); | 604 | List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID); |
605 | 605 | ||
606 | if (m_debugEnabled) | 606 | if (m_debugEnabled) |
607 | { | 607 | { |
608 | foreach (GroupMembersData member in data) | 608 | foreach (GroupMembersData member in data) |
609 | { | 609 | { |
610 | m_log.DebugFormat("[GROUPS]: Member({0}) - IsOwner({1})", member.AgentID, member.IsOwner); | 610 | m_log.DebugFormat("[GROUPS]: Member({0}) - IsOwner({1})", member.AgentID, member.IsOwner); |
611 | } | 611 | } |
612 | } | 612 | } |
613 | 613 | ||
614 | return data; | 614 | return data; |
@@ -628,14 +628,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
628 | { | 628 | { |
629 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 629 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
630 | 630 | ||
631 | List<GroupRoleMembersData> data = m_groupData.GetGroupRoleMembers(GetRequestingAgentID(remoteClient), groupID); | 631 | List<GroupRoleMembersData> data = m_groupData.GetGroupRoleMembers(GetRequestingAgentID(remoteClient), groupID); |
632 | 632 | ||
633 | if (m_debugEnabled) | 633 | if (m_debugEnabled) |
634 | { | 634 | { |
635 | foreach (GroupRoleMembersData member in data) | 635 | foreach (GroupRoleMembersData member in data) |
636 | { | 636 | { |
637 | m_log.DebugFormat("[GROUPS]: Member({0}) - Role({1})", member.MemberID, member.RoleID); | 637 | m_log.DebugFormat("[GROUPS]: Member({0}) - Role({1})", member.MemberID, member.RoleID); |
638 | } | 638 | } |
639 | } | 639 | } |
640 | return data; | 640 | return data; |
641 | } | 641 | } |
@@ -1144,11 +1144,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1144 | OSDMap llDataStruct = new OSDMap(3); | 1144 | OSDMap llDataStruct = new OSDMap(3); |
1145 | llDataStruct.Add("AgentData", AgentData); | 1145 | llDataStruct.Add("AgentData", AgentData); |
1146 | llDataStruct.Add("GroupData", GroupData); | 1146 | llDataStruct.Add("GroupData", GroupData); |
1147 | llDataStruct.Add("NewGroupData", NewGroupData); | 1147 | llDataStruct.Add("NewGroupData", NewGroupData); |
1148 | 1148 | ||
1149 | if (m_debugEnabled) | 1149 | if (m_debugEnabled) |
1150 | { | 1150 | { |
1151 | m_log.InfoFormat("[GROUPS]: {0}", OSDParser.SerializeJsonString(llDataStruct)); | 1151 | m_log.InfoFormat("[GROUPS]: {0}", OSDParser.SerializeJsonString(llDataStruct)); |
1152 | } | 1152 | } |
1153 | 1153 | ||
1154 | IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); | 1154 | IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); |
@@ -1308,16 +1308,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1308 | // | 1308 | // |
1309 | } | 1309 | } |
1310 | 1310 | ||
1311 | #endregion | 1311 | #endregion |
1312 | 1312 | ||
1313 | private UUID GetRequestingAgentID(IClientAPI client) | 1313 | private UUID GetRequestingAgentID(IClientAPI client) |
1314 | { | 1314 | { |
1315 | UUID requestingAgentID = UUID.Zero; | 1315 | UUID requestingAgentID = UUID.Zero; |
1316 | if (client != null) | 1316 | if (client != null) |
1317 | { | 1317 | { |
1318 | requestingAgentID = client.AgentId; | 1318 | requestingAgentID = client.AgentId; |
1319 | } | 1319 | } |
1320 | return requestingAgentID; | 1320 | return requestingAgentID; |
1321 | } | 1321 | } |
1322 | } | 1322 | } |
1323 | 1323 | ||