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

* Removing dead comments

zircon^2
Adam Frisby 2007-06-05 12:22:42 +00:00
parent 7347f146c6
commit 891b92a780
12 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/OpenSim.Physics/OdePlugin/OdePlugin.cs
View File

@ -104,7 +104,6 @@ namespace OpenSim.Physics.OdePlugin
// This function blatantly ripped off from BoxStack.cs // This function blatantly ripped off from BoxStack.cs
static private void near(IntPtr space, IntPtr g1, IntPtr g2) static private void near(IntPtr space, IntPtr g1, IntPtr g2)
{ {
//Console.WriteLine("collision callback");
IntPtr b1 = d.GeomGetBody(g1); IntPtr b1 = d.GeomGetBody(g1);
IntPtr b2 = d.GeomGetBody(g2); IntPtr b2 = d.GeomGetBody(g2);
if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact)) if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))

1
OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs
View File

@ -90,7 +90,6 @@ namespace OpenSim
asset = new AssetBase(); asset = new AssetBase();
asset.FullID = assetID; asset.FullID = assetID;
// Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated());
asset.Type = pack.AssetBlock.Type; asset.Type = pack.AssetBlock.Type;
asset.InvType = asset.Type; asset.InvType = asset.Type;
asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000"); asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000");

4
OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
View File

@ -80,7 +80,6 @@ namespace OpenSim.Assets
{ {
try try
{ {
//Console.WriteLine("Asset cache loop");
this.ProcessAssetQueue(); this.ProcessAssetQueue();
this.ProcessTextureQueue(); this.ProcessTextureQueue();
Thread.Sleep(500); Thread.Sleep(500);
@ -203,7 +202,6 @@ namespace OpenSim.Assets
req.RequestUser.OutPacket(im); req.RequestUser.OutPacket(im);
req.PacketCounter++; req.PacketCounter++;
//req.ImageInfo.l= time; //req.ImageInfo.l= time;
//System.Console.WriteLine("sent texture: "+req.image_info.FullID);
} }
else else
{ {
@ -218,7 +216,6 @@ namespace OpenSim.Assets
req.RequestUser.OutPacket(im); req.RequestUser.OutPacket(im);
req.PacketCounter++; req.PacketCounter++;
//req.ImageInfo.last_used = time; //req.ImageInfo.last_used = time;
//System.Console.WriteLine("sent first packet of texture:
} }
} }
else else
@ -235,7 +232,6 @@ namespace OpenSim.Assets
req.RequestUser.OutPacket(im); req.RequestUser.OutPacket(im);
req.PacketCounter++; req.PacketCounter++;
//req.ImageInfo.last_used = time; //req.ImageInfo.last_used = time;
//System.Console.WriteLine("sent a packet of texture: "+req.image_info.FullID);
} }
} }
} }

1
OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
View File

@ -81,7 +81,6 @@ namespace OpenSim
this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname; this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;
this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname; this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;
this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos; this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
// Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
} }
} }

1
OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
View File

@ -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.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
agentData.child = false; agentData.child = false;
// Console.WriteLine("expect user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
} }

2
OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
View File

