aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs25
1 files changed, 6 insertions, 19 deletions
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index d4fb187..b48f20e 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -190,28 +190,15 @@ namespace OpenSim.Grid.UserServer
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 avatarUUID = LLUUID.Zero;
194 194
195 Helpers.TryParse((string)requestData["avatar_id"], out AvatarID); 195 Helpers.TryParse((string)requestData["avatar_id"], out avatarUUID);
196 Helpers.TryParse((string)requestData["region_uuid"], out regionUUID); 196 Helpers.TryParse((string)requestData["region_uuid"], out regionUUID);
197 // try 197
198 // { 198 if (avatarUUID != LLUUID.Zero)
199 // cregionhandle = (ulong)Convert.ToInt64((string)requestData["region_handle"]);
200 // }
201 // catch (ArgumentException)
202 // {
203 // }
204 // catch (OverflowException)
205 // {
206 // }
207 // catch (FormatException)
208 // {
209 // }
210
211 if (AvatarID != LLUUID.Zero)
212 { 199 {
213 UserProfileData userProfile = GetUserProfile(new LLUUID((string)requestData["avatar_id"])); 200 UserProfileData userProfile = GetUserProfile(avatarUUID);
214 userProfile.CurrentAgent.Region = new LLUUID((string)requestData["region_uuid"]); 201 userProfile.CurrentAgent.Region = regionUUID;
215 userProfile.CurrentAgent.Handle = (ulong)Convert.ToInt64((string)requestData["region_handle"]); 202 userProfile.CurrentAgent.Handle = (ulong)Convert.ToInt64((string)requestData["region_handle"]);
216 //userProfile.CurrentAgent. 203 //userProfile.CurrentAgent.
217 CommitAgent(ref userProfile); 204 CommitAgent(ref userProfile);