diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/InventoryServer/InventoryManager.cs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs index 5c65317..350a618 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,10 +136,12 @@ 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 | |||
139 | public class GetInventory : BaseStreamHandler | 141 | public class GetInventory : BaseStreamHandler |
140 | { | 142 | { |
141 | private SerializableInventory _inventory; | 143 | private readonly SerializableInventory _inventory; |
142 | private InventoryManager _manager; | 144 | private readonly InventoryManager _manager; |
143 | 145 | ||
144 | public GetInventory(InventoryManager manager) | 146 | public GetInventory(InventoryManager manager) |
145 | : base("GET", "/inventory") | 147 | : base("GET", "/inventory") |
@@ -181,7 +183,7 @@ namespace OpenSim.Grid.InventoryServer | |||
181 | { | 183 | { |
182 | byte[] result = new byte[] {}; | 184 | byte[] result = new byte[] {}; |
183 | 185 | ||
184 | string[] parms = path.Split(new char[] {'/'}, StringSplitOptions.RemoveEmptyEntries); | 186 | string[] parms = path.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries); |
185 | if (parms.Length > 1) | 187 | if (parms.Length > 1) |
186 | { | 188 | { |
187 | if (string.Compare(parms[1], "library", true) == 0) | 189 | if (string.Compare(parms[1], "library", true) == 0) |
@@ -190,7 +192,7 @@ namespace OpenSim.Grid.InventoryServer | |||
190 | saveInventoryToStream(_inventory, ms); | 192 | saveInventoryToStream(_inventory, ms); |
191 | 193 | ||
192 | result = ms.GetBuffer(); | 194 | result = ms.GetBuffer(); |
193 | Array.Resize<byte>(ref result, (int) ms.Length); | 195 | Array.Resize(ref result, (int) ms.Length); |
194 | } | 196 | } |
195 | else if (string.Compare(parms[1], "user", true) == 0) | 197 | else if (string.Compare(parms[1], "user", true) == 0) |
196 | { | 198 | { |
@@ -203,5 +205,7 @@ namespace OpenSim.Grid.InventoryServer | |||
203 | return result; | 205 | return result; |
204 | } | 206 | } |
205 | } | 207 | } |
208 | |||
209 | #endregion | ||
206 | } | 210 | } |
207 | } | 211 | } \ No newline at end of file |