From 891b92a780d28e8a18627647a222b48f0695b269 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Tue, 5 Jun 2007 12:22:42 +0000 Subject: [PATCH] * Removing dead comments --- OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs | 1 - OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs | 1 - .../OpenSim.RegionServer/Assets/AssetCache.cs | 4 ---- .../AuthenticateSessionsBase.cs | 1 - .../AuthenticateSessionsRemote.cs | 1 - .../OpenSim.RegionServer/CAPS/AdminWebFront.cs | 2 -- .../ClientView.PacketHandlers.cs | 3 --- .../ClientView.ProcessPackets.cs | 16 +--------------- OpenSim/OpenSim.RegionServer/ClientView.cs | 1 - OpenSim/OpenSim.RegionServer/ClientViewBase.cs | 3 --- .../world/AvatarAnimations.cs | 1 - OpenSim/OpenSim.RegionServer/world/Primitive.cs | 1 - 12 files changed, 1 insertion(+), 34 deletions(-) diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs index 599dea8db5..dbe2bcbd8f 100644 --- a/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs @@ -104,7 +104,6 @@ namespace OpenSim.Physics.OdePlugin // This function blatantly ripped off from BoxStack.cs static private void near(IntPtr space, IntPtr g1, IntPtr g2) { - //Console.WriteLine("collision callback"); IntPtr b1 = d.GeomGetBody(g1); IntPtr b2 = d.GeomGetBody(g2); if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact)) diff --git a/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs index dd2b2a9694..87b0de66e7 100644 --- a/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs +++ b/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs @@ -90,7 +90,6 @@ namespace OpenSim asset = new AssetBase(); asset.FullID = assetID; - // Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated()); asset.Type = pack.AssetBlock.Type; asset.InvType = asset.Type; asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000"); diff --git a/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs index ccebb24f3e..f66fa80e96 100644 --- a/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs +++ b/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs @@ -80,7 +80,6 @@ namespace OpenSim.Assets { try { - //Console.WriteLine("Asset cache loop"); this.ProcessAssetQueue(); this.ProcessTextureQueue(); Thread.Sleep(500); @@ -203,7 +202,6 @@ namespace OpenSim.Assets req.RequestUser.OutPacket(im); req.PacketCounter++; //req.ImageInfo.l= time; - //System.Console.WriteLine("sent texture: "+req.image_info.FullID); } else { @@ -218,7 +216,6 @@ namespace OpenSim.Assets req.RequestUser.OutPacket(im); req.PacketCounter++; //req.ImageInfo.last_used = time; - //System.Console.WriteLine("sent first packet of texture: } } else @@ -235,7 +232,6 @@ namespace OpenSim.Assets req.RequestUser.OutPacket(im); req.PacketCounter++; //req.ImageInfo.last_used = time; - //System.Console.WriteLine("sent a packet of texture: "+req.image_info.FullID); } } } diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs index 99b86d4ff2..76deb75b95 100644 --- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs +++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs @@ -81,7 +81,6 @@ namespace OpenSim this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname; this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname; this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos; - // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z); } } diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs index 0802d75477..387ba0b3ca 100644 --- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs +++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs @@ -34,7 +34,6 @@ namespace OpenSim { agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"])); agentData.child = false; - // Console.WriteLine("expect user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z); } diff --git a/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs index 2299fa431f..78dd132c70 100644 --- a/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs +++ b/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs @@ -58,7 +58,6 @@ namespace OpenSim.CAPS private string PostLogin(string requestBody, string path, string param) { string responseString; -// Console.WriteLine(requestBody); if (requestBody == passWord) { responseString = "

Login Successful

