aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorSean Dague2008-04-10 14:37:17 +0000
committerSean Dague2008-04-10 14:37:17 +0000
commitef7dfae41c728d10cfe835cb256958c354449f1b (patch)
tree98affd8fd75500ece10eb471ba405709e2d389f4 /OpenSim/Grid/UserServer
parentfurther renaming of properties for clarity (diff)
downloadopensim-SC_OLD-ef7dfae41c728d10cfe835cb256958c354449f1b.zip
opensim-SC_OLD-ef7dfae41c728d10cfe835cb256958c354449f1b.tar.gz
opensim-SC_OLD-ef7dfae41c728d10cfe835cb256958c354449f1b.tar.bz2
opensim-SC_OLD-ef7dfae41c728d10cfe835cb256958c354449f1b.tar.xz
changing UserAgentData to use properties. This caused more
grief than expected, as monodevelop doesn't like to refactor properties of properties.
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs49
1 files changed, 24 insertions, 25 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 141aa3e..ce08ee2 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.CurrentHandle, 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.CurrentHandle, m_config.GridServerURL,
108 m_config.GridSendKey, m_config.GridRecvKey); 108 m_config.GridSendKey, m_config.GridRecvKey);
109 } 109 }
110 else 110 else
@@ -164,25 +164,24 @@ 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.CurrentRegion = SimInfo.UUID;
168 theUser.CurrentAgent.currentHandle = SimInfo.regionHandle; 168 theUser.CurrentAgent.CurrentHandle = 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 theUser.CurrentAgent.currentPos.X = start_x; 170 LLVector3 tmp_v = new LLVector3(start_x, start_y, start_z);
171 theUser.CurrentAgent.currentPos.Y = start_y; 171 theUser.CurrentAgent.CurrentPos = tmp_v;
172 theUser.CurrentAgent.currentPos.Z = start_z;
173 } 172 }
174 // Prepare notification 173 // Prepare notification
175 Hashtable SimParams = new Hashtable(); 174 Hashtable SimParams = new Hashtable();
176 SimParams["session_id"] = theUser.CurrentAgent.sessionID.ToString(); 175 SimParams["session_id"] = theUser.CurrentAgent.SessionID.ToString();
177 SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); 176 SimParams["secure_session_id"] = theUser.CurrentAgent.SecureSessionID.ToString();
178 SimParams["firstname"] = theUser.FirstName; 177 SimParams["firstname"] = theUser.FirstName;
179 SimParams["lastname"] = theUser.SurName; 178 SimParams["lastname"] = theUser.SurName;
180 SimParams["agent_id"] = theUser.ID.ToString(); 179 SimParams["agent_id"] = theUser.ID.ToString();
181 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); 180 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode);
182 SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); 181 SimParams["startpos_x"] = theUser.CurrentAgent.CurrentPos.X.ToString();
183 SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); 182 SimParams["startpos_y"] = theUser.CurrentAgent.CurrentPos.Y.ToString();
184 SimParams["startpos_z"] = theUser.CurrentAgent.currentPos.Z.ToString(); 183 SimParams["startpos_z"] = theUser.CurrentAgent.CurrentPos.Z.ToString();
185 SimParams["regionhandle"] = theUser.CurrentAgent.currentHandle.ToString(); 184 SimParams["regionhandle"] = theUser.CurrentAgent.CurrentHandle.ToString();
186 SimParams["caps_path"] = capsPath; 185 SimParams["caps_path"] = capsPath;
187 ArrayList SendParams = new ArrayList(); 186 ArrayList SendParams = new ArrayList();
188 SendParams.Add(SimParams); 187 SendParams.Add(SimParams);
@@ -206,8 +205,8 @@ namespace OpenSim.Grid.UserServer
206 if (handlerUserLoggedInAtLocation != null) 205 if (handlerUserLoggedInAtLocation != null)
207 { 206 {
208 m_log.Info("[LOGIN]: Letting other objects know about login"); 207 m_log.Info("[LOGIN]: Letting other objects know about login");
209 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, 208 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.CurrentRegion,
210 theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X,theUser.CurrentAgent.currentPos.Y,theUser.CurrentAgent.currentPos.Z, 209 theUser.CurrentAgent.CurrentHandle, theUser.CurrentAgent.CurrentPos.X,theUser.CurrentAgent.CurrentPos.Y,theUser.CurrentAgent.CurrentPos.Z,
211 theUser.FirstName,theUser.SurName); 210 theUser.FirstName,theUser.SurName);
212 } 211 }
213 } 212 }
@@ -259,21 +258,21 @@ namespace OpenSim.Grid.UserServer
259 m_log.Info("[LOGIN]: Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); 258 m_log.Info("[LOGIN]: Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
260 259
261 // Update agent with target sim 260 // Update agent with target sim
262 theUser.CurrentAgent.currentRegion = SimInfo.UUID; 261 theUser.CurrentAgent.CurrentRegion = SimInfo.UUID;
263 theUser.CurrentAgent.currentHandle = SimInfo.regionHandle; 262 theUser.CurrentAgent.CurrentHandle = SimInfo.regionHandle;
264 263
265 // Prepare notification 264 // Prepare notification
266 Hashtable SimParams = new Hashtable(); 265 Hashtable SimParams = new Hashtable();
267 SimParams["session_id"] = theUser.CurrentAgent.sessionID.ToString(); 266 SimParams["session_id"] = theUser.CurrentAgent.SessionID.ToString();
268 SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); 267 SimParams["secure_session_id"] = theUser.CurrentAgent.SecureSessionID.ToString();
269 SimParams["firstname"] = theUser.FirstName; 268 SimParams["firstname"] = theUser.FirstName;
270 SimParams["lastname"] = theUser.SurName; 269 SimParams["lastname"] = theUser.SurName;
271 SimParams["agent_id"] = theUser.ID.ToString(); 270 SimParams["agent_id"] = theUser.ID.ToString();
272 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); 271 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode);
273 SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); 272 SimParams["startpos_x"] = theUser.CurrentAgent.CurrentPos.X.ToString();
274 SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); 273 SimParams["startpos_y"] = theUser.CurrentAgent.CurrentPos.Y.ToString();
275 SimParams["startpos_z"] = theUser.CurrentAgent.currentPos.Z.ToString(); 274 SimParams["startpos_z"] = theUser.CurrentAgent.CurrentPos.Z.ToString();
276 SimParams["regionhandle"] = theUser.CurrentAgent.currentHandle.ToString(); 275 SimParams["regionhandle"] = theUser.CurrentAgent.CurrentHandle.ToString();
277 SimParams["caps_path"] = capsPath; 276 SimParams["caps_path"] = capsPath;
278 ArrayList SendParams = new ArrayList(); 277 ArrayList SendParams = new ArrayList();
279 SendParams.Add(SimParams); 278 SendParams.Add(SimParams);
@@ -286,8 +285,8 @@ namespace OpenSim.Grid.UserServer
286 if (handlerUserLoggedInAtLocation != null) 285 if (handlerUserLoggedInAtLocation != null)
287 { 286 {
288 m_log.Info("[LOGIN]: Letting other objects know about login"); 287 m_log.Info("[LOGIN]: Letting other objects know about login");
289 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, 288 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.CurrentRegion,
290 theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X, theUser.CurrentAgent.currentPos.Y, theUser.CurrentAgent.currentPos.Z, 289 theUser.CurrentAgent.CurrentHandle, theUser.CurrentAgent.CurrentPos.X, theUser.CurrentAgent.CurrentPos.Y, theUser.CurrentAgent.CurrentPos.Z,
291 theUser.FirstName, theUser.SurName); 290 theUser.FirstName, theUser.SurName);
292 } 291 }
293 } 292 }