aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSean Dague2008-04-10 14:50:52 +0000
committerSean Dague2008-04-10 14:50:52 +0000
commit55ac1c6dce15d768cc7240b75f903076a131c39e (patch)
treeec8ec06c14f382265228d756f89a6c1e43ded15c /OpenSim
parentchanging UserAgentData to use properties. This caused more (diff)
downloadopensim-SC_OLD-55ac1c6dce15d768cc7240b75f903076a131c39e.zip
opensim-SC_OLD-55ac1c6dce15d768cc7240b75f903076a131c39e.tar.gz
opensim-SC_OLD-55ac1c6dce15d768cc7240b75f903076a131c39e.tar.bz2
opensim-SC_OLD-55ac1c6dce15d768cc7240b75f903076a131c39e.tar.xz
renaming of attributes in UserAgentData for readability
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs12
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs20
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs34
-rw-r--r--OpenSim/Framework/UserAgentData.cs8
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs38
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs8
7 files changed, 63 insertions, 63 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 524efc4..e3179f7 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -366,11 +366,11 @@ namespace OpenSim.Data.MSSQL
366 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString()); 366 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
367 367
368 // Current position 368 // Current position
369 retval.CurrentRegion = (string)reader["currentRegion"]; 369 retval.Region = (string)reader["currentRegion"];
370 retval.CurrentHandle = Convert.ToUInt64(reader["currentHandle"].ToString()); 370 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
371 LLVector3 tmp_v; 371 LLVector3 tmp_v;
372 LLVector3.TryParse((string)reader["currentPos"], out tmp_v); 372 LLVector3.TryParse((string)reader["currentPos"], out tmp_v);
373 retval.CurrentPos = tmp_v; 373 retval.Position = tmp_v;
374 374
375 } 375 }
376 else 376 else
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index f2ec6be..38f56c4 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -427,11 +427,11 @@ namespace OpenSim.Data.MySQL
427 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString()); 427 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
428 428
429 // Current position 429 // Current position
430 retval.CurrentRegion = new LLUUID((string)reader["currentRegion"]); 430 retval.Region = new LLUUID((string)reader["currentRegion"]);
431 retval.CurrentHandle = Convert.ToUInt64(reader["currentHandle"].ToString()); 431 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
432 LLVector3 tmp_v; 432 LLVector3 tmp_v;
433 LLVector3.TryParse((string) reader["currentPos"], out tmp_v); 433 LLVector3.TryParse((string) reader["currentPos"], out tmp_v);
434 retval.CurrentPos = tmp_v; 434 retval.Position = tmp_v;
435 } 435 }
436 else 436 else
437 { 437 {
@@ -915,9 +915,9 @@ namespace OpenSim.Data.MySQL
915 parameters["?agentOnline"] = (agentdata.AgentOnline == true) ? "1" : "0"; 915 parameters["?agentOnline"] = (agentdata.AgentOnline == true) ? "1" : "0";
916 parameters["?loginTime"] = agentdata.LoginTime.ToString(); 916 parameters["?loginTime"] = agentdata.LoginTime.ToString();
917 parameters["?logoutTime"] = agentdata.LogoutTime.ToString(); 917 parameters["?logoutTime"] = agentdata.LogoutTime.ToString();
918 parameters["?currentRegion"] = agentdata.CurrentRegion.ToString(); 918 parameters["?currentRegion"] = agentdata.Region.ToString();
919 parameters["?currentHandle"] = agentdata.CurrentHandle.ToString(); 919 parameters["?currentHandle"] = agentdata.Handle.ToString();
920 parameters["?currentPos"] = "<" + ((int)agentdata.CurrentPos.X).ToString() + "," + ((int)agentdata.CurrentPos.Y).ToString() + "," + ((int)agentdata.CurrentPos.Z).ToString() + ">"; 920 parameters["?currentPos"] = "<" + ((int)agentdata.Position.X).ToString() + "," + ((int)agentdata.Position.Y).ToString() + "," + ((int)agentdata.Position.Z).ToString() + ">";
921 921
922 bool returnval = false; 922 bool returnval = false;
923 923
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 3ee0c03..089c9df 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -680,12 +680,12 @@ namespace OpenSim.Data.SQLite
680 ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]); 680 ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]);
681 ua.SessionID = new LLUUID((String) row["sessionID"]); 681 ua.SessionID = new LLUUID((String) row["sessionID"]);
682 ua.SecureSessionID = new LLUUID((String) row["secureSessionID"]); 682 ua.SecureSessionID = new LLUUID((String) row["secureSessionID"]);
683 ua.RegionID = new LLUUID((String) row["regionID"]); 683 ua.InitialRegion = new LLUUID((String) row["regionID"]);
684 ua.LoginTime = Convert.ToInt32(row["loginTime"]); 684 ua.LoginTime = Convert.ToInt32(row["loginTime"]);
685 ua.LogoutTime = Convert.ToInt32(row["logoutTime"]); 685 ua.LogoutTime = Convert.ToInt32(row["logoutTime"]);
686 ua.CurrentRegion = new LLUUID((String) row["currentRegion"]); 686 ua.Region = new LLUUID((String) row["currentRegion"]);
687 ua.CurrentHandle = Convert.ToUInt64(row["currentHandle"]); 687 ua.Handle = Convert.ToUInt64(row["currentHandle"]);
688 ua.CurrentPos = new LLVector3( 688 ua.Position = new LLVector3(
689 Convert.ToSingle(row["currentPosX"]), 689 Convert.ToSingle(row["currentPosX"]),
690 Convert.ToSingle(row["currentPosY"]), 690 Convert.ToSingle(row["currentPosY"]),
691 Convert.ToSingle(row["currentPosZ"]) 691 Convert.ToSingle(row["currentPosZ"])
@@ -701,15 +701,15 @@ namespace OpenSim.Data.SQLite
701 row["agentOnline"] = ua.AgentOnline; 701 row["agentOnline"] = ua.AgentOnline;
702 row["sessionID"] = ua.SessionID; 702 row["sessionID"] = ua.SessionID;
703 row["secureSessionID"] = ua.SecureSessionID; 703 row["secureSessionID"] = ua.SecureSessionID;
704 row["regionID"] = ua.RegionID; 704 row["regionID"] = ua.InitialRegion;
705 row["loginTime"] = ua.LoginTime; 705 row["loginTime"] = ua.LoginTime;
706 row["logoutTime"] = ua.LogoutTime; 706 row["logoutTime"] = ua.LogoutTime;
707 row["currentRegion"] = ua.CurrentRegion; 707 row["currentRegion"] = ua.Region;
708 row["currentHandle"] = ua.CurrentHandle.ToString(); 708 row["currentHandle"] = ua.Handle.ToString();
709 // vectors 709 // vectors
710 row["currentPosX"] = ua.CurrentPos.X; 710 row["currentPosX"] = ua.Position.X;
711 row["currentPosY"] = ua.CurrentPos.Y; 711 row["currentPosY"] = ua.Position.Y;
712 row["currentPosZ"] = ua.CurrentPos.Z; 712 row["currentPosZ"] = ua.Position.Z;
713 } 713 }
714 714
715 /*********************************************************************** 715 /***********************************************************************
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 }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index ce08ee2..78055c8 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Grid.UserServer
85 { 85 {
86 SimInfo = 86 SimInfo =
87 RegionProfileData.RequestSimProfileData( 87 RegionProfileData.RequestSimProfileData(
88 theUser.CurrentAgent.CurrentHandle, m_config.GridServerURL, 88 theUser.CurrentAgent.Handle, m_config.GridServerURL,
89 m_config.GridSendKey, m_config.GridRecvKey); 89 m_config.GridSendKey, m_config.GridRecvKey);
90 } 90 }
91 else if (startLocationRequest == "home") 91 else if (startLocationRequest == "home")
@@ -104,7 +104,7 @@ namespace OpenSim.Grid.UserServer
104 // TODO: Parse out startlocationrequest string in the format; 'uri:RegionName&X&Y&Z' 104 // TODO: Parse out startlocationrequest string in the format; 'uri:RegionName&X&Y&Z'
105 SimInfo = 105 SimInfo =
106 RegionProfileData.RequestSimProfileData( 106 RegionProfileData.RequestSimProfileData(
107 theUser.CurrentAgent.CurrentHandle, m_config.GridServerURL, 107 theUser.CurrentAgent.Handle, m_config.GridServerURL,
108 m_config.GridSendKey, m_config.GridRecvKey); 108 m_config.GridSendKey, m_config.GridRecvKey);
109 } 109 }
110 else 110 else
@@ -164,11 +164,11 @@ namespace OpenSim.Grid.UserServer
164 //CFK: m_log.Info("[LOGIN]: " + SimInfo.regionName + " (" + SimInfo.serverURI + ") " + 164 //CFK: m_log.Info("[LOGIN]: " + SimInfo.regionName + " (" + SimInfo.serverURI + ") " +
165 //CFK: SimInfo.regionLocX + "," + SimInfo.regionLocY); 165 //CFK: SimInfo.regionLocX + "," + SimInfo.regionLocY);
166 166
167 theUser.CurrentAgent.CurrentRegion = SimInfo.UUID; 167 theUser.CurrentAgent.Region = SimInfo.UUID;
168 theUser.CurrentAgent.CurrentHandle = SimInfo.regionHandle; 168 theUser.CurrentAgent.Handle = SimInfo.regionHandle;
169 if (start_x >= 0 && start_y >= 0 && start_z >= 0) { 169 if (start_x >= 0 && start_y >= 0 && start_z >= 0) {
170 LLVector3 tmp_v = new LLVector3(start_x, start_y, start_z); 170 LLVector3 tmp_v = new LLVector3(start_x, start_y, start_z);
171 theUser.CurrentAgent.CurrentPos = tmp_v; 171 theUser.CurrentAgent.Position = tmp_v;
172 } 172 }
173 // Prepare notification 173 // Prepare notification
174 Hashtable SimParams = new Hashtable(); 174 Hashtable SimParams = new Hashtable();
@@ -178,10 +178,10 @@ namespace OpenSim.Grid.UserServer
178 SimParams["lastname"] = theUser.SurName; 178 SimParams["lastname"] = theUser.SurName;
179 SimParams["agent_id"] = theUser.ID.ToString(); 179 SimParams["agent_id"] = theUser.ID.ToString();
180 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); 180 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode);
181 SimParams["startpos_x"] = theUser.CurrentAgent.CurrentPos.X.ToString(); 181 SimParams["startpos_x"] = theUser.CurrentAgent.Position.X.ToString();
182 SimParams["startpos_y"] = theUser.CurrentAgent.CurrentPos.Y.ToString(); 182 SimParams["startpos_y"] = theUser.CurrentAgent.Position.Y.ToString();
183 SimParams["startpos_z"] = theUser.CurrentAgent.CurrentPos.Z.ToString(); 183 SimParams["startpos_z"] = theUser.CurrentAgent.Position.Z.ToString();
184 SimParams["regionhandle"] = theUser.CurrentAgent.CurrentHandle.ToString(); 184 SimParams["regionhandle"] = theUser.CurrentAgent.Handle.ToString();
185 SimParams["caps_path"] = capsPath; 185 SimParams["caps_path"] = capsPath;
186 ArrayList SendParams = new ArrayList(); 186 ArrayList SendParams = new ArrayList();
187 SendParams.Add(SimParams); 187 SendParams.Add(SimParams);
@@ -205,8 +205,8 @@ namespace OpenSim.Grid.UserServer
205 if (handlerUserLoggedInAtLocation != null) 205 if (handlerUserLoggedInAtLocation != null)
206 { 206 {
207 m_log.Info("[LOGIN]: Letting other objects know about login"); 207 m_log.Info("[LOGIN]: Letting other objects know about login");
208 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.CurrentRegion, 208 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.Region,
209 theUser.CurrentAgent.CurrentHandle, theUser.CurrentAgent.CurrentPos.X,theUser.CurrentAgent.CurrentPos.Y,theUser.CurrentAgent.CurrentPos.Z, 209 theUser.CurrentAgent.Handle, theUser.CurrentAgent.Position.X,theUser.CurrentAgent.Position.Y,theUser.CurrentAgent.Position.Z,
210 theUser.FirstName,theUser.SurName); 210 theUser.FirstName,theUser.SurName);
211 } 211 }
212 } 212 }
@@ -258,8 +258,8 @@ namespace OpenSim.Grid.UserServer
258 m_log.Info("[LOGIN]: Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); 258 m_log.Info("[LOGIN]: Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
259 259
260 // Update agent with target sim 260 // Update agent with target sim
261 theUser.CurrentAgent.CurrentRegion = SimInfo.UUID; 261 theUser.CurrentAgent.Region = SimInfo.UUID;
262 theUser.CurrentAgent.CurrentHandle = SimInfo.regionHandle; 262 theUser.CurrentAgent.Handle = SimInfo.regionHandle;
263 263
264 // Prepare notification 264 // Prepare notification
265 Hashtable SimParams = new Hashtable(); 265 Hashtable SimParams = new Hashtable();
@@ -269,10 +269,10 @@ namespace OpenSim.Grid.UserServer
269 SimParams["lastname"] = theUser.SurName; 269 SimParams["lastname"] = theUser.SurName;
270 SimParams["agent_id"] = theUser.ID.ToString(); 270 SimParams["agent_id"] = theUser.ID.ToString();
271 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); 271 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode);
272 SimParams["startpos_x"] = theUser.CurrentAgent.CurrentPos.X.ToString(); 272 SimParams["startpos_x"] = theUser.CurrentAgent.Position.X.ToString();
273 SimParams["startpos_y"] = theUser.CurrentAgent.CurrentPos.Y.ToString(); 273 SimParams["startpos_y"] = theUser.CurrentAgent.Position.Y.ToString();
274 SimParams["startpos_z"] = theUser.CurrentAgent.CurrentPos.Z.ToString(); 274 SimParams["startpos_z"] = theUser.CurrentAgent.Position.Z.ToString();
275 SimParams["regionhandle"] = theUser.CurrentAgent.CurrentHandle.ToString(); 275 SimParams["regionhandle"] = theUser.CurrentAgent.Handle.ToString();
276 SimParams["caps_path"] = capsPath; 276 SimParams["caps_path"] = capsPath;
277 ArrayList SendParams = new ArrayList(); 277 ArrayList SendParams = new ArrayList();
278 SendParams.Add(SimParams); 278 SendParams.Add(SimParams);
@@ -285,8 +285,8 @@ namespace OpenSim.Grid.UserServer
285 if (handlerUserLoggedInAtLocation != null) 285 if (handlerUserLoggedInAtLocation != null)
286 { 286 {
287 m_log.Info("[LOGIN]: Letting other objects know about login"); 287 m_log.Info("[LOGIN]: Letting other objects know about login");
288 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.CurrentRegion, 288 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.Region,
289 theUser.CurrentAgent.CurrentHandle, theUser.CurrentAgent.CurrentPos.X, theUser.CurrentAgent.CurrentPos.Y, theUser.CurrentAgent.CurrentPos.Z, 289 theUser.CurrentAgent.Handle, theUser.CurrentAgent.Position.X, theUser.CurrentAgent.Position.Y, theUser.CurrentAgent.Position.Z,
290 theUser.FirstName, theUser.SurName); 290 theUser.FirstName, theUser.SurName);
291 } 291 }
292 } 292 }
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 4aad93c..79bf9e5 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Communications.Local
127 ulong currentRegion = 0; 127 ulong currentRegion = 0;
128 if (startLocationRequest == "last") 128 if (startLocationRequest == "last")
129 { 129 {
130 currentRegion = theUser.CurrentAgent.CurrentHandle; 130 currentRegion = theUser.CurrentAgent.Handle;
131 } 131 }
132 else if (startLocationRequest == "home") 132 else if (startLocationRequest == "home")
133 { 133 {
@@ -138,7 +138,7 @@ namespace OpenSim.Region.Communications.Local
138 m_log.Info("[LOGIN]: Got Custom Login URL, but can't process it"); 138 m_log.Info("[LOGIN]: Got Custom Login URL, but can't process it");
139 // LocalBackEndServices can't possibly look up a region by name :( 139 // LocalBackEndServices can't possibly look up a region by name :(
140 // TODO: Parse string in the following format: 'uri:RegionName&X&Y&Z' 140 // TODO: Parse string in the following format: 'uri:RegionName&X&Y&Z'
141 currentRegion = theUser.CurrentAgent.CurrentHandle; 141 currentRegion = theUser.CurrentAgent.Handle;
142 } 142 }
143 143
144 RegionInfo reg = m_Parent.GridService.RequestNeighbourInfo(currentRegion); 144 RegionInfo reg = m_Parent.GridService.RequestNeighbourInfo(currentRegion);
@@ -164,8 +164,8 @@ namespace OpenSim.Region.Communications.Local
164 "[CAPS]: Sending new CAPS seed url {0} to client {1}", 164 "[CAPS]: Sending new CAPS seed url {0} to client {1}",
165 response.SeedCapability, response.AgentID); 165 response.SeedCapability, response.AgentID);
166 166
167 theUser.CurrentAgent.CurrentRegion = reg.RegionID; 167 theUser.CurrentAgent.Region = reg.RegionID;
168 theUser.CurrentAgent.CurrentHandle = reg.RegionHandle; 168 theUser.CurrentAgent.Handle = reg.RegionHandle;
169 169
170 LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList(); 170 LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList();
171 171