From 8e01f75784bd7b719a6957de40daf949eb01fcdf Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Mon, 19 Jan 2009 17:11:57 +0000
Subject: * Progressive texture patch + PriorityQueue put into the LLClient
namespace. * Updates LibOMV to r2362
---
.../Region/Environment/Scenes/Scene.Inventory.cs | 137 ++++++++++-----------
1 file changed, 68 insertions(+), 69 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 4db735a..ed299eb 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -31,7 +31,6 @@ using System.Reflection;
using System.Text;
using System.Timers;
using OpenMetaverse;
-using OpenMetaverse.Packets;
using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
@@ -43,12 +42,12 @@ namespace OpenSim.Region.Environment.Scenes
public partial class Scene
{
private static readonly ILog m_log
- = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+ = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
///
/// Allows asynchronous derezzing of objects from the scene into a client's inventory.
///
- protected AsyncSceneObjectGroupDeleter m_asyncSceneObjectDeleter;
+ protected AsyncSceneObjectGroupDeleter m_asyncSceneObjectDeleter;
///
/// Start all the scripts in the scene which should be started.
@@ -61,14 +60,14 @@ namespace OpenSim.Region.Environment.Scenes
{
if (group is SceneObjectGroup)
{
- ((SceneObjectGroup)group).CreateScriptInstances(0, false, DefaultScriptEngine, 0);
+ ((SceneObjectGroup) group).CreateScriptInstances(0, false, DefaultScriptEngine, 0);
}
}
}
public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item)
{
- IMoneyModule money = RequestModuleInterface();
+ IMoneyModule money=RequestModuleInterface();
if (money != null)
{
money.ApplyUploadCharge(agentID);
@@ -146,9 +145,9 @@ namespace OpenSim.Region.Environment.Scenes
else
{
m_log.ErrorFormat(
- "[AGENT INVENTORY]: Could not resolve user {0} for adding an inventory item",
+ "[AGENT INVENTORY]: Could not resolve user {0} for adding an inventory item",
remoteClient.AgentId);
- }
+ }
}
///
@@ -176,7 +175,7 @@ namespace OpenSim.Region.Environment.Scenes
remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false);
return UUID.Zero;
}
-
+
remoteClient.SendAgentAlertMessage("Notecard saved", false);
}
else if ((InventoryType)item.InvType == InventoryType.LSL)
@@ -186,7 +185,7 @@ namespace OpenSim.Region.Environment.Scenes
remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false);
return UUID.Zero;
}
-
+
remoteClient.SendAgentAlertMessage("Script saved", false);
}
@@ -205,10 +204,10 @@ namespace OpenSim.Region.Environment.Scenes
else
{
m_log.ErrorFormat(
- "[AGENT INVENTORY]: Could not resolve user {0} for caps inventory update",
+ "[AGENT INVENTORY]: Could not resolve user {0} for caps inventory update",
remoteClient.AgentId);
- }
-
+ }
+
return UUID.Zero;
}
@@ -284,7 +283,7 @@ namespace OpenSim.Region.Environment.Scenes
{
part.Inventory.RemoveScriptInstance(item.ItemID);
}
-
+
// Update item with new asset
item.AssetID = asset.FullID;
group.UpdateInventoryItem(item);
@@ -336,9 +335,9 @@ namespace OpenSim.Region.Environment.Scenes
/// The name of the updated item
/// The description of the updated item
/// The permissions of the updated item
- /* public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
- UUID itemID, string name, string description,
- uint nextOwnerMask)*/
+/* public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
+ UUID itemID, string name, string description,
+ uint nextOwnerMask)*/
public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
UUID itemID, InventoryItemBase itemUpd)
{
@@ -427,7 +426,7 @@ namespace OpenSim.Region.Environment.Scenes
{
return GiveInventoryItem(recipient, senderId, itemId, UUID.Zero);
}
-
+
///
/// Give an inventory item from one user to another
///
@@ -486,7 +485,7 @@ namespace OpenSim.Region.Environment.Scenes
itemCopy.AssetType = item.AssetType;
itemCopy.InvType = item.InvType;
itemCopy.Folder = recipientFolderId;
-
+
if (Permissions.PropagatePermissions())
{
if (item.InvType == 6)
@@ -558,10 +557,10 @@ namespace OpenSim.Region.Environment.Scenes
m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemId.ToString() + ", no root folder");
return null;
}
-
+
return null;
}
-
+
///
/// Give an entire inventory folder from one user to another. The entire contents (including all descendent
/// folders) is given.
@@ -589,24 +588,24 @@ namespace OpenSim.Region.Environment.Scenes
return null;
}
-
+
if (!senderUserInfo.HasReceivedInventory)
{
m_log.DebugFormat(
"[AGENT INVENTORY]: Could not give inventory folder - have not yet received inventory for {0}",
senderId);
-
+
return null;
}
-
+
InventoryFolderImpl folder = senderUserInfo.RootFolder.FindFolder(folderId);
-
+
if (null == folder)
{
m_log.ErrorFormat(
"[AGENT INVENTORY]: Could not find inventory folder {0} to give", folderId);
- return null;
+ return null;
}
CachedUserInfo recipientUserInfo
@@ -619,30 +618,30 @@ namespace OpenSim.Region.Environment.Scenes
return null;
}
-
+
if (recipientParentFolderId == UUID.Zero)
recipientParentFolderId = recipientUserInfo.RootFolder.ID;
-
+
UUID newFolderId = UUID.Random();
recipientUserInfo.CreateFolder(folder.Name, newFolderId, (ushort)folder.Type, recipientParentFolderId);
-
+
// XXX: Messy - we should really get this back in the CreateFolder call
InventoryFolderImpl copiedFolder = recipientUserInfo.RootFolder.FindFolder(newFolderId);
-
+
// Give all the subfolders
List subFolders = folder.RequestListOfFolderImpls();
foreach (InventoryFolderImpl childFolder in subFolders)
{
GiveInventoryFolder(recipientId, senderId, childFolder.ID, copiedFolder.ID);
- }
-
+ }
+
// Give all the items
List items = folder.RequestListOfItems();
foreach (InventoryItemBase item in items)
{
GiveInventoryItem(recipientId, senderId, item.ID, copiedFolder.ID);
}
-
+
return copiedFolder;
}
@@ -880,7 +879,7 @@ namespace OpenSim.Region.Environment.Scenes
if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
return;
-
+
if (transactionID == UUID.Zero)
{
CachedUserInfo userInfo
@@ -891,7 +890,7 @@ namespace OpenSim.Region.Environment.Scenes
ScenePresence presence;
TryGetAvatar(remoteClient.AgentId, out presence);
byte[] data = null;
-
+
if (invType == 3 && presence != null) // OpenMetaverse.asset.assettype.landmark = 3 - needs to be turned into an enum
{
Vector3 pos = presence.AbsolutePosition;
@@ -990,8 +989,8 @@ namespace OpenSim.Region.Environment.Scenes
{
if (ent is SceneObjectGroup)
{
- if (((SceneObjectGroup)ent).HasChildPrim(localID))
- return (SceneObjectGroup)ent;
+ if (((SceneObjectGroup) ent).HasChildPrim(localID))
+ return (SceneObjectGroup) ent;
}
}
return null;
@@ -1430,7 +1429,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
else // Updating existing item with new perms etc
- {
+ {
IAgentAssetTransactions agentTransactions = this.RequestModuleInterface();
if (agentTransactions != null)
{
@@ -1512,7 +1511,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
else // script has been rezzed directly into a prim's inventory
- {
+ {
SceneObjectPart part = GetSceneObjectPart(itemBase.Folder);
if (part == null)
return;
@@ -1522,10 +1521,10 @@ namespace OpenSim.Region.Environment.Scenes
if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
return;
-
+
if (!Permissions.CanCreateObjectInventory(
- itemBase.InvType, part.UUID, remoteClient.AgentId))
- return;
+ itemBase.InvType, part.UUID, remoteClient.AgentId))
+ return;
AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"));
AssetCache.AddAsset(asset);
@@ -1738,7 +1737,7 @@ namespace OpenSim.Region.Environment.Scenes
grp.UUID,
remoteClient.AgentId);
permissionToDelete = permissionToTake;
-
+
if (permissionToDelete)
{
AddReturn(grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
@@ -1808,7 +1807,7 @@ namespace OpenSim.Region.Environment.Scenes
//
CachedUserInfo userInfo;
- if (action == DeRezAction.Take || action == DeRezAction.TakeCopy ||
+ if (action == DeRezAction.Take || action == DeRezAction.TakeCopy ||
action == DeRezAction.SaveToExistingUserInventoryItem)
{
// Take or take copy require a taker
@@ -1851,18 +1850,18 @@ namespace OpenSim.Region.Environment.Scenes
//
InventoryFolderBase folder = null;
- InventoryItemBase item = null;
+ InventoryItemBase item = null;
if (DeRezAction.SaveToExistingUserInventoryItem == action)
{
item = userInfo.RootFolder.FindItem(
objectGroup.RootPart.FromUserInventoryItemID);
-
+
if (null == item)
{
m_log.DebugFormat(
- "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.",
- objectGroup.Name, objectGroup.UUID);
+ "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.",
+ objectGroup.Name, objectGroup.UUID);
return UUID.Zero;
}
}
@@ -1941,7 +1940,7 @@ namespace OpenSim.Region.Environment.Scenes
item.InvType = (int)InventoryType.Object;
item.Folder = folder.ID;
item.Owner = userInfo.UserProfile.ID;
-
+
}
AssetBase asset = CreateAsset(
@@ -1951,10 +1950,10 @@ namespace OpenSim.Region.Environment.Scenes
Utils.StringToBytes(sceneObjectXml));
AssetCache.AddAsset(asset);
assetID = asset.FullID;
-
+
if (DeRezAction.SaveToExistingUserInventoryItem == action)
- {
- item.AssetID = asset.FullID;
+ {
+ item.AssetID = asset.FullID;
userInfo.UpdateItem(item);
}
else
@@ -1963,8 +1962,8 @@ namespace OpenSim.Region.Environment.Scenes
if (remoteClient != null && (remoteClient.AgentId != objectGroup.RootPart.OwnerID) && Permissions.PropagatePermissions())
{
- uint perms = objectGroup.GetEffectivePermissions();
- uint nextPerms = (perms & 7) << 13;
+ uint perms=objectGroup.GetEffectivePermissions();
+ uint nextPerms=(perms & 7) << 13;
if ((nextPerms & (uint)PermissionMask.Copy) == 0)
perms &= ~(uint)PermissionMask.Copy;
if ((nextPerms & (uint)PermissionMask.Transfer) == 0)
@@ -1997,7 +1996,7 @@ namespace OpenSim.Region.Environment.Scenes
item.AssetType = asset.Type;
userInfo.AddItem(item);
-
+
if (remoteClient != null && item.Owner == remoteClient.AgentId)
{
remoteClient.SendInventoryItemCreateUpdate(item);
@@ -2009,10 +2008,10 @@ namespace OpenSim.Region.Environment.Scenes
{
notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item);
}
- }
+ }
}
}
-
+
return assetID;
}
@@ -2026,11 +2025,11 @@ namespace OpenSim.Region.Environment.Scenes
m_log.InfoFormat("[ATTACHMENT]: Save request for {0} which is unchanged", grp.UUID);
return;
}
-
+
m_log.InfoFormat(
- "[ATTACHMENT]: Updating asset for attachment {0}, attachpoint {1}",
+ "[ATTACHMENT]: Updating asset for attachment {0}, attachpoint {1}",
grp.UUID, grp.GetAttachmentPoint());
-
+
string sceneObjectXml = objectGroup.ToXmlString();
CachedUserInfo userInfo =
@@ -2220,7 +2219,7 @@ namespace OpenSim.Region.Environment.Scenes
Vector3 pos = GetNewRezLocation(
RayStart, RayEnd, RayTargetID, Quaternion.Identity,
- BypassRayCast, bRayEndIsIntersection, true, scale, false);
+ BypassRayCast, bRayEndIsIntersection,true,scale, false);
// Rez object
CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
@@ -2242,20 +2241,20 @@ namespace OpenSim.Region.Environment.Scenes
if (rezAsset != null)
{
UUID itemId = UUID.Zero;
-
+
// If we have permission to copy then link the rezzed object back to the user inventory
// item that it came from. This allows us to enable 'save object to inventory'
if (!Permissions.BypassPermissions())
{
if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == (uint)PermissionMask.Copy)
- {
+ {
itemId = item.ID;
}
}
-
+
string xmlData = Utils.BytesToString(rezAsset.Data);
SceneObjectGroup group = new SceneObjectGroup(itemId, xmlData, true);
-
+
if (!Permissions.CanRezObject(
group.Children.Count, remoteClient.AgentId, pos)
&& !attachment)
@@ -2352,12 +2351,12 @@ namespace OpenSim.Region.Environment.Scenes
group.ClearPartAttachmentData();
}
}
-
+
if (!attachment)
{
// Fire on_rez
group.CreateScriptInstances(0, true, DefaultScriptEngine, 0);
-
+
rootPart.ScheduleFullUpdate();
}
@@ -2501,7 +2500,7 @@ namespace OpenSim.Region.Environment.Scenes
DeRezObject(null, grp.RootPart.LocalId,
grp.RootPart.GroupID, DeRezAction.Return, UUID.Zero);
}
-
+
return true;
}
@@ -2633,7 +2632,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
-
+
m_sceneGraph.DetachSingleAttachmentToInv(itemID, remoteClient);
}
--
cgit v1.1