diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index a88c5e2..5fabbb0 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | |||
@@ -957,7 +957,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
957 | CacheKey = sb.ToString(); | 957 | CacheKey = sb.ToString(); |
958 | m_memoryCache.TryGetValue(CacheKey, out resp); | 958 | m_memoryCache.TryGetValue(CacheKey, out resp); |
959 | } | 959 | } |
960 | |||
961 | } | 960 | } |
962 | 961 | ||
963 | if (resp == null) | 962 | if (resp == null) |
@@ -965,22 +964,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
965 | string UserService; | 964 | string UserService; |
966 | UUID SessionID; | 965 | UUID SessionID; |
967 | GetClientGroupRequestID(requestingAgentID, out UserService, out SessionID); | 966 | GetClientGroupRequestID(requestingAgentID, out UserService, out SessionID); |
968 | param.Add("requestingAgentID", requestingAgentID.ToString()); | 967 | |
968 | param.Add("RequestingAgentID", requestingAgentID.ToString()); | ||
969 | param.Add("RequestingAgentUserService", UserService); | 969 | param.Add("RequestingAgentUserService", UserService); |
970 | param.Add("RequestingSessionID", SessionID.ToString()); | 970 | param.Add("RequestingSessionID", SessionID.ToString()); |
971 | |||
972 | |||
973 | param.Add("ReadKey", m_groupReadKey); | 971 | param.Add("ReadKey", m_groupReadKey); |
974 | param.Add("WriteKey", m_groupWriteKey); | 972 | param.Add("WriteKey", m_groupWriteKey); |
975 | 973 | ||
976 | |||
977 | IList parameters = new ArrayList(); | 974 | IList parameters = new ArrayList(); |
978 | parameters.Add(param); | 975 | parameters.Add(param); |
979 | 976 | ||
980 | ConfigurableKeepAliveXmlRpcRequest req; | 977 | ConfigurableKeepAliveXmlRpcRequest req; |
981 | req = new ConfigurableKeepAliveXmlRpcRequest(function, parameters, m_disableKeepAlive); | 978 | req = new ConfigurableKeepAliveXmlRpcRequest(function, parameters, m_disableKeepAlive); |
982 | 979 | ||
983 | |||
984 | try | 980 | try |
985 | { | 981 | { |
986 | resp = req.Send(m_groupsServerURI, 10000); | 982 | resp = req.Send(m_groupsServerURI, 10000); |
@@ -989,7 +985,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
989 | { | 985 | { |
990 | m_memoryCache.AddOrUpdate(CacheKey, resp, TimeSpan.FromSeconds(m_cacheTimeout)); | 986 | m_memoryCache.AddOrUpdate(CacheKey, resp, TimeSpan.FromSeconds(m_cacheTimeout)); |
991 | } | 987 | } |
992 | |||
993 | } | 988 | } |
994 | catch (Exception e) | 989 | catch (Exception e) |
995 | { | 990 | { |
@@ -1058,10 +1053,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1058 | { | 1053 | { |
1059 | m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0}", line); | 1054 | m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0}", line); |
1060 | } | 1055 | } |
1061 | |||
1062 | } | 1056 | } |
1063 | } | 1057 | } |
1064 | |||
1065 | 1058 | ||
1066 | /// <summary> | 1059 | /// <summary> |
1067 | /// Group Request Tokens are an attempt to allow the groups service to authenticate | 1060 | /// Group Request Tokens are an attempt to allow the groups service to authenticate |