aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorJeff Ames2008-05-17 00:06:35 +0000
committerJeff Ames2008-05-17 00:06:35 +0000
commita5f08b430d644c7a4274db9fff3db0c63a6a7857 (patch)
tree4216400d14b587763167839344d61c0a6f6d8c85 /OpenSim/Region/Environment
parent* Committing patch from mantis 0001297: [PATCH] Fix behavior of child prim in... (diff)
downloadopensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.zip
opensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.gz
opensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.bz2
opensim-SC_OLD-a5f08b430d644c7a4274db9fff3db0c63a6a7857.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs58
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs22
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs6
6 files changed, 50 insertions, 50 deletions
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
381 item.Folder = InventFolder; 381 item.Folder = InventFolder;
382 item.BasePermissions = 0x7fffffff; 382 item.BasePermissions = 0x7fffffff;
383 item.CurrentPermissions = 0x7fffffff; 383 item.CurrentPermissions = 0x7fffffff;
384 item.EveryOnePermissions=0; 384 item.EveryOnePermissions=0;
385 item.NextPermissions = nextPerm; 385 item.NextPermissions = nextPerm;
386 item.Flags = (uint) wearableType; 386 item.Flags = (uint) wearableType;
387 387
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
951 /// <param name="localID"></param> 951 /// <param name="localID"></param>
952 public void RezScript(IClientAPI remoteClient, InventoryItemBase itemBase, LLUUID transactionID, uint localID) 952 public void RezScript(IClientAPI remoteClient, InventoryItemBase itemBase, LLUUID transactionID, uint localID)
953 { 953 {
954 LLUUID itemID=itemBase.ID; 954 LLUUID itemID=itemBase.ID;
955 LLUUID copyID = LLUUID.Random(); 955 LLUUID copyID = LLUUID.Random();
956 956
957 if (itemID != LLUUID.Zero) 957 if (itemID != LLUUID.Zero)
@@ -1001,38 +1001,38 @@ namespace OpenSim.Region.Environment.Scenes
1001 } 1001 }
1002 else // If the itemID is zero then the script has been rezzed directly in an object's inventory 1002 else // If the itemID is zero then the script has been rezzed directly in an object's inventory
1003 { 1003 {
1004 SceneObjectPart part=GetSceneObjectPart(itemBase.Folder); 1004 SceneObjectPart part=GetSceneObjectPart(itemBase.Folder);
1005 if(part == null) 1005 if (part == null)
1006 return; 1006 return;
1007 1007
1008 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}")); 1008 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}"));
1009 AssetCache.AddAsset(asset); 1009 AssetCache.AddAsset(asset);
1010 1010
1011 TaskInventoryItem taskItem=new TaskInventoryItem(); 1011 TaskInventoryItem taskItem=new TaskInventoryItem();
1012 1012
1013 taskItem.ResetIDs(itemBase.Folder); 1013 taskItem.ResetIDs(itemBase.Folder);
1014 taskItem.ParentID = itemBase.Folder; 1014 taskItem.ParentID = itemBase.Folder;
1015 taskItem.CreationDate = (uint)itemBase.CreationDate; 1015 taskItem.CreationDate = (uint)itemBase.CreationDate;
1016 taskItem.Name = itemBase.Name; 1016 taskItem.Name = itemBase.Name;
1017 taskItem.Description = itemBase.Description; 1017 taskItem.Description = itemBase.Description;
1018 taskItem.Type = itemBase.AssetType; 1018 taskItem.Type = itemBase.AssetType;
1019 taskItem.InvType = itemBase.InvType; 1019 taskItem.InvType = itemBase.InvType;
1020 taskItem.OwnerID = itemBase.Owner; 1020 taskItem.OwnerID = itemBase.Owner;
1021 taskItem.CreatorID = itemBase.Creator; 1021 taskItem.CreatorID = itemBase.Creator;
1022 taskItem.BaseMask = itemBase.BasePermissions; 1022 taskItem.BaseMask = itemBase.BasePermissions;
1023 taskItem.OwnerMask = itemBase.CurrentPermissions; 1023 taskItem.OwnerMask = itemBase.CurrentPermissions;
1024 taskItem.EveryoneMask = itemBase.EveryOnePermissions; 1024 taskItem.EveryoneMask = itemBase.EveryOnePermissions;
1025 taskItem.NextOwnerMask = itemBase.NextPermissions; 1025 taskItem.NextOwnerMask = itemBase.NextPermissions;
1026 taskItem.GroupID = itemBase.GroupID; 1026 taskItem.GroupID = itemBase.GroupID;
1027 taskItem.GroupMask = 0; 1027 taskItem.GroupMask = 0;
1028 taskItem.Flags = itemBase.Flags; 1028 taskItem.Flags = itemBase.Flags;
1029 taskItem.PermsGranter = LLUUID.Zero; 1029 taskItem.PermsGranter = LLUUID.Zero;
1030 taskItem.PermsMask = 0; 1030 taskItem.PermsMask = 0;
1031 taskItem.AssetID = asset.ID; 1031 taskItem.AssetID = asset.ID;
1032 1032
1033 part.AddInventoryItem(taskItem); 1033 part.AddInventoryItem(taskItem);
1034 part.GetProperties(remoteClient); 1034 part.GetProperties(remoteClient);
1035 part.StartScript(taskItem); 1035 part.StartScript(taskItem);
1036 } 1036 }
1037 } 1037 }
1038 1038
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
205 // FIXME: ignoring group permissions for now as they aren't stored in item 205 // FIXME: ignoring group permissions for now as they aren't stored in item
206 taskItem.EveryoneMask = item.EveryOnePermissions; 206 taskItem.EveryoneMask = item.EveryOnePermissions;
207 taskItem.NextOwnerMask = item.NextPermissions; 207 taskItem.NextOwnerMask = item.NextPermissions;
208 taskItem.Flags = item.Flags; 208 taskItem.Flags = item.Flags;
209 // TODO: These are pending addition of those fields to TaskInventoryItem 209 // TODO: These are pending addition of those fields to TaskInventoryItem
210// taskItem.SalePrice = item.SalePrice; 210// taskItem.SalePrice = item.SalePrice;
211// taskItem.SaleType = item.SaleType; 211// taskItem.SaleType = item.SaleType;
212 taskItem.CreationDate = (uint)item.CreationDate; 212 taskItem.CreationDate = (uint)item.CreationDate;
213 213
214 part.AddInventoryItem(taskItem); 214 part.AddInventoryItem(taskItem);
215 215
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
1927 /// <param name="client"></param> 1927 /// <param name="client"></param>
1928 public void GetProperties(IClientAPI client) 1928 public void GetProperties(IClientAPI client)
1929 { 1929 {
1930 m_rootPart.GetProperties(client); 1930 m_rootPart.GetProperties(client);
1931 } 1931 }
1932 1932
1933 /// <summary> 1933 /// <summary>
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
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 private string m_inventoryFileName = String.Empty; 44 private string m_inventoryFileName = String.Empty;
45 private int m_inventoryFileNameSerial = 0; 45 private int m_inventoryFileNameSerial = 0;
46 46
47 /// <summary> 47 /// <summary>
48 /// Exposing this is not particularly good, but it's one of the least evils at the moment to see 48 /// 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
445 return -1; 445 return -1;
446 } 446 }
447 447
448 public string GetInventoryFileName() 448 public string GetInventoryFileName()
449 { 449 {
450 if(m_inventoryFileName == String.Empty) 450 if (m_inventoryFileName == String.Empty)
451 m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; 451 m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp";
452 if(m_inventoryFileNameSerial < m_inventorySerial) 452 if (m_inventoryFileNameSerial < m_inventorySerial)
453 { 453 {
454 m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp"; 454 m_inventoryFileName = "inventory_" + LLUUID.Random().ToString() + ".tmp";
455 } 455 }
456 return m_inventoryFileName; 456 return m_inventoryFileName;
457 } 457 }
458 458
459 /// <summary> 459 /// <summary>
460 /// Return the name with which a client can request a xfer of this prim's inventory metadata 460 /// 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
1451 /// 1451 ///
1452 /// </summary> 1452 /// </summary>
1453 public void SendInitialData() 1453 public void SendInitialData()
1454 { 1454 {
1455 // justincc - very temporary fix for the fact that m_apperance appears to be null at this point in grid mode 1455 // justincc - very temporary fix for the fact that m_apperance appears to be null at this point in grid mode
1456 LLObject.TextureEntry texture = AvatarAppearance.GetDefaultTexture(); 1456 LLObject.TextureEntry texture = AvatarAppearance.GetDefaultTexture();
1457 if (null != m_appearance) 1457 if (null != m_appearance)
1458 texture = m_appearance.Texture; 1458 texture = m_appearance.Texture;
1459 1459
1460 m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, 1460 m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId,
1461 m_pos, texture.ToBytes(), m_parentID); 1461 m_pos, texture.ToBytes(), m_parentID);
1462 1462
1463 if (!m_isChildAgent) 1463 if (!m_isChildAgent)
1464 { 1464 {
1465 m_scene.InformClientOfNeighbours(this); 1465 m_scene.InformClientOfNeighbours(this);