aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.RegionServer')
-rw-r--r--OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs4
-rw-r--r--OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs2
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs3
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs16
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientViewBase.cs3
-rw-r--r--OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/world/Primitive.cs1
11 files changed, 1 insertions, 33 deletions
diff --git a/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs
index dd2b2a9..87b0de6 100644
--- a/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -90,7 +90,6 @@ namespace OpenSim
90 90
91 asset = new AssetBase(); 91 asset = new AssetBase();
92 asset.FullID = assetID; 92 asset.FullID = assetID;
93 // Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated());
94 asset.Type = pack.AssetBlock.Type; 93 asset.Type = pack.AssetBlock.Type;
95 asset.InvType = asset.Type; 94 asset.InvType = asset.Type;
96 asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000"); 95 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 ccebb24..f66fa80 100644
--- a/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -80,7 +80,6 @@ namespace OpenSim.Assets
80 { 80 {
81 try 81 try
82 { 82 {
83 //Console.WriteLine("Asset cache loop");
84 this.ProcessAssetQueue(); 83 this.ProcessAssetQueue();
85 this.ProcessTextureQueue(); 84 this.ProcessTextureQueue();
86 Thread.Sleep(500); 85 Thread.Sleep(500);
@@ -203,7 +202,6 @@ namespace OpenSim.Assets
203 req.RequestUser.OutPacket(im); 202 req.RequestUser.OutPacket(im);
204 req.PacketCounter++; 203 req.PacketCounter++;
205 //req.ImageInfo.l= time; 204 //req.ImageInfo.l= time;
206 //System.Console.WriteLine("sent texture: "+req.image_info.FullID);
207 } 205 }
208 else 206 else
209 { 207 {
@@ -218,7 +216,6 @@ namespace OpenSim.Assets
218 req.RequestUser.OutPacket(im); 216 req.RequestUser.OutPacket(im);
219 req.PacketCounter++; 217 req.PacketCounter++;
220 //req.ImageInfo.last_used = time; 218 //req.ImageInfo.last_used = time;
221 //System.Console.WriteLine("sent first packet of texture:
222 } 219 }
223 } 220 }
224 else 221 else
@@ -235,7 +232,6 @@ namespace OpenSim.Assets
235 req.RequestUser.OutPacket(im); 232 req.RequestUser.OutPacket(im);
236 req.PacketCounter++; 233 req.PacketCounter++;
237 //req.ImageInfo.last_used = time; 234 //req.ImageInfo.last_used = time;
238 //System.Console.WriteLine("sent a packet of texture: "+req.image_info.FullID);
239 } 235 }
240 } 236 }
241 } 237 }
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index 99b86d4..76deb75 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
@@ -81,7 +81,6 @@ namespace OpenSim
81 this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname; 81 this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;
82 this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname; 82 this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;
83 this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos; 83 this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
84 // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
85 } 84 }
86 } 85 }
87 86
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
index 0802d75..387ba0b 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
@@ -34,7 +34,6 @@ namespace OpenSim
34 { 34 {
35 agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"])); 35 agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
36 agentData.child = false; 36 agentData.child = false;
37 // Console.WriteLine("expect user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
38 37
39 } 38 }
40 39
diff --git a/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
index 2299fa4..78dd132 100644
--- a/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ b/OpenSim/OpenSim.RegionServer/CAPS/AdminWebFront.cs
@@ -58,7 +58,6 @@ namespace OpenSim.CAPS
58 private string PostLogin(string requestBody, string path, string param) 58 private string PostLogin(string requestBody, string path, string param)
59 { 59 {
60 string responseString; 60 string responseString;
61// Console.WriteLine(requestBody);
62 if (requestBody == passWord) 61 if (requestBody == passWord)
63 { 62 {
64 responseString = "<p> Login Successful </p>"; 63 responseString = "<p> Login Successful </p>";
@@ -86,7 +85,6 @@ namespace OpenSim.CAPS
86 string delimStr2 = "="; 85 string delimStr2 = "=";
87 char[] delimiter2 = delimStr2.ToCharArray(); 86 char[] delimiter2 = delimStr2.ToCharArray();
88 87
89 //Console.WriteLine(requestBody);
90 comp = requestBody.Split(delimiter); 88 comp = requestBody.Split(delimiter);
91 passw = comp[3].Split(delimiter2); 89 passw = comp[3].Split(delimiter2);
92 if (passw[1] == passWord) // check admin password is correct 90 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 9ce86f7..7928817 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -71,7 +71,6 @@ namespace OpenSim
71 71
72 protected bool AgentTextureCached(ClientView simclient, Packet packet) 72 protected bool AgentTextureCached(ClientView simclient, Packet packet)
73 { 73 {
74 // Console.WriteLine(packet.ToString());
75 AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet; 74 AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet;
76 AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket(); 75 AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();
77 cachedresp.AgentData.AgentID = this.AgentID; 76 cachedresp.AgentData.AgentID = this.AgentID;
@@ -162,8 +161,6 @@ namespace OpenSim
162 mbReply.Data[j].X = System.Convert.ToUInt16(mp["x"]); 161 mbReply.Data[j].X = System.Convert.ToUInt16(mp["x"]);
163 mbReply.Data[j].Y = System.Convert.ToUInt16(mp["y"]); 162 mbReply.Data[j].Y = System.Convert.ToUInt16(mp["y"]);
164 } 163 }
165 //Console.WriteLine("ADAMDEBUG: Queuing MapBlockReply #" + i.ToString() + " Contains " + iii.ToString() + " region(s)");
166 //Console.WriteLine(mbReply.ToString());
167 this.OutPacket(mbReply); 164 this.OutPacket(mbReply);
168 } 165 }
169 } 166 }
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index 1b3ff36..19d222c 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -171,7 +171,6 @@ namespace OpenSim
171 171
172 #region New Event System - Objects/Prims 172 #region New Event System - Objects/Prims
173 case PacketType.ObjectLink: 173 case PacketType.ObjectLink:
174 // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
175 ObjectLinkPacket link = (ObjectLinkPacket)Pack; 174 ObjectLinkPacket link = (ObjectLinkPacket)Pack;
176 uint parentprimid = 0; 175 uint parentprimid = 0;
177 List<uint> childrenprims = new List<uint>(); 176 List<uint> childrenprims = new List<uint>();
@@ -227,7 +226,6 @@ namespace OpenSim
227 } 226 }
228 break; 227 break;
229 case PacketType.TransferRequest: 228 case PacketType.TransferRequest:
230 //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");
231 TransferRequestPacket transfer = (TransferRequestPacket)Pack; 229 TransferRequestPacket transfer = (TransferRequestPacket)Pack;
232 m_assetCache.AddAssetRequest(this, transfer); 230 m_assetCache.AddAssetRequest(this, transfer);
233 break; 231 break;
@@ -236,7 +234,6 @@ namespace OpenSim
236 this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID)); 234 this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));
237 break; 235 break;
238 case PacketType.RequestXfer: 236 case PacketType.RequestXfer:
239 //Console.WriteLine(Pack.ToString());
240 break; 237 break;
241 case PacketType.SendXferPacket: 238 case PacketType.SendXferPacket:
242 this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack); 239 this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);
@@ -244,10 +241,8 @@ namespace OpenSim
244 case PacketType.CreateInventoryFolder: 241 case PacketType.CreateInventoryFolder:
245 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; 242 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
246 m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID); 243 m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
247 //Console.WriteLine(Pack.ToString());
248 break; 244 break;
249 case PacketType.CreateInventoryItem: 245 case PacketType.CreateInventoryItem:
250 //Console.WriteLine(Pack.ToString());
251 CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack; 246 CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;
252 if (createItem.InventoryBlock.TransactionID != LLUUID.Zero) 247 if (createItem.InventoryBlock.TransactionID != LLUUID.Zero)
253 { 248 {
@@ -255,12 +250,10 @@ namespace OpenSim
255 } 250 }
256 else 251 else
257 { 252 {
258 // Console.Write(Pack.ToString());
259 this.CreateInventoryItem(createItem); 253 this.CreateInventoryItem(createItem);
260 } 254 }
261 break; 255 break;
262 case PacketType.FetchInventory: 256 case PacketType.FetchInventory:
263 //Console.WriteLine("fetch item packet");
264 FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack; 257 FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack;
265 m_inventoryCache.FetchInventory(this, FetchInventory); 258 m_inventoryCache.FetchInventory(this, FetchInventory);
266 break; 259 break;
@@ -270,7 +263,6 @@ namespace OpenSim
270 break; 263 break;
271 case PacketType.UpdateInventoryItem: 264 case PacketType.UpdateInventoryItem:
272 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; 265 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
273 //Console.WriteLine(Pack.ToString());
274 for (int i = 0; i < update.InventoryData.Length; i++) 266 for (int i = 0; i < update.InventoryData.Length; i++)
275 { 267 {
276 if (update.InventoryData[i].TransactionID != LLUUID.Zero) 268 if (update.InventoryData[i].TransactionID != LLUUID.Zero)
@@ -278,7 +270,6 @@ namespace OpenSim
278 AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); 270 AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));
279 if (asset != null) 271 if (asset != null)
280 { 272 {
281 // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");
282 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); 273 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
283 } 274 }
284 else 275 else
@@ -286,12 +277,11 @@ namespace OpenSim
286 asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); 277 asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
287 if (asset != null) 278 if (asset != null)
288 { 279 {
289 //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");
290 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); 280 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
291 } 281 }
292 else 282 else
293 { 283 {
294 //Console.WriteLine("trying to update inventory item, but asset is null"); 284
295 } 285 }
296 } 286 }
297 } 287 }
@@ -302,7 +292,6 @@ namespace OpenSim
302 } 292 }
303 break; 293 break;
304 case PacketType.RequestTaskInventory: 294 case PacketType.RequestTaskInventory:
305 // Console.WriteLine(Pack.ToString());
306 RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; 295 RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
307 ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket(); 296 ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
308 bool foundent = false; 297 bool foundent = false;
@@ -322,7 +311,6 @@ namespace OpenSim
322 } 311 }
323 break; 312 break;
324 case PacketType.UpdateTaskInventory: 313 case PacketType.UpdateTaskInventory:
325 // Console.WriteLine(Pack.ToString());
326 UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; 314 UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
327 AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID); 315 AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
328 if (myinventory != null) 316 if (myinventory != null)
@@ -461,10 +449,8 @@ namespace OpenSim
461 #region unimplemented handlers 449 #region unimplemented handlers
462 case PacketType.AgentIsNowWearing: 450 case PacketType.AgentIsNowWearing:
463 // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; 451 // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
464 //Console.WriteLine(Pack.ToString());
465 break; 452 break;
466 case PacketType.ObjectScale: 453 case PacketType.ObjectScale:
467 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
468 break; 454 break;
469 case PacketType.MoneyBalanceRequest: 455 case PacketType.MoneyBalanceRequest:
470 //This need to be actually done and not thrown back with fake info 456 //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 586c9df..8f7cf58 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -124,7 +124,6 @@ namespace OpenSim
124 if (this.startpos.Z < (m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround)) 124 if (this.startpos.Z < (m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround))
125 this.startpos.Z = m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround; 125 this.startpos.Z = m_world.Terrain[(int)this.startpos.X, (int)this.startpos.Y] + aboveGround;
126 126
127 //Console.WriteLine("start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);
128 } 127 }
129 else 128 else
130 { 129 {
diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
index 3cba243..642251c 100644
--- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
@@ -46,7 +46,6 @@ namespace OpenSim
46 // Keep track of when this packet was sent out 46 // Keep track of when this packet was sent out
47 Pack.TickCount = Environment.TickCount; 47 Pack.TickCount = Environment.TickCount;
48 48
49 //Console.WriteLine("OUT: " + Pack.Type.ToString());
50 49
51 if (!Pack.Header.Resent) 50 if (!Pack.Header.Resent)
52 { 51 {
@@ -251,8 +250,6 @@ namespace OpenSim
251 return; 250 return;
252 } 251 }
253 252
254 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck");
255
256 253
257 int i = 0; 254 int i = 0;
258 PacketAckPacket acks = new PacketAckPacket(); 255 PacketAckPacket acks = new PacketAckPacket();
diff --git a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
index 2c1280d..9e96a4e 100644
--- a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
+++ b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
@@ -28,7 +28,6 @@ namespace OpenSim.world
28 28
29 if ( nod.Attributes["name"] != null) 29 if ( nod.Attributes["name"] != null)
30 { 30 {
31 //Console.WriteLine("'" + nod.Attributes["name"].Value + "' - '" + nod.InnerText + "'");
32 AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText); 31 AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
33 } 32 }
34 33
diff --git a/OpenSim/OpenSim.RegionServer/world/Primitive.cs b/OpenSim/OpenSim.RegionServer/world/Primitive.cs
index ed24504..63643be 100644
--- a/OpenSim/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim/OpenSim.RegionServer/world/Primitive.cs
@@ -489,7 +489,6 @@ namespace OpenSim.world
489 ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock(); 489 ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
490 //dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry; 490 //dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry;
491 dat.TextureEntry = new byte[0]; 491 dat.TextureEntry = new byte[0];
492 //Console.WriteLine("texture-entry length in improvedterse block is " + this.OurPacket.ObjectData[0].TextureEntry.Length);
493 bytes[i++] = (byte)(ID % 256); 492 bytes[i++] = (byte)(ID % 256);
494 bytes[i++] = (byte)((ID >> 8) % 256); 493 bytes[i++] = (byte)((ID >> 8) % 256);
495 bytes[i++] = (byte)((ID >> 16) % 256); 494 bytes[i++] = (byte)((ID >> 16) % 256);