OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

For all Flotasm group module XMLRPC calls, correct parameter requestingAgentID to RequestingAgentID 

This was stopping the get group member roles call from working, and may have affected other things
0.7-post-fixes
Justin Clark-Casey (justincc) 2010-09-17 23:48:44 +01:00
parent 04cb782225
commit 4485732231
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
View File

@ -957,7 +957,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
CacheKey = sb.ToString(); CacheKey = sb.ToString();
m_memoryCache.TryGetValue(CacheKey, out resp); m_memoryCache.TryGetValue(CacheKey, out resp);
} }
} }
if( resp == null ) if( resp == null )
@ -965,22 +964,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
string UserService; string UserService;
UUID SessionID; UUID SessionID;
GetClientGroupRequestID(requestingAgentID, out UserService, out SessionID); GetClientGroupRequestID(requestingAgentID, out UserService, out SessionID);
param.Add("requestingAgentID", requestingAgentID.ToString());
param.Add("RequestingAgentID", requestingAgentID.ToString());
param.Add("RequestingAgentUserService", UserService); param.Add("RequestingAgentUserService", UserService);
param.Add("RequestingSessionID", SessionID.ToString()); param.Add("RequestingSessionID", SessionID.ToString());
param.Add("ReadKey", m_groupReadKey); param.Add("ReadKey", m_groupReadKey);
param.Add("WriteKey", m_groupWriteKey); param.Add("WriteKey", m_groupWriteKey);
IList parameters = new ArrayList(); IList parameters = new ArrayList();
parameters.Add(param); parameters.Add(param);
ConfigurableKeepAliveXmlRpcRequest req; ConfigurableKeepAliveXmlRpcRequest req;
req = new ConfigurableKeepAliveXmlRpcRequest(function, parameters, m_disableKeepAlive); req = new ConfigurableKeepAliveXmlRpcRequest(function, parameters, m_disableKeepAlive);
try try
{ {
resp = req.Send(m_groupsServerURI, 10000); resp = req.Send(m_groupsServerURI, 10000);
@ -989,7 +985,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
{ {
m_memoryCache.AddOrUpdate(CacheKey, resp, TimeSpan.FromSeconds(m_cacheTimeout)); m_memoryCache.AddOrUpdate(CacheKey, resp, TimeSpan.FromSeconds(m_cacheTimeout));
} }
} }
catch (Exception e) catch (Exception e)
{ {
@ -1058,11 +1053,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
{ {
m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0}", line); m_log.ErrorFormat("[XMLRPC-GROUPS-CONNECTOR]: {0}", line);
} }
} }
} }
/// <summary> /// <summary>
/// Group Request Tokens are an attempt to allow the groups service to authenticate /// Group Request Tokens are an attempt to allow the groups service to authenticate
/// requests. /// requests.