diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities/Caps.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index c07744c..b6ee04d 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -32,11 +32,10 @@ using System.IO; | |||
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework; | ||
36 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
37 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
38 | 37 | ||
39 | namespace OpenSim.Region.Capabilities | 38 | namespace OpenSim.Framework.Communications.Capabilities |
40 | { | 39 | { |
41 | public delegate void UpLoadedAsset( | 40 | public delegate void UpLoadedAsset( |
42 | string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, | 41 | string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder, |
@@ -54,8 +53,8 @@ namespace OpenSim.Region.Capabilities | |||
54 | bool isScriptRunning, byte[] data); | 53 | bool isScriptRunning, byte[] data); |
55 | 54 | ||
56 | public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, | 55 | public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID, |
57 | bool fetchFolders, bool fetchItems, int sortOrder); | 56 | bool fetchFolders, bool fetchItems, int sortOrder); |
58 | 57 | ||
59 | /// <summary> | 58 | /// <summary> |
60 | /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that | 59 | /// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that |
61 | /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want | 60 | /// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want |
@@ -397,7 +396,7 @@ namespace OpenSim.Region.Capabilities | |||
397 | /// <returns></returns> | 396 | /// <returns></returns> |
398 | public string RequestTexture(string request, string path, string param) | 397 | public string RequestTexture(string request, string path, string param) |
399 | { | 398 | { |
400 | Console.WriteLine("texture request " + request); | 399 | System.Console.WriteLine("texture request " + request); |
401 | // Needs implementing (added to remove compiler warning) | 400 | // Needs implementing (added to remove compiler warning) |
402 | return String.Empty; | 401 | return String.Empty; |
403 | } | 402 | } |
@@ -961,4 +960,4 @@ namespace OpenSim.Region.Capabilities | |||
961 | } | 960 | } |
962 | } | 961 | } |
963 | } | 962 | } |
964 | } | 963 | } \ No newline at end of file |