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/Grid/InventoryServer/GridInventoryService.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/Grid/InventoryServer/GridInventoryService.cs')
-rw-r--r-- | OpenSim/Grid/InventoryServer/GridInventoryService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index e4d43d4..4d58775 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs | |||
@@ -32,7 +32,7 @@ using System.Reflection; | |||
32 | using System.Threading; | 32 | using System.Threading; |
33 | using System.Net; | 33 | using System.Net; |
34 | 34 | ||
35 | using libsecondlife; | 35 | using OpenMetaverse; |
36 | using log4net; | 36 | using log4net; |
37 | using Nwc.XmlRpc; | 37 | using Nwc.XmlRpc; |
38 | 38 | ||
@@ -147,7 +147,7 @@ namespace OpenSim.Grid.InventoryServer | |||
147 | } | 147 | } |
148 | } | 148 | } |
149 | 149 | ||
150 | public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) | 150 | public override void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback) |
151 | { | 151 | { |
152 | } | 152 | } |
153 | 153 | ||
@@ -158,7 +158,7 @@ namespace OpenSim.Grid.InventoryServer | |||
158 | /// <returns>The user's inventory. If an inventory cannot be found then an empty collection is returned.</returns> | 158 | /// <returns>The user's inventory. If an inventory cannot be found then an empty collection is returned.</returns> |
159 | public InventoryCollection GetUserInventory(Guid rawUserID) | 159 | public InventoryCollection GetUserInventory(Guid rawUserID) |
160 | { | 160 | { |
161 | LLUUID userID = new LLUUID(rawUserID); | 161 | UUID userID = new UUID(rawUserID); |
162 | 162 | ||
163 | m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID); | 163 | m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID); |
164 | 164 | ||
@@ -216,7 +216,7 @@ namespace OpenSim.Grid.InventoryServer | |||
216 | /// <returns></returns> | 216 | /// <returns></returns> |
217 | public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID) | 217 | public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID) |
218 | { | 218 | { |
219 | LLUUID userID = new LLUUID(rawUserID); | 219 | UUID userID = new UUID(rawUserID); |
220 | return GetInventorySkeleton(userID); | 220 | return GetInventorySkeleton(userID); |
221 | } | 221 | } |
222 | 222 | ||
@@ -227,7 +227,7 @@ namespace OpenSim.Grid.InventoryServer | |||
227 | /// <returns></returns> | 227 | /// <returns></returns> |
228 | public bool CreateUsersInventory(Guid rawUserID) | 228 | public bool CreateUsersInventory(Guid rawUserID) |
229 | { | 229 | { |
230 | LLUUID userID = new LLUUID(rawUserID); | 230 | UUID userID = new UUID(rawUserID); |
231 | 231 | ||
232 | m_log.InfoFormat("[GRID AGENT INVENTORY]: Creating new set of inventory folders for user {0}", userID); | 232 | m_log.InfoFormat("[GRID AGENT INVENTORY]: Creating new set of inventory folders for user {0}", userID); |
233 | 233 | ||