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/LocalInventoryService.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 'OpenSim/Region/Communications/Local/LocalInventoryService.cs')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalInventoryService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index 1d8ea53..5cb33cc 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | using log4net; | 31 | using log4net; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Communications; | 33 | using OpenSim.Framework.Communications; |
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Communications.Local | |||
44 | private static readonly ILog m_log | 44 | private static readonly ILog m_log |
45 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) | 47 | public override void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback) |
48 | { | 48 | { |
49 | m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID); | 49 | m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID); |
50 | 50 | ||
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Communications.Local | |||
60 | // Need to retrieve the root folder on the first pass | 60 | // Need to retrieve the root folder on the first pass |
61 | foreach (InventoryFolderBase folder in skeletonFolders) | 61 | foreach (InventoryFolderBase folder in skeletonFolders) |
62 | { | 62 | { |
63 | if (folder.ParentID == LLUUID.Zero) | 63 | if (folder.ParentID == UUID.Zero) |
64 | { | 64 | { |
65 | rootFolder = new InventoryFolderImpl(folder); | 65 | rootFolder = new InventoryFolderImpl(folder); |
66 | folders.Add(rootFolder); | 66 | folders.Add(rootFolder); |
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local | |||
88 | callback(folders, items); | 88 | callback(folders, items); |
89 | } | 89 | } |
90 | 90 | ||
91 | public override bool HasInventoryForUser(LLUUID userID) | 91 | public override bool HasInventoryForUser(UUID userID) |
92 | { | 92 | { |
93 | InventoryFolderBase root = RequestRootFolder(userID); | 93 | InventoryFolderBase root = RequestRootFolder(userID); |
94 | if (root == null) | 94 | if (root == null) |