aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer/UserLoginService.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Grid/UserServer/UserLoginService.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Grid/UserServer/UserLoginService.cs')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 1f84346..10490a6 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Data; 35using OpenSim.Data;
@@ -39,7 +39,7 @@ using OpenSim.Framework.Communications.Cache;
39 39
40namespace OpenSim.Grid.UserServer 40namespace OpenSim.Grid.UserServer
41{ 41{
42 public delegate void UserLoggedInAtLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, 42 public delegate void UserLoggedInAtLocation(UUID agentID, UUID sessionID, UUID RegionID,
43 ulong regionhandle, float positionX, float positionY, float positionZ, 43 ulong regionhandle, float positionX, float positionY, float positionZ,
44 string firstname, string lastname); 44 string firstname, string lastname);
45 45
@@ -151,7 +151,7 @@ namespace OpenSim.Grid.UserServer
151 int start_z = -1; 151 int start_z = -1;
152 152
153 // use the homeRegionID if it is stored already. If not, use the regionHandle as before 153 // use the homeRegionID if it is stored already. If not, use the regionHandle as before
154 if (theUser.HomeRegionID != LLUUID.Zero) 154 if (theUser.HomeRegionID != UUID.Zero)
155 { 155 {
156 HomeInfo = 156 HomeInfo =
157 RegionProfileData.RequestSimProfileData( 157 RegionProfileData.RequestSimProfileData(
@@ -271,7 +271,7 @@ namespace OpenSim.Grid.UserServer
271 theUser.CurrentAgent.Handle = SimInfo.regionHandle; 271 theUser.CurrentAgent.Handle = SimInfo.regionHandle;
272 if (start_x >= 0 && start_y >= 0 && start_z >= 0) 272 if (start_x >= 0 && start_y >= 0 && start_z >= 0)
273 { 273 {
274 LLVector3 tmp_v = new LLVector3(start_x, start_y, start_z); 274 Vector3 tmp_v = new Vector3(start_x, start_y, start_z);
275 theUser.CurrentAgent.Position = tmp_v; 275 theUser.CurrentAgent.Position = tmp_v;
276 } 276 }
277 // Prepare notification 277 // Prepare notification
@@ -466,7 +466,7 @@ namespace OpenSim.Grid.UserServer
466 } 466 }
467 467
468 // See LoginService 468 // See LoginService
469 protected override InventoryData GetInventorySkeleton(LLUUID userID) 469 protected override InventoryData GetInventorySkeleton(UUID userID)
470 { 470 {
471 m_log.DebugFormat( 471 m_log.DebugFormat(
472 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", 472 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",
@@ -498,7 +498,7 @@ namespace OpenSim.Grid.UserServer
498 498
499 if (folders != null && folders.Count > 0) 499 if (folders != null && folders.Count > 0)
500 { 500 {
501 LLUUID rootID = LLUUID.Zero; 501 UUID rootID = UUID.Zero;
502 ArrayList AgentInventoryArray = new ArrayList(); 502 ArrayList AgentInventoryArray = new ArrayList();
503 Hashtable TempHash; 503 Hashtable TempHash;
504 504
@@ -506,7 +506,7 @@ namespace OpenSim.Grid.UserServer
506 { 506 {
507// m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name); 507// m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name);
508 508
509 if (InvFolder.ParentID == LLUUID.Zero) 509 if (InvFolder.ParentID == UUID.Zero)
510 { 510 {
511 rootID = InvFolder.ID; 511 rootID = InvFolder.ID;
512 } 512 }