From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 07:52:41 +0000
Subject: * 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.

---
 .../Region/Environment/Scenes/SceneObjectGroup.Inventory.cs    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs')

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 @@
 
 using System;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
@@ -133,9 +133,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="copyItemID">The item UUID that should be used by the new item.</param>
         /// <returns></returns>
         public bool AddInventoryItem(IClientAPI remoteClient, uint localID,
-                                     InventoryItemBase item, LLUUID copyItemID)
+                                     InventoryItemBase item, UUID copyItemID)
         {
-            LLUUID newItemId = (copyItemID != LLUUID.Zero) ? copyItemID : item.ID;
+            UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID;
 
             SceneObjectPart part = GetChildPart(localID);
             if (part != null)
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="primID"></param>
         /// <param name="itemID"></param>
         /// <returns>null if the item does not exist</returns>
-        public TaskInventoryItem GetInventoryItem(uint primID, LLUUID itemID)
+        public TaskInventoryItem GetInventoryItem(uint primID, UUID itemID)
         {
             SceneObjectPart part = GetChildPart(primID);
             if (part != null)
@@ -227,7 +227,7 @@ namespace OpenSim.Region.Environment.Scenes
             return false;
         }
 
-        public int RemoveInventoryItem(uint localID, LLUUID itemID)
+        public int RemoveInventoryItem(uint localID, UUID itemID)
         {
             SceneObjectPart part = GetChildPart(localID);
             if (part != null)
-- 
cgit v1.1