@ -58,7 +58,6 @@ namespace OpenSim.CAPS
private string PostLogin(string requestBody, string path, string param) private string PostLogin(string requestBody, string path, string param)
{ {
string responseString; string responseString;
// Console.WriteLine(requestBody);
if (requestBody == passWord) if (requestBody == passWord)
{ {
responseString = "<p> Login Successful </p>"; responseString = "<p> Login Successful </p>";
@ -86,7 +85,6 @@ namespace OpenSim.CAPS
string delimStr2 = "="; string delimStr2 = "=";
char[] delimiter2 = delimStr2.ToCharArray(); char[] delimiter2 = delimStr2.ToCharArray();
//Console.WriteLine(requestBody);
comp = requestBody.Split(delimiter); comp = requestBody.Split(delimiter);
passw = comp[3].Split(delimiter2); passw = comp[3].Split(delimiter2);
if (passw[1] == passWord) // check admin password is correct if (passw[1] == passWord) // check admin password is correct

3
OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
View File

@ -71,7 +71,6 @@ namespace OpenSim
protected bool AgentTextureCached(ClientView simclient, Packet packet) protected bool AgentTextureCached(ClientView simclient, Packet packet)
{ {
// Console.WriteLine(packet.ToString());
AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet;
AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket(); AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();
cachedresp.AgentData.AgentID = this.AgentID; cachedresp.AgentData.AgentID = this.AgentID;
@ -162,8 +161,6 @@ namespace OpenSim
mbReply.Data[j].X = System.Convert.ToUInt16(mp["x"]); mbReply.Data[j].X = System.Convert.ToUInt16(mp["x"]);
mbReply.Data[j].Y = System.Convert.ToUInt16(mp["y"]); 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); this.OutPacket(mbReply);
} }
} }

16
OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
View File

@ -171,7 +171,6 @@ namespace OpenSim
#region New Event System - Objects/Prims #region New Event System - Objects/Prims
case PacketType.ObjectLink: case PacketType.ObjectLink:
// OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
ObjectLinkPacket link = (ObjectLinkPacket)Pack; ObjectLinkPacket link = (ObjectLinkPacket)Pack;
uint parentprimid = 0; uint parentprimid = 0;
List<uint> childrenprims = new List<uint>(); List<uint> childrenprims = new List<uint>();
@ -227,7 +226,6 @@ namespace OpenSim
} }
break; break;
case PacketType.TransferRequest: case PacketType.TransferRequest:
//Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");
TransferRequestPacket transfer = (TransferRequestPacket)Pack; TransferRequestPacket transfer = (TransferRequestPacket)Pack;
m_assetCache.AddAssetRequest(this, transfer); m_assetCache.AddAssetRequest(this, transfer);
break; break;
@ -236,7 +234,6 @@ namespace OpenSim
this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID)); this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));
break; break;
case PacketType.RequestXfer: case PacketType.RequestXfer:
//Console.WriteLine(Pack.ToString());
break; break;
case PacketType.SendXferPacket: case PacketType.SendXferPacket:
this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack); this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);
@ -244,10 +241,8 @@ namespace OpenSim
case PacketType.CreateInventoryFolder: case PacketType.CreateInventoryFolder:
CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID); m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
//Console.WriteLine(Pack.ToString());
break; break;
case PacketType.CreateInventoryItem: case PacketType.CreateInventoryItem:
//Console.WriteLine(Pack.ToString());
CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack; CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;
if (createItem.InventoryBlock.TransactionID != LLUUID.Zero) if (createItem.InventoryBlock.TransactionID != LLUUID.Zero)
{ {
@ -255,12 +250,10 @@ namespace OpenSim
} }
else else
{ {
// Console.Write(Pack.ToString());
this.CreateInventoryItem(createItem); this.CreateInventoryItem(createItem);
} }
break; break;
case PacketType.FetchInventory: case PacketType.FetchInventory:
//Console.WriteLine("fetch item packet");
FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack; FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack;
m_inventoryCache.FetchInventory(this, FetchInventory); m_inventoryCache.FetchInventory(this, FetchInventory);
break; break;
@ -270,7 +263,6 @@ namespace OpenSim
break; break;
case PacketType.UpdateInventoryItem: case PacketType.UpdateInventoryItem:
UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
//Console.WriteLine(Pack.ToString());
for (int i = 0; i < update.InventoryData.Length; i++) for (int i = 0; i < update.InventoryData.Length; i++)
{ {
if (update.InventoryData[i].TransactionID != LLUUID.Zero) 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)); AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));
if (asset != null) 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); m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
} }
else else
@ -286,12 +277,11 @@ namespace OpenSim
asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
if (asset != null) if (asset != null)
{ {
//Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");
m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
} }
else else
{ {
//Console.WriteLine("trying to update inventory item, but asset is null");
} }
} }
} }
@ -302,7 +292,6 @@ namespace OpenSim
} }
break; break;
case PacketType.RequestTaskInventory: case PacketType.RequestTaskInventory:
// Console.WriteLine(Pack.ToString());
RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket(); ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
bool foundent = false; bool foundent = false;
@ -322,7 +311,6 @@ namespace OpenSim
} }
break; break;
case PacketType.UpdateTaskInventory: case PacketType.UpdateTaskInventory:
// Console.WriteLine(Pack.ToString());
UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID); AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
if (myinventory != null) if (myinventory != null)
@ -461,10 +449,8 @@ namespace OpenSim
#region unimplemented handlers #region unimplemented handlers
case PacketType.AgentIsNowWearing: case PacketType.AgentIsNowWearing:
// AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
//Console.WriteLine(Pack.ToString());
break; break;
case PacketType.ObjectScale: case PacketType.ObjectScale:
//OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
break; break;
case PacketType.MoneyBalanceRequest: case PacketType.MoneyBalanceRequest:
//This need to be actually done and not thrown back with fake info //This need to be actually done and not thrown back with fake info

1
OpenSim/OpenSim.RegionServer/ClientView.cs
View File

@ -124,7 +124,6 @@ namespace OpenSim
if (this.startpos.Z < (m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround)) 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; 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 else
{ {

3
OpenSim/OpenSim.RegionServer/ClientViewBase.cs
View File

@ -46,7 +46,6 @@ namespace OpenSim
// Keep track of when this packet was sent out // Keep track of when this packet was sent out
Pack.TickCount = Environment.TickCount; Pack.TickCount = Environment.TickCount;
//Console.WriteLine("OUT: " + Pack.Type.ToString());
if (!Pack.Header.Resent) if (!Pack.Header.Resent)
{ {
@ -251,8 +250,6 @@ namespace OpenSim
return; return;
} }
//OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck");
int i = 0; int i = 0;
PacketAckPacket acks = new PacketAckPacket(); PacketAckPacket acks = new PacketAckPacket();

1
OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
View File

@ -28,7 +28,6 @@ namespace OpenSim.world
if ( nod.Attributes["name"] != null) if ( nod.Attributes["name"] != null)
{ {
//Console.WriteLine("'" + nod.Attributes["name"].Value + "' - '" + nod.InnerText + "'");
AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText); AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
} }

1
OpenSim/OpenSim.RegionServer/world/Primitive.cs
View File

@ -489,7 +489,6 @@ namespace OpenSim.world
ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock(); ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
//dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry; //dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry;
dat.TextureEntry = new byte[0]; 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 % 256);
bytes[i++] = (byte)((ID >> 8) % 256); bytes[i++] = (byte)((ID >> 8) % 256);
bytes[i++] = (byte)((ID >> 16) % 256); bytes[i++] = (byte)((ID >> 16) % 256);