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.
---
OpenSim/Grid/InventoryServer/GridInventoryService.cs | 10 +++++-----
OpenSim/Grid/InventoryServer/Main.cs | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Grid/InventoryServer')
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;
using System.Threading;
using System.Net;
-using libsecondlife;
+using OpenMetaverse;
using log4net;
using Nwc.XmlRpc;
@@ -147,7 +147,7 @@ namespace OpenSim.Grid.InventoryServer
}
}
- public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback)
+ public override void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback)
{
}
@@ -158,7 +158,7 @@ namespace OpenSim.Grid.InventoryServer
/// The user's inventory. If an inventory cannot be found then an empty collection is returned.
public InventoryCollection GetUserInventory(Guid rawUserID)
{
- LLUUID userID = new LLUUID(rawUserID);
+ UUID userID = new UUID(rawUserID);
m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID);
@@ -216,7 +216,7 @@ namespace OpenSim.Grid.InventoryServer
///
public List GetInventorySkeleton(Guid rawUserID)
{
- LLUUID userID = new LLUUID(rawUserID);
+ UUID userID = new UUID(rawUserID);
return GetInventorySkeleton(userID);
}
@@ -227,7 +227,7 @@ namespace OpenSim.Grid.InventoryServer
///
public bool CreateUsersInventory(Guid rawUserID)
{
- LLUUID userID = new LLUUID(rawUserID);
+ UUID userID = new UUID(rawUserID);
m_log.InfoFormat("[GRID AGENT INVENTORY]: Creating new set of inventory folders for user {0}", userID);
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index a77c570..9f40d16 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
using log4net;
using log4net.Config;
using OpenSim.Framework;
@@ -142,7 +142,7 @@ namespace OpenSim.Grid.InventoryServer
switch (cmd)
{
case "add-user":
- m_inventoryService.CreateUsersInventory(LLUUID.Random().UUID);
+ m_inventoryService.CreateUsersInventory(UUID.Random().Guid);
break;
}
}
--
cgit v1.1