From 55ac1c6dce15d768cc7240b75f903076a131c39e Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 10 Apr 2008 14:50:52 +0000
Subject: renaming of attributes in UserAgentData for readability
---
OpenSim/Grid/UserServer/UserLoginService.cs | 38 ++++++++++++++---------------
1 file changed, 19 insertions(+), 19 deletions(-)
(limited to 'OpenSim/Grid')
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
{
SimInfo =
RegionProfileData.RequestSimProfileData(
- theUser.CurrentAgent.CurrentHandle, m_config.GridServerURL,
+ theUser.CurrentAgent.Handle, m_config.GridServerURL,
m_config.GridSendKey, m_config.GridRecvKey);
}
else if (startLocationRequest == "home")
@@ -104,7 +104,7 @@ namespace OpenSim.Grid.UserServer
// TODO: Parse out startlocationrequest string in the format; 'uri:RegionName&X&Y&Z'
SimInfo =
RegionProfileData.RequestSimProfileData(
- theUser.CurrentAgent.CurrentHandle, m_config.GridServerURL,
+ theUser.CurrentAgent.Handle, m_config.GridServerURL,
m_config.GridSendKey, m_config.GridRecvKey);
}
else
@@ -164,11 +164,11 @@ namespace OpenSim.Grid.UserServer
//CFK: m_log.Info("[LOGIN]: " + SimInfo.regionName + " (" + SimInfo.serverURI + ") " +
//CFK: SimInfo.regionLocX + "," + SimInfo.regionLocY);
- theUser.CurrentAgent.CurrentRegion = SimInfo.UUID;
- theUser.CurrentAgent.CurrentHandle = SimInfo.regionHandle;
+ theUser.CurrentAgent.Region = SimInfo.UUID;
+ theUser.CurrentAgent.Handle = SimInfo.regionHandle;
if (start_x >= 0 && start_y >= 0 && start_z >= 0) {
LLVector3 tmp_v = new LLVector3(start_x, start_y, start_z);
- theUser.CurrentAgent.CurrentPos = tmp_v;
+ theUser.CurrentAgent.Position = tmp_v;
}
// Prepare notification
Hashtable SimParams = new Hashtable();
@@ -178,10 +178,10 @@ namespace OpenSim.Grid.UserServer
SimParams["lastname"] = theUser.SurName;
SimParams["agent_id"] = theUser.ID.ToString();
SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode);
- SimParams["startpos_x"] = theUser.CurrentAgent.CurrentPos.X.ToString();
- SimParams["startpos_y"] = theUser.CurrentAgent.CurrentPos.Y.ToString();
- SimParams["startpos_z"] = theUser.CurrentAgent.CurrentPos.Z.ToString();
- SimParams["regionhandle"] = theUser.CurrentAgent.CurrentHandle.ToString();
+ SimParams["startpos_x"] = theUser.CurrentAgent.Position.X.ToString();
+ SimParams["startpos_y"] = theUser.CurrentAgent.Position.Y.ToString();
+ SimParams["startpos_z"] = theUser.CurrentAgent.Position.Z.ToString();
+ SimParams["regionhandle"] = theUser.CurrentAgent.Handle.ToString();
SimParams["caps_path"] = capsPath;
ArrayList SendParams = new ArrayList();
SendParams.Add(SimParams);
@@ -205,8 +205,8 @@ namespace OpenSim.Grid.UserServer
if (handlerUserLoggedInAtLocation != null)
{
m_log.Info("[LOGIN]: Letting other objects know about login");
- handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.CurrentRegion,
- theUser.CurrentAgent.CurrentHandle, theUser.CurrentAgent.CurrentPos.X,theUser.CurrentAgent.CurrentPos.Y,theUser.CurrentAgent.CurrentPos.Z,
+ handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.Region,
+ theUser.CurrentAgent.Handle, theUser.CurrentAgent.Position.X,theUser.CurrentAgent.Position.Y,theUser.CurrentAgent.Position.Z,
theUser.FirstName,theUser.SurName);
}
}
@@ -258,8 +258,8 @@ namespace OpenSim.Grid.UserServer
m_log.Info("[LOGIN]: Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
// Update agent with target sim
- theUser.CurrentAgent.CurrentRegion = SimInfo.UUID;
- theUser.CurrentAgent.CurrentHandle = SimInfo.regionHandle;
+ theUser.CurrentAgent.Region = SimInfo.UUID;
+ theUser.CurrentAgent.Handle = SimInfo.regionHandle;
// Prepare notification
Hashtable SimParams = new Hashtable();
@@ -269,10 +269,10 @@ namespace OpenSim.Grid.UserServer
SimParams["lastname"] = theUser.SurName;
SimParams["agent_id"] = theUser.ID.ToString();
SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode);
- SimParams["startpos_x"] = theUser.CurrentAgent.CurrentPos.X.ToString();
- SimParams["startpos_y"] = theUser.CurrentAgent.CurrentPos.Y.ToString();
- SimParams["startpos_z"] = theUser.CurrentAgent.CurrentPos.Z.ToString();
- SimParams["regionhandle"] = theUser.CurrentAgent.CurrentHandle.ToString();
+ SimParams["startpos_x"] = theUser.CurrentAgent.Position.X.ToString();
+ SimParams["startpos_y"] = theUser.CurrentAgent.Position.Y.ToString();
+ SimParams["startpos_z"] = theUser.CurrentAgent.Position.Z.ToString();
+ SimParams["regionhandle"] = theUser.CurrentAgent.Handle.ToString();
SimParams["caps_path"] = capsPath;
ArrayList SendParams = new ArrayList();
SendParams.Add(SimParams);
@@ -285,8 +285,8 @@ namespace OpenSim.Grid.UserServer
if (handlerUserLoggedInAtLocation != null)
{
m_log.Info("[LOGIN]: Letting other objects know about login");
- handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.CurrentRegion,
- theUser.CurrentAgent.CurrentHandle, theUser.CurrentAgent.CurrentPos.X, theUser.CurrentAgent.CurrentPos.Y, theUser.CurrentAgent.CurrentPos.Z,
+ handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.Region,
+ theUser.CurrentAgent.Handle, theUser.CurrentAgent.Position.X, theUser.CurrentAgent.Position.Y, theUser.CurrentAgent.Position.Z,
theUser.FirstName, theUser.SurName);
}
}
--
cgit v1.1