From a5f08b430d644c7a4274db9fff3db0c63a6a7857 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sat, 17 May 2008 00:06:35 +0000 Subject: Formatting cleanup. --- .../AssetTransaction/AgentAssetsTransactions.cs | 2 +- .../Region/Environment/Scenes/Scene.Inventory.cs | 58 +++++++++++----------- .../Scenes/SceneObjectGroup.Inventory.cs | 10 ++-- .../Region/Environment/Scenes/SceneObjectGroup.cs | 2 +- .../Scenes/SceneObjectPart.Inventory.cs | 22 ++++---- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 +-- 6 files changed, 50 insertions(+), 50 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs index b401cdb..81e19e6 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs @@ -381,7 +381,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction item.Folder = InventFolder; item.BasePermissions = 0x7fffffff; item.CurrentPermissions = 0x7fffffff; - item.EveryOnePermissions=0; + item.EveryOnePermissions=0; item.NextPermissions = nextPerm; item.Flags = (uint) wearableType; diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 0447631..88f0cb4 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -951,7 +951,7 @@ namespace OpenSim.Region.Environment.Scenes /// public void RezScript(IClientAPI remoteClient, InventoryItemBase itemBase, LLUUID transactionID, uint localID) { - LLUUID itemID=itemBase.ID; + LLUUID itemID=itemBase.ID; LLUUID copyID = LLUUID.Random(); if (itemID != LLUUID.Zero) @@ -1001,38 +1001,38 @@ namespace OpenSim.Region.Environment.Scenes } else // If the itemID is zero then the script has been rezzed directly in an object's inventory { - SceneObjectPart part=GetSceneObjectPart(itemBase.Folder); - if(part == null) - return; + SceneObjectPart part=GetSceneObjectPart(itemBase.Folder); + if (part == null) + return; AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.InvType, (sbyte)itemBase.AssetType, Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}")); AssetCache.AddAsset(asset); - TaskInventoryItem taskItem=new TaskInventoryItem(); - - taskItem.ResetIDs(itemBase.Folder); - taskItem.ParentID = itemBase.Folder; - taskItem.CreationDate = (uint)itemBase.CreationDate; - taskItem.Name = itemBase.Name; - taskItem.Description = itemBase.Description; - taskItem.Type = itemBase.AssetType; - taskItem.InvType = itemBase.InvType; - taskItem.OwnerID = itemBase.Owner; - taskItem.CreatorID = itemBase.Creator; - taskItem.BaseMask = itemBase.BasePermissions; - taskItem.OwnerMask = itemBase.CurrentPermissions; - taskItem.EveryoneMask = itemBase.EveryOnePermissions; - taskItem.NextOwnerMask = itemBase.NextPermissions; - taskItem.GroupID = itemBase.GroupID; - taskItem.GroupMask = 0; - taskItem.Flags = itemBase.Flags; - taskItem.PermsGranter = LLUUID.Zero; - taskItem.PermsMask = 0; - taskItem.AssetID = asset.ID; - - part.AddInventoryItem(taskItem); - part.GetProperties(remoteClient); - part.StartScript(taskItem); + TaskInventoryItem taskItem=new TaskInventoryItem(); + + taskItem.ResetIDs(itemBase.Folder); + taskItem.ParentID = itemBase.Folder; + taskItem.CreationDate = (uint)itemBase.CreationDate; + taskItem.Name = itemBase.Name; + taskItem.Description = itemBase.Description; + taskItem.Type = itemBase.AssetType; + taskItem.InvType = itemBase.InvType; + taskItem.OwnerID = itemBase.Owner; + taskItem.CreatorID = itemBase.Creator; + taskItem.BaseMask = itemBase.BasePermissions; + taskItem.OwnerMask = itemBase.CurrentPermissions; + taskItem.EveryoneMask = itemBase.EveryOnePermissions; + taskItem.NextOwnerMask = itemBase.NextPermissions; + taskItem.GroupID = itemBase.GroupID; + taskItem.GroupMask = 0; + taskItem.Flags = itemBase.Flags; + taskItem.PermsGranter = LLUUID.Zero; + taskItem.PermsMask = 0; + taskItem.AssetID = asset.ID; + + part.AddInventoryItem(taskItem); + part.GetProperties(remoteClient); + part.StartScript(taskItem); } } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index b24e0de..c26ff51 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs @@ -205,11 +205,11 @@ namespace OpenSim.Region.Environment.Scenes // FIXME: ignoring group permissions for now as they aren't stored in item taskItem.EveryoneMask = item.EveryOnePermissions; taskItem.NextOwnerMask = item.NextPermissions; - taskItem.Flags = item.Flags; - // TODO: These are pending addition of those fields to TaskInventoryItem -// taskItem.SalePrice = item.SalePrice; -// taskItem.SaleType = item.SaleType; - taskItem.CreationDate = (uint)item.CreationDate; + taskItem.Flags = item.Flags; + // TODO: These are pending addition of those fields to TaskInventoryItem +// taskItem.SalePrice = item.SalePrice; +// taskItem.SaleType = item.SaleType; + taskItem.CreationDate = (uint)item.CreationDate; part.AddInventoryItem(taskItem); diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 7f26f35..635a989 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -1927,7 +1927,7 @@ namespace OpenSim.Region.Environment.Scenes /// public void GetProperties(IClientAPI client) { - m_rootPart.GetProperties(client); + m_rootPart.GetProperties(client); } /// diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 0444685..a9dc9cf 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private string m_inventoryFileName = String.Empty; - private int m_inventoryFileNameSerial = 0; + private int m_inventoryFileNameSerial = 0; /// /// Exposing this is not particularly good, but it's one of the least evils at the moment to see @@ -445,16 +445,16 @@ namespace OpenSim.Region.Environment.Scenes return -1; } - public string GetInventoryFileName() - { - if(m_inventoryFileName == String.Empty) - m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; - if(m_inventoryFileNameSerial < m_inventorySerial) - { - m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; - } - return m_inventoryFileName; - } + public string GetInventoryFileName() + { + if (m_inventoryFileName == String.Empty) + m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; + if (m_inventoryFileNameSerial < m_inventorySerial) + { + m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; + } + return m_inventoryFileName; + } /// /// Return the name with which a client can request a xfer of this prim's inventory metadata diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 7eaab40..6977083 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -1451,15 +1451,15 @@ namespace OpenSim.Region.Environment.Scenes /// /// public void SendInitialData() - { + { // justincc - very temporary fix for the fact that m_apperance appears to be null at this point in grid mode LLObject.TextureEntry texture = AvatarAppearance.GetDefaultTexture(); if (null != m_appearance) texture = m_appearance.Texture; - + m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, m_pos, texture.ToBytes(), m_parentID); - + if (!m_isChildAgent) { m_scene.InformClientOfNeighbours(this); -- cgit v1.1