aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-26 01:52:12 +0000
committerJustin Clark-Casey (justincc)2011-11-26 01:52:12 +0000
commit86cc00aaa8dba93ea614460ceab7d6ba5e1adec5 (patch)
tree08c0f971951021639d325d1723d010d6ba12370d /OpenSim/Region
parentminor: remove mono compiler warning (diff)
downloadopensim-SC_OLD-86cc00aaa8dba93ea614460ceab7d6ba5e1adec5.zip
opensim-SC_OLD-86cc00aaa8dba93ea614460ceab7d6ba5e1adec5.tar.gz
opensim-SC_OLD-86cc00aaa8dba93ea614460ceab7d6ba5e1adec5.tar.bz2
opensim-SC_OLD-86cc00aaa8dba93ea614460ceab7d6ba5e1adec5.tar.xz
minor: formatting changes in Scene.PacketHandlers.cs
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 2ac6387..6ba74c7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -330,7 +330,7 @@ namespace OpenSim.Region.Framework.Scenes
330 } 330 }
331 } 331 }
332 } 332 }
333 } 333 }
334 334
335 public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) 335 public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
336 { 336 {
@@ -484,6 +484,7 @@ namespace OpenSim.Region.Framework.Scenes
484 // can be handled transparently). 484 // can be handled transparently).
485 InventoryFolderImpl fold = null; 485 InventoryFolderImpl fold = null;
486 if (LibraryService != null && LibraryService.LibraryRootFolder != null) 486 if (LibraryService != null && LibraryService.LibraryRootFolder != null)
487 {
487 if ((fold = LibraryService.LibraryRootFolder.FindFolder(folderID)) != null) 488 if ((fold = LibraryService.LibraryRootFolder.FindFolder(folderID)) != null)
488 { 489 {
489 remoteClient.SendInventoryFolderDetails( 490 remoteClient.SendInventoryFolderDetails(
@@ -491,6 +492,7 @@ namespace OpenSim.Region.Framework.Scenes
491 fold.RequestListOfFolders(), fold.Version, fetchFolders, fetchItems); 492 fold.RequestListOfFolders(), fold.Version, fetchFolders, fetchItems);
492 return; 493 return;
493 } 494 }
495 }
494 496
495 // We're going to send the reply async, because there may be 497 // We're going to send the reply async, because there may be
496 // an enormous quantity of packets -- basically the entire inventory! 498 // an enormous quantity of packets -- basically the entire inventory!
@@ -585,14 +587,13 @@ namespace OpenSim.Region.Framework.Scenes
585 } 587 }
586 } 588 }
587 589
590 delegate void PurgeFolderDelegate(UUID userID, UUID folder);
591
588 /// <summary> 592 /// <summary>
589 /// This should delete all the items and folders in the given directory. 593 /// This should delete all the items and folders in the given directory.
590 /// </summary> 594 /// </summary>
591 /// <param name="remoteClient"></param> 595 /// <param name="remoteClient"></param>
592 /// <param name="folderID"></param> 596 /// <param name="folderID"></param>
593
594 delegate void PurgeFolderDelegate(UUID userID, UUID folder);
595
596 public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, UUID folderID) 597 public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, UUID folderID)
597 { 598 {
598 PurgeFolderDelegate d = PurgeFolderAsync; 599 PurgeFolderDelegate d = PurgeFolderAsync;
@@ -606,7 +607,6 @@ namespace OpenSim.Region.Framework.Scenes
606 } 607 }
607 } 608 }
608 609
609
610 private void PurgeFolderAsync(UUID userID, UUID folderID) 610 private void PurgeFolderAsync(UUID userID, UUID folderID)
611 { 611 {
612 InventoryFolderBase folder = new InventoryFolderBase(folderID, userID); 612 InventoryFolderBase folder = new InventoryFolderBase(folderID, userID);