From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * 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. --- OpenSim/Region/Communications/Local/LocalLoginService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/Communications/Local/LocalLoginService.cs') diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index aeb9ae0..518ba09 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs @@ -30,7 +30,7 @@ using System.Collections; using System.Collections.Generic; using System.Reflection; using System.Text.RegularExpressions; -using libsecondlife; +using OpenMetaverse; using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications; @@ -246,9 +246,9 @@ namespace OpenSim.Region.Communications.Local _login.SecureSession = response.SecureSessionID; _login.CircuitCode = (uint) response.CircuitCode; if (specificStartLocation) - _login.StartPos = new LLVector3(locX, locY, locZ); + _login.StartPos = new Vector3(locX, locY, locZ); else - _login.StartPos = new LLVector3(128, 128, 128); + _login.StartPos = new Vector3(128, 128, 128); _login.CapsPath = capsPath; m_log.InfoFormat( @@ -282,7 +282,7 @@ namespace OpenSim.Region.Communications.Local } // See LoginService - protected override InventoryData GetInventorySkeleton(LLUUID userID) + protected override InventoryData GetInventorySkeleton(UUID userID) { List folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID); @@ -293,12 +293,12 @@ namespace OpenSim.Region.Communications.Local folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID); } - LLUUID rootID = LLUUID.Zero; + UUID rootID = UUID.Zero; ArrayList AgentInventoryArray = new ArrayList(); Hashtable TempHash; foreach (InventoryFolderBase InvFolder in folders) { - if (InvFolder.ParentID == LLUUID.Zero) + if (InvFolder.ParentID == UUID.Zero) { rootID = InvFolder.ID; } -- cgit v1.1