aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/InventoryServer/InventoryManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/InventoryServer/InventoryManager.cs')
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs18
1 files changed, 7 insertions, 11 deletions
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index 350a618..5c65317 100644
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Grid.InventoryServer
54 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 54 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
55 55
56 m_log.Info("[" + OpenInventory_Main.LogName + "]: " + 56 m_log.Info("[" + OpenInventory_Main.LogName + "]: " +
57 "Invenstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 57 "Invenstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
58 foreach (Type pluginType in pluginAssembly.GetTypes()) 58 foreach (Type pluginType in pluginAssembly.GetTypes())
59 { 59 {
60 if (!pluginType.IsAbstract) 60 if (!pluginType.IsAbstract)
@@ -68,7 +68,7 @@ namespace OpenSim.Grid.InventoryServer
68 plug.Initialise(dbconnect); 68 plug.Initialise(dbconnect);
69 _databasePlugin = plug; 69 _databasePlugin = plug;
70 m_log.Info("[" + OpenInventory_Main.LogName + "]: " + 70 m_log.Info("[" + OpenInventory_Main.LogName + "]: " +
71 "Invenstorage: Added IInventoryData Interface"); 71 "Invenstorage: Added IInventoryData Interface");
72 break; 72 break;
73 } 73 }
74 } 74 }
@@ -136,12 +136,10 @@ namespace OpenSim.Grid.InventoryServer
136 return fixupFolder(inventory.root, null); 136 return fixupFolder(inventory.root, null);
137 } 137 }
138 138
139 #region Nested type: GetInventory
140
141 public class GetInventory : BaseStreamHandler 139 public class GetInventory : BaseStreamHandler
142 { 140 {
143 private readonly SerializableInventory _inventory; 141 private SerializableInventory _inventory;
144 private readonly InventoryManager _manager; 142 private InventoryManager _manager;
145 143
146 public GetInventory(InventoryManager manager) 144 public GetInventory(InventoryManager manager)
147 : base("GET", "/inventory") 145 : base("GET", "/inventory")
@@ -183,7 +181,7 @@ namespace OpenSim.Grid.InventoryServer
183 { 181 {
184 byte[] result = new byte[] {}; 182 byte[] result = new byte[] {};
185 183
186 string[] parms = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries); 184 string[] parms = path.Split(new char[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
187 if (parms.Length > 1) 185 if (parms.Length > 1)
188 { 186 {
189 if (string.Compare(parms[1], "library", true) == 0) 187 if (string.Compare(parms[1], "library", true) == 0)
@@ -192,7 +190,7 @@ namespace OpenSim.Grid.InventoryServer
192 saveInventoryToStream(_inventory, ms); 190 saveInventoryToStream(_inventory, ms);
193 191
194 result = ms.GetBuffer(); 192 result = ms.GetBuffer();
195 Array.Resize(ref result, (int) ms.Length); 193 Array.Resize<byte>(ref result, (int) ms.Length);
196 } 194 }
197 else if (string.Compare(parms[1], "user", true) == 0) 195 else if (string.Compare(parms[1], "user", true) == 0)
198 { 196 {
@@ -205,7 +203,5 @@ namespace OpenSim.Grid.InventoryServer
205 return result; 203 return result;
206 } 204 }
207 } 205 }
208
209 #endregion
210 } 206 }
211} \ No newline at end of file 207}