From 286802558e063dd6b3997cefba06f277de51b639 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sun, 6 Jan 2008 22:55:45 +0000
Subject: Factor out inventory code in SceneObjectGroup into seperate class. As
was true for the previous update, this might require nant users to re-run
prebuild.[sh|bat]
---
.../Scenes/SceneObjectGroup.Inventory.cs | 136 +++++++++++++++++++++
.../Region/Environment/Scenes/SceneObjectGroup.cs | 97 +--------------
2 files changed, 137 insertions(+), 96 deletions(-)
create mode 100644 OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
(limited to 'OpenSim/Region/Environment')
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
new file mode 100644
index 0000000..046e05b
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -0,0 +1,136 @@
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+
+using System;
+
+using libsecondlife;
+
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+ public partial class SceneObjectGroup : EntityBase
+ {
+ ///
+ ///
+ ///
+ ///
+ ///
+ public bool GetPartInventoryFileName(IClientAPI remoteClient, uint localID)
+ {
+ SceneObjectPart part = GetChildPart(localID);
+ if (part != null)
+ {
+ return part.GetInventoryFileName(remoteClient, localID);
+ }
+ else
+ {
+ MainLog.Instance.Warn(
+ "SCENE",
+ "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory",
+ localID, Name, UUID);
+ }
+ return false;
+ }
+
+ public void RequestInventoryFile(uint localID, IXfer xferManager)
+ {
+ SceneObjectPart part = GetChildPart(localID);
+ if (part != null)
+ {
+ part.RequestInventoryFile(xferManager);
+ }
+ else
+ {
+ MainLog.Instance.Warn(
+ "PRIMINVENTORY",
+ "Couldn't find part {0} in object group {1}, {2} to request inventory data",
+ localID, Name, UUID);
+ }
+ }
+
+ public bool AddInventoryItem(IClientAPI remoteClient, uint localID, InventoryItemBase item)
+ {
+ SceneObjectPart part = GetChildPart(localID);
+ if (part != null)
+ {
+ TaskInventoryItem taskItem = new TaskInventoryItem();
+ taskItem.item_id = item.inventoryID;
+ taskItem.asset_id = item.assetID;
+ taskItem.name = item.inventoryName;
+ taskItem.desc = item.inventoryDescription;
+ taskItem.owner_id = item.avatarID;
+ taskItem.creator_id = item.creatorsID;
+ taskItem.type = TaskInventoryItem.Types[item.assetType];
+ taskItem.inv_type = TaskInventoryItem.Types[item.invType];
+ part.AddInventoryItem(taskItem);
+ return true;
+ }
+ return false;
+ }
+
+ public bool AddInventoryItem(IClientAPI remoteClient, uint localID, InventoryItemBase item, LLUUID copyItemID)
+ {
+ if (copyItemID != LLUUID.Zero)
+ {
+ SceneObjectPart part = GetChildPart(localID);
+ if (part != null)
+ {
+ TaskInventoryItem taskItem = new TaskInventoryItem();
+ taskItem.item_id = copyItemID;
+ taskItem.asset_id = item.assetID;
+ taskItem.name = item.inventoryName;
+ taskItem.desc = item.inventoryDescription;
+ taskItem.owner_id = new LLUUID(item.avatarID.ToString());
+ taskItem.creator_id = new LLUUID(item.creatorsID.ToString());
+ taskItem.type = TaskInventoryItem.Types[item.assetType];
+ taskItem.inv_type = TaskInventoryItem.InvTypes[item.invType];
+ part.AddInventoryItem(taskItem);
+ return true;
+ }
+ }
+ else
+ {
+ return AddInventoryItem(remoteClient, localID, item);
+ }
+ return false;
+ }
+
+ public int RemoveInventoryItem(IClientAPI remoteClient, uint localID, LLUUID itemID)
+ {
+ SceneObjectPart part = GetChildPart(localID);
+ if (part != null)
+ {
+ return part.RemoveInventoryItem(remoteClient, localID, itemID);
+ }
+ return -1;
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index a9b3fe9..e8d12ff 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes
{
public delegate void PrimCountTaintedDelegate();
- public class SceneObjectGroup : EntityBase
+ public partial class SceneObjectGroup : EntityBase
{
private Encoding enc = Encoding.ASCII;
@@ -1138,101 +1138,6 @@ namespace OpenSim.Region.Environment.Scenes
///
///
///
- ///
- ///
- public bool GetPartInventoryFileName(IClientAPI remoteClient, uint localID)
- {
- SceneObjectPart part = GetChildPart(localID);
- if (part != null)
- {
- return part.GetInventoryFileName(remoteClient, localID);
- }
- else
- {
- MainLog.Instance.Warn(
- "SCENE",
- "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory",
- localID, Name, UUID);
- }
- return false;
- }
-
- public void RequestInventoryFile(uint localID, IXfer xferManager)
- {
- SceneObjectPart part = GetChildPart(localID);
- if (part != null)
- {
- part.RequestInventoryFile(xferManager);
- }
- else
- {
- MainLog.Instance.Warn(
- "PRIMINVENTORY",
- "Couldn't find part {0} in object group {1}, {2} to request inventory data",
- localID, Name, UUID);
- }
- }
-
- public bool AddInventoryItem(IClientAPI remoteClient, uint localID, InventoryItemBase item)
- {
- SceneObjectPart part = GetChildPart(localID);
- if (part != null)
- {
- TaskInventoryItem taskItem = new TaskInventoryItem();
- taskItem.item_id = item.inventoryID;
- taskItem.asset_id = item.assetID;
- taskItem.name = item.inventoryName;
- taskItem.desc = item.inventoryDescription;
- taskItem.owner_id = item.avatarID;
- taskItem.creator_id = item.creatorsID;
- taskItem.type = TaskInventoryItem.Types[item.assetType];
- taskItem.inv_type = TaskInventoryItem.Types[item.invType];
- part.AddInventoryItem(taskItem);
- return true;
- }
- return false;
- }
-
- public bool AddInventoryItem(IClientAPI remoteClient, uint localID, InventoryItemBase item, LLUUID copyItemID)
- {
- if (copyItemID != LLUUID.Zero)
- {
- SceneObjectPart part = GetChildPart(localID);
- if (part != null)
- {
- TaskInventoryItem taskItem = new TaskInventoryItem();
- taskItem.item_id = copyItemID;
- taskItem.asset_id = item.assetID;
- taskItem.name = item.inventoryName;
- taskItem.desc = item.inventoryDescription;
- taskItem.owner_id = new LLUUID(item.avatarID.ToString());
- taskItem.creator_id = new LLUUID(item.creatorsID.ToString());
- taskItem.type = TaskInventoryItem.Types[item.assetType];
- taskItem.inv_type = TaskInventoryItem.InvTypes[item.invType];
- part.AddInventoryItem(taskItem);
- return true;
- }
- }
- else
- {
- return AddInventoryItem(remoteClient, localID, item);
- }
- return false;
- }
-
- public int RemoveInventoryItem(IClientAPI remoteClient, uint localID, LLUUID itemID)
- {
- SceneObjectPart part = GetChildPart(localID);
- if (part != null)
- {
- return part.RemoveInventoryItem(remoteClient, localID, itemID);
- }
- return -1;
- }
-
- ///
- ///
- ///
///
///
///
--
cgit v1.1