aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-06-05 12:22:42 +0000
committerAdam Frisby2007-06-05 12:22:42 +0000
commit891b92a780d28e8a18627647a222b48f0695b269 (patch)
tree5beb6b1d0e96307e2b1b55aa60dd95bef5ab4ef5 /OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
parent* Small bugfix: Avatar rezzing from grid mode should no longer place you unde... (diff)
downloadopensim-SC_OLD-891b92a780d28e8a18627647a222b48f0695b269.zip
opensim-SC_OLD-891b92a780d28e8a18627647a222b48f0695b269.tar.gz
opensim-SC_OLD-891b92a780d28e8a18627647a222b48f0695b269.tar.bz2
opensim-SC_OLD-891b92a780d28e8a18627647a222b48f0695b269.tar.xz
* Removing dead comments
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs16
1 files changed, 1 insertions, 15 deletions
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