aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
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/Grid/UserServer
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/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs38
1 files changed, 19 insertions, 19 deletions
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 }