aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs34
-rw-r--r--OpenSim/Framework/UserAgentData.cs8
2 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 0473701..c86992a 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -358,8 +358,8 @@ namespace OpenSim.Framework.UserManagement
358 agent.ProfileID = profile.ID; 358 agent.ProfileID = profile.ID;
359 359
360 // Current position (from Home) 360 // Current position (from Home)
361 agent.CurrentHandle = profile.HomeRegion; 361 agent.Handle = profile.HomeRegion;
362 agent.CurrentPos = profile.HomeLocation; 362 agent.Position = profile.HomeLocation;
363 363
364 // If user specified additional start, use that 364 // If user specified additional start, use that
365 if (requestData.ContainsKey("start")) 365 if (requestData.ContainsKey("start"))
@@ -367,16 +367,16 @@ namespace OpenSim.Framework.UserManagement
367 string startLoc = ((string)requestData["start"]).Trim(); 367 string startLoc = ((string)requestData["start"]).Trim();
368 if (("last" == startLoc) && (profile.CurrentAgent != null)) 368 if (("last" == startLoc) && (profile.CurrentAgent != null))
369 { 369 {
370 if ((profile.CurrentAgent.CurrentPos.X > 0) 370 if ((profile.CurrentAgent.Position.X > 0)
371 && (profile.CurrentAgent.CurrentPos.Y > 0) 371 && (profile.CurrentAgent.Position.Y > 0)
372 && (profile.CurrentAgent.CurrentPos.Z > 0) 372 && (profile.CurrentAgent.Position.Z > 0)
373 ) 373 )
374 { 374 {
375 // TODO: Right now, currentRegion has not been used in GridServer for requesting region. 375 // TODO: Right now, currentRegion has not been used in GridServer for requesting region.
376 // TODO: It is only using currentHandle. 376 // TODO: It is only using currentHandle.
377 agent.CurrentRegion = profile.CurrentAgent.CurrentRegion; 377 agent.Region = profile.CurrentAgent.Region;
378 agent.CurrentHandle = profile.CurrentAgent.CurrentHandle; 378 agent.Handle = profile.CurrentAgent.Handle;
379 agent.CurrentPos = profile.CurrentAgent.CurrentPos; 379 agent.Position = profile.CurrentAgent.Position;
380 } 380 }
381 } 381 }
382 382
@@ -403,8 +403,8 @@ namespace OpenSim.Framework.UserManagement
403 agent.LogoutTime = 0; 403 agent.LogoutTime = 0;
404 404
405 // Current location 405 // Current location
406 agent.RegionID = LLUUID.Zero; // Fill in later 406 agent.InitialRegion = LLUUID.Zero; // Fill in later
407 agent.CurrentRegion = LLUUID.Zero; // Fill in later 407 agent.Region = LLUUID.Zero; // Fill in later
408 408
409 profile.CurrentAgent = agent; 409 profile.CurrentAgent = agent;
410 } 410 }
@@ -442,11 +442,11 @@ namespace OpenSim.Framework.UserManagement
442 //userAgent.sessionID = LLUUID.Zero; 442 //userAgent.sessionID = LLUUID.Zero;
443 if (regionid != LLUUID.Zero) 443 if (regionid != LLUUID.Zero)
444 { 444 {
445 userAgent.CurrentRegion = regionid; 445 userAgent.Region = regionid;
446 } 446 }
447 447
448 userAgent.CurrentHandle = regionhandle; 448 userAgent.Handle = regionhandle;
449 userAgent.CurrentPos = currentPos; 449 userAgent.Position = currentPos;
450 userProfile.CurrentAgent = userAgent; 450 userProfile.CurrentAgent = userAgent;
451 451
452 CommitAgent(ref userProfile); 452 CommitAgent(ref userProfile);
@@ -484,16 +484,16 @@ namespace OpenSim.Framework.UserManagement
484 agent.ProfileID = profile.ID; 484 agent.ProfileID = profile.ID;
485 485
486 // Current position (from Home) 486 // Current position (from Home)
487 agent.CurrentHandle = profile.HomeRegion; 487 agent.Handle = profile.HomeRegion;
488 agent.CurrentPos = profile.HomeLocation; 488 agent.Position = profile.HomeLocation;
489 489
490 // What time did the user login? 490 // What time did the user login?
491 agent.LoginTime = Util.UnixTimeSinceEpoch(); 491 agent.LoginTime = Util.UnixTimeSinceEpoch();
492 agent.LogoutTime = 0; 492 agent.LogoutTime = 0;
493 493
494 // Current location 494 // Current location
495 agent.RegionID = LLUUID.Zero; // Fill in later 495 agent.InitialRegion = LLUUID.Zero; // Fill in later
496 agent.CurrentRegion = LLUUID.Zero; // Fill in later 496 agent.Region = LLUUID.Zero; // Fill in later
497 497
498 profile.CurrentAgent = agent; 498 profile.CurrentAgent = agent;
499 } 499 }
diff --git a/OpenSim/Framework/UserAgentData.cs b/OpenSim/Framework/UserAgentData.cs
index 18e8580..82b1b34 100644
--- a/OpenSim/Framework/UserAgentData.cs
+++ b/OpenSim/Framework/UserAgentData.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Framework
151 } 151 }
152 } 152 }
153 153
154 public LLUUID RegionID { 154 public LLUUID InitialRegion {
155 get { 155 get {
156 return regionID; 156 return regionID;
157 } 157 }
@@ -178,7 +178,7 @@ namespace OpenSim.Framework
178 } 178 }
179 } 179 }
180 180
181 public LLUUID CurrentRegion { 181 public LLUUID Region {
182 get { 182 get {
183 return currentRegion; 183 return currentRegion;
184 } 184 }
@@ -187,7 +187,7 @@ namespace OpenSim.Framework
187 } 187 }
188 } 188 }
189 189
190 public ulong CurrentHandle { 190 public ulong Handle {
191 get { 191 get {
192 return currentHandle; 192 return currentHandle;
193 } 193 }
@@ -196,7 +196,7 @@ namespace OpenSim.Framework
196 } 196 }
197 } 197 }
198 198
199 public LLVector3 CurrentPos { 199 public LLVector3 Position {
200 get { 200 get {
201 return currentPos; 201 return currentPos;
202 } 202 }