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/Environment/Scenes/SceneObjectGroup.Inventory.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-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/Environment/Scenes/SceneObjectGroup.Inventory.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index 032d673..c6452f9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
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.Region.Environment.Interfaces; | 33 | using OpenSim.Region.Environment.Interfaces; |
@@ -133,9 +133,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
133 | /// <param name="copyItemID">The item UUID that should be used by the new item.</param> | 133 | /// <param name="copyItemID">The item UUID that should be used by the new item.</param> |
134 | /// <returns></returns> | 134 | /// <returns></returns> |
135 | public bool AddInventoryItem(IClientAPI remoteClient, uint localID, | 135 | public bool AddInventoryItem(IClientAPI remoteClient, uint localID, |
136 | InventoryItemBase item, LLUUID copyItemID) | 136 | InventoryItemBase item, UUID copyItemID) |
137 | { | 137 | { |
138 | LLUUID newItemId = (copyItemID != LLUUID.Zero) ? copyItemID : item.ID; | 138 | UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID; |
139 | 139 | ||
140 | SceneObjectPart part = GetChildPart(localID); | 140 | SceneObjectPart part = GetChildPart(localID); |
141 | if (part != null) | 141 | if (part != null) |
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
183 | /// <param name="primID"></param> | 183 | /// <param name="primID"></param> |
184 | /// <param name="itemID"></param> | 184 | /// <param name="itemID"></param> |
185 | /// <returns>null if the item does not exist</returns> | 185 | /// <returns>null if the item does not exist</returns> |
186 | public TaskInventoryItem GetInventoryItem(uint primID, LLUUID itemID) | 186 | public TaskInventoryItem GetInventoryItem(uint primID, UUID itemID) |
187 | { | 187 | { |
188 | SceneObjectPart part = GetChildPart(primID); | 188 | SceneObjectPart part = GetChildPart(primID); |
189 | if (part != null) | 189 | if (part != null) |
@@ -227,7 +227,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
227 | return false; | 227 | return false; |
228 | } | 228 | } |
229 | 229 | ||
230 | public int RemoveInventoryItem(uint localID, LLUUID itemID) | 230 | public int RemoveInventoryItem(uint localID, UUID itemID) |
231 | { | 231 | { |
232 | SceneObjectPart part = GetChildPart(localID); | 232 | SceneObjectPart part = GetChildPart(localID); |
233 | if (part != null) | 233 | if (part != null) |