OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: remove some old logging messages

0.6.1-post-fixes
Justin Clarke Casey 2008-12-09 16:16:16 +00:00
parent 04e8d624d6
commit 557567dcf8
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -1791,7 +1791,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
bulkUpdate.AgentData.TransactionID = transactionId; bulkUpdate.AgentData.TransactionID = transactionId;
bulkUpdate.FolderData = folderDataBlocks.ToArray(); bulkUpdate.FolderData = folderDataBlocks.ToArray();
Console.WriteLine("SendBulkUpdateInventory :" + bulkUpdate); //Console.WriteLine("SendBulkUpdateInventory :" + bulkUpdate);
OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
} }
} }
@ -1834,7 +1834,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
items.RemoveAt(items.Count - 1); items.RemoveAt(items.Count - 1);
} }
Console.WriteLine("SendBulkUpdateInventoryRecursive :" + bulkUpdate); //Console.WriteLine("SendBulkUpdateInventoryRecursive :" + bulkUpdate);
OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
folderDataBlocks = new List<BulkUpdateInventoryPacket.FolderDataBlock>(); folderDataBlocks = new List<BulkUpdateInventoryPacket.FolderDataBlock>();
@ -2525,7 +2525,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return; return;
ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach); ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach);
Console.WriteLine("Attach object!");
// TODO: don't create new blocks if recycling an old packet // TODO: don't create new blocks if recycling an old packet
attach.AgentData.AgentID = AgentId; attach.AgentData.AgentID = AgentId;
attach.AgentData.SessionID = m_sessionId; attach.AgentData.SessionID = m_sessionId;

4
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -1355,8 +1355,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
/// <returns></returns> /// <returns></returns>
private bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID) private bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID)
{ {
m_log.Debug("[PERMISSIONS]: CanCreateObjectInventory called");
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
@ -1375,8 +1373,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
/// <returns></returns> /// <returns></returns>
private bool CanCreateUserInventory(int invType, UUID userID) private bool CanCreateUserInventory(int invType, UUID userID)
{ {
m_log.Debug("[PERMISSIONS]: CanCreateAvatarInventory called");
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;

6
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -169,22 +169,24 @@ namespace OpenSim.Region.Environment.Scenes
if (item != null) if (item != null)
{ {
if ((InventoryType) item.InvType == InventoryType.Notecard) if ((InventoryType)item.InvType == InventoryType.Notecard)
{ {
if (!Permissions.CanEditNotecard(itemID, UUID.Zero, remoteClient.AgentId)) if (!Permissions.CanEditNotecard(itemID, UUID.Zero, remoteClient.AgentId))
{ {
remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false); remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false);
return UUID.Zero; return UUID.Zero;
} }
remoteClient.SendAgentAlertMessage("Notecard saved", false); remoteClient.SendAgentAlertMessage("Notecard saved", false);
} }
else if ((InventoryType) item.InvType == InventoryType.LSL) else if ((InventoryType)item.InvType == InventoryType.LSL)
{ {
if (!Permissions.CanEditScript(itemID, UUID.Zero, remoteClient.AgentId)) if (!Permissions.CanEditScript(itemID, UUID.Zero, remoteClient.AgentId))
{ {
remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false); remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false);
return UUID.Zero; return UUID.Zero;
} }
remoteClient.SendAgentAlertMessage("Script saved", false); remoteClient.SendAgentAlertMessage("Script saved", false);
} }