"; @@ -86,7 +85,6 @@ namespace OpenSim.CAPS string delimStr2 = "="; char[] delimiter2 = delimStr2.ToCharArray(); - //Console.WriteLine(requestBody); comp = requestBody.Split(delimiter); passw = comp[3].Split(delimiter2); if (passw[1] == passWord) // check admin password is correct diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs index 9ce86f7c1a..7928817621 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs @@ -71,7 +71,6 @@ namespace OpenSim protected bool AgentTextureCached(ClientView simclient, Packet packet) { - // Console.WriteLine(packet.ToString()); AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket(); cachedresp.AgentData.AgentID = this.AgentID; @@ -162,8 +161,6 @@ namespace OpenSim mbReply.Data[j].X = System.Convert.ToUInt16(mp["x"]); mbReply.Data[j].Y = System.Convert.ToUInt16(mp["y"]); } - //Console.WriteLine("ADAMDEBUG: Queuing MapBlockReply #" + i.ToString() + " Contains " + iii.ToString() + " region(s)"); - //Console.WriteLine(mbReply.ToString()); this.OutPacket(mbReply); } } diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs index 1b3ff361b0..19d222cd4d 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs @@ -171,7 +171,6 @@ namespace OpenSim #region New Event System - Objects/Prims case PacketType.ObjectLink: - // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); ObjectLinkPacket link = (ObjectLinkPacket)Pack; uint parentprimid = 0; List childrenprims = new List(); @@ -227,7 +226,6 @@ namespace OpenSim } break; case PacketType.TransferRequest: - //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request"); TransferRequestPacket transfer = (TransferRequestPacket)Pack; m_assetCache.AddAssetRequest(this, transfer); break; @@ -236,7 +234,6 @@ namespace OpenSim this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID)); break; case PacketType.RequestXfer: - //Console.WriteLine(Pack.ToString()); break; case PacketType.SendXferPacket: this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack); @@ -244,10 +241,8 @@ namespace OpenSim case PacketType.CreateInventoryFolder: CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID); - //Console.WriteLine(Pack.ToString()); break; case PacketType.CreateInventoryItem: - //Console.WriteLine(Pack.ToString()); CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack; if (createItem.InventoryBlock.TransactionID != LLUUID.Zero) { @@ -255,12 +250,10 @@ namespace OpenSim } else { - // Console.Write(Pack.ToString()); this.CreateInventoryItem(createItem); } break; case PacketType.FetchInventory: - //Console.WriteLine("fetch item packet"); FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack; m_inventoryCache.FetchInventory(this, FetchInventory); break; @@ -270,7 +263,6 @@ namespace OpenSim break; case PacketType.UpdateInventoryItem: UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; - //Console.WriteLine(Pack.ToString()); for (int i = 0; i < update.InventoryData.Length; i++) { if (update.InventoryData[i].TransactionID != LLUUID.Zero) @@ -278,7 +270,6 @@ namespace OpenSim AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); if (asset != null) { - // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache"); m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); } else @@ -286,12 +277,11 @@ namespace OpenSim asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); if (asset != null) { - //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache"); m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); } else { - //Console.WriteLine("trying to update inventory item, but asset is null"); + } } } @@ -302,7 +292,6 @@ namespace OpenSim } break; case PacketType.RequestTaskInventory: - // Console.WriteLine(Pack.ToString()); RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket(); bool foundent = false; @@ -322,7 +311,6 @@ namespace OpenSim } break; case PacketType.UpdateTaskInventory: - // Console.WriteLine(Pack.ToString()); UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID); if (myinventory != null) @@ -461,10 +449,8 @@ namespace OpenSim #region unimplemented handlers case PacketType.AgentIsNowWearing: // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; - //Console.WriteLine(Pack.ToString()); break; case PacketType.ObjectScale: - //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString()); break; case PacketType.MoneyBalanceRequest: //This need to be actually done and not thrown back with fake info diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs index 586c9dfc4f..8f7cf58cb3 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.cs @@ -124,7 +124,6 @@ namespace OpenSim if (this.startpos.Z < (m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround)) this.startpos.Z = m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround; - //Console.WriteLine("start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z); } else { diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs index 3cba2438e2..642251c426 100644 --- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs +++ b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs @@ -46,7 +46,6 @@ namespace OpenSim // Keep track of when this packet was sent out Pack.TickCount = Environment.TickCount; - //Console.WriteLine("OUT: " + Pack.Type.ToString()); if (!Pack.Header.Resent) { @@ -251,8 +250,6 @@ namespace OpenSim return; } - //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck"); - int i = 0; PacketAckPacket acks = new PacketAckPacket(); diff --git a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs index 2c1280dcca..9e96a4e1b8 100644 --- a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs +++ b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs @@ -28,7 +28,6 @@ namespace OpenSim.world if ( nod.Attributes["name"] != null) { - //Console.WriteLine("'" + nod.Attributes["name"].Value + "' - '" + nod.InnerText + "'"); AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText); } diff --git a/OpenSim/OpenSim.RegionServer/world/Primitive.cs b/OpenSim/OpenSim.RegionServer/world/Primitive.cs index ed24504cad..63643be8ec 100644 --- a/OpenSim/OpenSim.RegionServer/world/Primitive.cs +++ b/OpenSim/OpenSim.RegionServer/world/Primitive.cs @@ -489,7 +489,6 @@ namespace OpenSim.world ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock(); //dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry; dat.TextureEntry = new byte[0]; - //Console.WriteLine("texture-entry length in improvedterse block is " + this.OurPacket.ObjectData[0].TextureEntry.Length); bytes[i++] = (byte)(ID % 256); bytes[i++] = (byte)((ID >> 8) % 256); bytes[i++] = (byte)((ID >> 16) % 256);