aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs6
3 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 8aa70c9..160d57e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1791,7 +1791,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1791 bulkUpdate.AgentData.TransactionID = transactionId; 1791 bulkUpdate.AgentData.TransactionID = transactionId;
1792 bulkUpdate.FolderData = folderDataBlocks.ToArray(); 1792 bulkUpdate.FolderData = folderDataBlocks.ToArray();
1793 1793
1794 Console.WriteLine("SendBulkUpdateInventory :" + bulkUpdate); 1794 //Console.WriteLine("SendBulkUpdateInventory :" + bulkUpdate);
1795 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); 1795 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
1796 } 1796 }
1797 } 1797 }
@@ -1834,7 +1834,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1834 items.RemoveAt(items.Count - 1); 1834 items.RemoveAt(items.Count - 1);
1835 } 1835 }
1836 1836
1837 Console.WriteLine("SendBulkUpdateInventoryRecursive :" + bulkUpdate); 1837 //Console.WriteLine("SendBulkUpdateInventoryRecursive :" + bulkUpdate);
1838 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); 1838 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
1839 1839
1840 folderDataBlocks = new List<BulkUpdateInventoryPacket.FolderDataBlock>(); 1840 folderDataBlocks = new List<BulkUpdateInventoryPacket.FolderDataBlock>();
@@ -2525,7 +2525,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2525 return; 2525 return;
2526 2526
2527 ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach); 2527 ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach);
2528 Console.WriteLine("Attach object!");
2529 // TODO: don't create new blocks if recycling an old packet 2528 // TODO: don't create new blocks if recycling an old packet
2530 attach.AgentData.AgentID = AgentId; 2529 attach.AgentData.AgentID = AgentId;
2531 attach.AgentData.SessionID = m_sessionId; 2530 attach.AgentData.SessionID = m_sessionId;
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index d486da4..7297450 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -1355,8 +1355,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1355 /// <returns></returns> 1355 /// <returns></returns>
1356 private bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID) 1356 private bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID)
1357 { 1357 {
1358 m_log.Debug("[PERMISSIONS]: CanCreateObjectInventory called");
1359
1360 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 1358 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1361 if (m_bypassPermissions) return m_bypassPermissionsValue; 1359 if (m_bypassPermissions) return m_bypassPermissionsValue;
1362 1360
@@ -1375,8 +1373,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1375 /// <returns></returns> 1373 /// <returns></returns>
1376 private bool CanCreateUserInventory(int invType, UUID userID) 1374 private bool CanCreateUserInventory(int invType, UUID userID)
1377 { 1375 {
1378 m_log.Debug("[PERMISSIONS]: CanCreateAvatarInventory called");
1379
1380 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 1376 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1381 if (m_bypassPermissions) return m_bypassPermissionsValue; 1377 if (m_bypassPermissions) return m_bypassPermissionsValue;
1382 1378
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index aa74e01..586fa43 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -169,22 +169,24 @@ namespace OpenSim.Region.Environment.Scenes
169 169
170 if (item != null) 170 if (item != null)
171 { 171 {
172 if ((InventoryType) item.InvType == InventoryType.Notecard) 172 if ((InventoryType)item.InvType == InventoryType.Notecard)
173 { 173 {
174 if (!Permissions.CanEditNotecard(itemID, UUID.Zero, remoteClient.AgentId)) 174 if (!Permissions.CanEditNotecard(itemID, UUID.Zero, remoteClient.AgentId))
175 { 175 {
176 remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false); 176 remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false);
177 return UUID.Zero; 177 return UUID.Zero;
178 } 178 }
179
179 remoteClient.SendAgentAlertMessage("Notecard saved", false); 180 remoteClient.SendAgentAlertMessage("Notecard saved", false);
180 } 181 }
181 else if ((InventoryType) item.InvType == InventoryType.LSL) 182 else if ((InventoryType)item.InvType == InventoryType.LSL)
182 { 183 {
183 if (!Permissions.CanEditScript(itemID, UUID.Zero, remoteClient.AgentId)) 184 if (!Permissions.CanEditScript(itemID, UUID.Zero, remoteClient.AgentId))
184 { 185 {
185 remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false); 186 remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false);
186 return UUID.Zero; 187 return UUID.Zero;
187 } 188 }
189
188 remoteClient.SendAgentAlertMessage("Script saved", false); 190 remoteClient.SendAgentAlertMessage("Script saved", false);
189 } 191 }
190 192