diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Communications/Local/LocalLoginService.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalLoginService.cs | 12 |
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; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Text.RegularExpressions; | 32 | using System.Text.RegularExpressions; |
33 | using libsecondlife; | 33 | using OpenMetaverse; |
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications; | 36 | using 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 | } |