aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJeff Ames2008-05-14 05:33:32 +0000
committerJeff Ames2008-05-14 05:33:32 +0000
commit6a1b787436cc59043a26a296781e7a7b5ea0c67b (patch)
tree10f55a7b0abfdc47f103d40f13f3cae530c13581 /OpenSim/Region/Environment/Scenes
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.zip
opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.gz
opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.bz2
opensim-SC_OLD-6a1b787436cc59043a26a296781e7a7b5ea0c67b.tar.xz
More formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs3
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index efd258d..82a6b94 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -815,7 +815,8 @@ namespace OpenSim.Region.Environment.Scenes
815 agentItem.Folder = folderId; 815 agentItem.Folder = folderId;
816 agentItem.EveryOnePermissions = taskItem.EveryoneMask; 816 agentItem.EveryOnePermissions = taskItem.EveryoneMask;
817 817
818 if (remoteClient.AgentId != taskItem.OwnerID) { 818 if (remoteClient.AgentId != taskItem.OwnerID)
819 {
819 agentItem.BasePermissions = taskItem.NextOwnerMask; 820 agentItem.BasePermissions = taskItem.NextOwnerMask;
820 agentItem.CurrentPermissions = taskItem.NextOwnerMask; 821 agentItem.CurrentPermissions = taskItem.NextOwnerMask;
821 agentItem.NextPermissions = taskItem.NextOwnerMask; 822 agentItem.NextPermissions = taskItem.NextOwnerMask;
@@ -1038,7 +1039,8 @@ namespace OpenSim.Region.Environment.Scenes
1038 item.InvType = asset.InvType; 1039 item.InvType = asset.InvType;
1039 item.Folder = DeRezPacket.AgentBlock.DestinationID; 1040 item.Folder = DeRezPacket.AgentBlock.DestinationID;
1040 item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask; 1041 item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
1041 if (remoteClient.AgentId != objectGroup.RootPart.OwnerID) { 1042 if (remoteClient.AgentId != objectGroup.RootPart.OwnerID)
1043 {
1042 item.BasePermissions = objectGroup.RootPart.NextOwnerMask; 1044 item.BasePermissions = objectGroup.RootPart.NextOwnerMask;
1043 item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask; 1045 item.CurrentPermissions = objectGroup.RootPart.NextOwnerMask;
1044 item.NextPermissions = objectGroup.RootPart.NextOwnerMask; 1046 item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 88537e9..dacd609 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -195,7 +195,8 @@ namespace OpenSim.Region.Environment.Scenes
195 public int transactiontype; 195 public int transactiontype;
196 public string description; 196 public string description;
197 197
198 public MoneyTransferArgs(LLUUID asender, LLUUID areceiver, int aamount, int atransactiontype, string adescription) { 198 public MoneyTransferArgs(LLUUID asender, LLUUID areceiver, int aamount, int atransactiontype, string adescription)
199 {
199 sender = asender; 200 sender = asender;
200 receiver = areceiver; 201 receiver = areceiver;
201 amount = aamount; 202 amount = aamount;