aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local/LocalLoginService.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs12
1 files changed, 6 insertions, 6 deletions
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;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
@@ -246,9 +246,9 @@ namespace OpenSim.Region.Communications.Local
246 _login.SecureSession = response.SecureSessionID; 246 _login.SecureSession = response.SecureSessionID;
247 _login.CircuitCode = (uint) response.CircuitCode; 247 _login.CircuitCode = (uint) response.CircuitCode;
248 if (specificStartLocation) 248 if (specificStartLocation)
249 _login.StartPos = new LLVector3(locX, locY, locZ); 249 _login.StartPos = new Vector3(locX, locY, locZ);
250 else 250 else
251 _login.StartPos = new LLVector3(128, 128, 128); 251 _login.StartPos = new Vector3(128, 128, 128);
252 _login.CapsPath = capsPath; 252 _login.CapsPath = capsPath;
253 253
254 m_log.InfoFormat( 254 m_log.InfoFormat(
@@ -282,7 +282,7 @@ namespace OpenSim.Region.Communications.Local
282 } 282 }
283 283
284 // See LoginService 284 // See LoginService
285 protected override InventoryData GetInventorySkeleton(LLUUID userID) 285 protected override InventoryData GetInventorySkeleton(UUID userID)
286 { 286 {
287 List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID); 287 List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
288 288
@@ -293,12 +293,12 @@ namespace OpenSim.Region.Communications.Local
293 folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID); 293 folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
294 } 294 }
295 295
296 LLUUID rootID = LLUUID.Zero; 296 UUID rootID = UUID.Zero;
297 ArrayList AgentInventoryArray = new ArrayList(); 297 ArrayList AgentInventoryArray = new ArrayList();
298 Hashtable TempHash; 298 Hashtable TempHash;
299 foreach (InventoryFolderBase InvFolder in folders) 299 foreach (InventoryFolderBase InvFolder in folders)
300 { 300 {
301 if (InvFolder.ParentID == LLUUID.Zero) 301 if (InvFolder.ParentID == UUID.Zero)
302 { 302 {
303 rootID = InvFolder.ID; 303 rootID = InvFolder.ID;
304 } 304 }