diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/MessageServersConnector.cs | 12 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 40 |
2 files changed, 26 insertions, 26 deletions
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs index 208131e..b3f8b19 100644 --- a/OpenSim/Grid/UserServer/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs | |||
@@ -140,12 +140,12 @@ namespace OpenSim.Grid.UserServer | |||
140 | 140 | ||
141 | if (requestData.Contains("fromuri")) | 141 | if (requestData.Contains("fromuri")) |
142 | { | 142 | { |
143 | string sURI = (string)requestData["fromuri"]; | 143 | // string sURI = (string)requestData["fromuri"]; |
144 | string sagentID = (string)requestData["agentid"]; | 144 | // string sagentID = (string)requestData["agentid"]; |
145 | string ssessionID = (string)requestData["sessionid"]; | 145 | // string ssessionID = (string)requestData["sessionid"]; |
146 | string scurrentRegionID = (string)requestData["regionid"]; | 146 | // string scurrentRegionID = (string)requestData["regionid"]; |
147 | string sregionhandle = (string)requestData["regionhandle"]; | 147 | // string sregionhandle = (string)requestData["regionhandle"]; |
148 | string scurrentpos = (string)requestData["currentpos"]; | 148 | // string scurrentpos = (string)requestData["currentpos"]; |
149 | //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos); | 149 | //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos); |
150 | // TODO: Okay now raise event so the user server can pass this data to the Usermanager | 150 | // TODO: Okay now raise event so the user server can pass this data to the Usermanager |
151 | 151 | ||
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 907a530..d4fb187 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -164,7 +164,7 @@ namespace OpenSim.Grid.UserServer | |||
164 | 164 | ||
165 | public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request) | 165 | public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request) |
166 | { | 166 | { |
167 | XmlRpcResponse response = new XmlRpcResponse(); | 167 | // XmlRpcResponse response = new XmlRpcResponse(); |
168 | Hashtable requestData = (Hashtable) request.Params[0]; | 168 | Hashtable requestData = (Hashtable) request.Params[0]; |
169 | List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>(); | 169 | List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>(); |
170 | LLUUID queryID = new LLUUID(LLUUID.Zero.ToString()); | 170 | LLUUID queryID = new LLUUID(LLUUID.Zero.ToString()); |
@@ -188,25 +188,25 @@ namespace OpenSim.Grid.UserServer | |||
188 | 188 | ||
189 | if (requestData.Contains("avatar_id") && requestData.Contains("region_handle") && requestData.Contains("region_uuid")) | 189 | if (requestData.Contains("avatar_id") && requestData.Contains("region_handle") && requestData.Contains("region_uuid")) |
190 | { | 190 | { |
191 | ulong cregionhandle = 0; | 191 | // ulong cregionhandle = 0; |
192 | LLUUID regionUUID = LLUUID.Zero; | 192 | LLUUID regionUUID = LLUUID.Zero; |
193 | LLUUID AvatarID = LLUUID.Zero; | 193 | LLUUID AvatarID = LLUUID.Zero; |
194 | 194 | ||
195 | Helpers.TryParse((string)requestData["avatar_id"], out AvatarID); | 195 | Helpers.TryParse((string)requestData["avatar_id"], out AvatarID); |
196 | Helpers.TryParse((string)requestData["region_uuid"], out regionUUID); | 196 | Helpers.TryParse((string)requestData["region_uuid"], out regionUUID); |
197 | try | 197 | // try |
198 | { | 198 | // { |
199 | cregionhandle = (ulong)Convert.ToInt64((string)requestData["region_handle"]); | 199 | // cregionhandle = (ulong)Convert.ToInt64((string)requestData["region_handle"]); |
200 | } | 200 | // } |
201 | catch (ArgumentException) | 201 | // catch (ArgumentException) |
202 | { | 202 | // { |
203 | } | 203 | // } |
204 | catch (OverflowException) | 204 | // catch (OverflowException) |
205 | { | 205 | // { |
206 | } | 206 | // } |
207 | catch (FormatException) | 207 | // catch (FormatException) |
208 | { | 208 | // { |
209 | } | 209 | // } |
210 | 210 | ||
211 | if (AvatarID != LLUUID.Zero) | 211 | if (AvatarID != LLUUID.Zero) |
212 | { | 212 | { |
@@ -285,9 +285,9 @@ namespace OpenSim.Grid.UserServer | |||
285 | 285 | ||
286 | public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request) | 286 | public XmlRpcResponse XmlRpcResponseXmlRPCGetUserFriendList(XmlRpcRequest request) |
287 | { | 287 | { |
288 | XmlRpcResponse response = new XmlRpcResponse(); | 288 | // XmlRpcResponse response = new XmlRpcResponse(); |
289 | Hashtable requestData = (Hashtable)request.Params[0]; | 289 | Hashtable requestData = (Hashtable)request.Params[0]; |
290 | Hashtable responseData = new Hashtable(); | 290 | // Hashtable responseData = new Hashtable(); |
291 | 291 | ||
292 | List<FriendListItem> returndata = new List<FriendListItem>(); | 292 | List<FriendListItem> returndata = new List<FriendListItem>(); |
293 | 293 | ||
@@ -354,14 +354,14 @@ namespace OpenSim.Grid.UserServer | |||
354 | 354 | ||
355 | public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request) | 355 | public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request) |
356 | { | 356 | { |
357 | XmlRpcResponse response = new XmlRpcResponse(); | 357 | // XmlRpcResponse response = new XmlRpcResponse(); |
358 | Hashtable requestData = (Hashtable) request.Params[0]; | 358 | Hashtable requestData = (Hashtable) request.Params[0]; |
359 | UserProfileData userProfile; | 359 | UserProfileData userProfile; |
360 | if (requestData.Contains("avatar_name")) | 360 | if (requestData.Contains("avatar_name")) |
361 | { | 361 | { |
362 | string query = (string) requestData["avatar_name"]; | 362 | string query = (string) requestData["avatar_name"]; |
363 | 363 | ||
364 | Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]"); | 364 | // Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]"); |
365 | 365 | ||
366 | string[] querysplit; | 366 | string[] querysplit; |
367 | querysplit = query.Split(' '); | 367 | querysplit = query.Split(' '); |
@@ -389,7 +389,7 @@ namespace OpenSim.Grid.UserServer | |||
389 | 389 | ||
390 | public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request) | 390 | public XmlRpcResponse XmlRPCGetUserMethodUUID(XmlRpcRequest request) |
391 | { | 391 | { |
392 | XmlRpcResponse response = new XmlRpcResponse(); | 392 | // XmlRpcResponse response = new XmlRpcResponse(); |
393 | Hashtable requestData = (Hashtable) request.Params[0]; | 393 | Hashtable requestData = (Hashtable) request.Params[0]; |
394 | UserProfileData userProfile; | 394 | UserProfileData userProfile; |
395 | //CFK: this clogs the UserServer log and is not necessary at this time. | 395 | //CFK: this clogs the UserServer log and is not necessary at this time. |