diff options
-rw-r--r-- | OpenSim/Data/RegionProfileService.cs | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Data/RegionProfileService.cs b/OpenSim/Data/RegionProfileService.cs index 1a73ed1..f30bd1e 100644 --- a/OpenSim/Data/RegionProfileService.cs +++ b/OpenSim/Data/RegionProfileService.cs | |||
@@ -13,15 +13,15 @@ namespace OpenSim.Data | |||
13 | /// <summary> | 13 | /// <summary> |
14 | /// Request sim data based on arbitrary key/value | 14 | /// Request sim data based on arbitrary key/value |
15 | /// </summary> | 15 | /// </summary> |
16 | private static RegionProfileData RequestSimData(Uri gridserver_url, string gridserver_sendkey, string keyField, string keyValue) | 16 | private static RegionProfileData RequestSimData(Uri gridserverUrl, string gridserverSendkey, string keyField, string keyValue) |
17 | { | 17 | { |
18 | Hashtable requestData = new Hashtable(); | 18 | Hashtable requestData = new Hashtable(); |
19 | requestData[keyField] = keyValue; | 19 | requestData[keyField] = keyValue; |
20 | requestData["authkey"] = gridserver_sendkey; | 20 | requestData["authkey"] = gridserverSendkey; |
21 | ArrayList SendParams = new ArrayList(); | 21 | ArrayList SendParams = new ArrayList(); |
22 | SendParams.Add(requestData); | 22 | SendParams.Add(requestData); |
23 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams); | 23 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams); |
24 | XmlRpcResponse GridResp = GridReq.Send(gridserver_url.ToString(), 3000); | 24 | XmlRpcResponse GridResp = GridReq.Send(gridserverUrl.ToString(), 3000); |
25 | 25 | ||
26 | Hashtable responseData = (Hashtable) GridResp.Value; | 26 | Hashtable responseData = (Hashtable) GridResp.Value; |
27 | 27 | ||
@@ -51,16 +51,16 @@ namespace OpenSim.Data | |||
51 | /// <summary> | 51 | /// <summary> |
52 | /// Request sim profile information from a grid server, by Region UUID | 52 | /// Request sim profile information from a grid server, by Region UUID |
53 | /// </summary> | 53 | /// </summary> |
54 | /// <param name="region_UUID">The region UUID to look for</param> | 54 | /// <param name="regionId">The region UUID to look for</param> |
55 | /// <param name="gridserver_url"></param> | 55 | /// <param name="gridserverUrl"></param> |
56 | /// <param name="gridserver_sendkey"></param> | 56 | /// <param name="gridserverSendkey"></param> |
57 | /// <param name="gridserver_recvkey"></param> | 57 | /// <param name="gridserverRecvkey"></param> |
58 | /// <returns>The sim profile. Null if there was a request failure</returns> | 58 | /// <returns>The sim profile. Null if there was a request failure</returns> |
59 | /// <remarks>This method should be statics</remarks> | 59 | /// <remarks>This method should be statics</remarks> |
60 | public static RegionProfileData RequestSimProfileData(UUID region_uuid, Uri gridserver_url, | 60 | public static RegionProfileData RequestSimProfileData(UUID regionId, Uri gridserverUrl, |
61 | string gridserver_sendkey, string gridserver_recvkey) | 61 | string gridserverSendkey, string gridserverRecvkey) |
62 | { | 62 | { |
63 | return RequestSimData(gridserver_url, gridserver_sendkey, "region_UUID", region_uuid.Guid.ToString()); | 63 | return RequestSimData(gridserverUrl, gridserverSendkey, "region_UUID", regionId.Guid.ToString()); |
64 | } | 64 | } |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
@@ -80,15 +80,15 @@ namespace OpenSim.Data | |||
80 | /// <summary> | 80 | /// <summary> |
81 | /// Request sim profile information from a grid server, by Region Name | 81 | /// Request sim profile information from a grid server, by Region Name |
82 | /// </summary> | 82 | /// </summary> |
83 | /// <param name="region_handle">the region name to look for</param> | 83 | /// <param name="regionName">the region name to look for</param> |
84 | /// <param name="gridserver_url"></param> | 84 | /// <param name="gridserverUrl"></param> |
85 | /// <param name="gridserver_sendkey"></param> | 85 | /// <param name="gridserverSendkey"></param> |
86 | /// <param name="gridserver_recvkey"></param> | 86 | /// <param name="gridserverRecvkey"></param> |
87 | /// <returns>The sim profile. Null if there was a request failure</returns> | 87 | /// <returns>The sim profile. Null if there was a request failure</returns> |
88 | public static RegionProfileData RequestSimProfileData(string regionName, Uri gridserver_url, | 88 | public static RegionProfileData RequestSimProfileData(string regionName, Uri gridserverUrl, |
89 | string gridserver_sendkey, string gridserver_recvkey) | 89 | string gridserverSendkey, string gridserverRecvkey) |
90 | { | 90 | { |
91 | return RequestSimData(gridserver_url, gridserver_sendkey, "region_name_search", regionName ); | 91 | return RequestSimData(gridserverUrl, gridserverSendkey, "region_name_search", regionName ); |
92 | } | 92 | } |
93 | } | 93 | } |
94 | } | 94 | } |