aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Interfaces.cs2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Metadata.cs1
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs4
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs3
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs4
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs5
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs3
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs533
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs3
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Utils.cs14
-rw-r--r--prebuild.xml60
16 files changed, 297 insertions, 345 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
index 2b6bfe3..4b5af05 100644
--- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
+++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
@@ -29,8 +29,6 @@
29 29
30using System; 30using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.IO;
33using System.Net;
34using System.Reflection; 32using System.Reflection;
35using OpenSim.Framework; 33using OpenSim.Framework;
36using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
diff --git a/OpenSim/Grid/AssetInventoryServer/Interfaces.cs b/OpenSim/Grid/AssetInventoryServer/Interfaces.cs
index d934b14..29428d4 100644
--- a/OpenSim/Grid/AssetInventoryServer/Interfaces.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Interfaces.cs
@@ -29,9 +29,7 @@
29 29
30using System; 30using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Net;
33using OpenMetaverse; 32using OpenMetaverse;
34using OpenMetaverse.StructuredData;
35using OpenSim.Framework; 33using OpenSim.Framework;
36 34
37namespace OpenSim.Grid.AssetInventoryServer 35namespace OpenSim.Grid.AssetInventoryServer
diff --git a/OpenSim/Grid/AssetInventoryServer/Metadata.cs b/OpenSim/Grid/AssetInventoryServer/Metadata.cs
index ee96eec..ebd379d 100644
--- a/OpenSim/Grid/AssetInventoryServer/Metadata.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Metadata.cs
@@ -1,6 +1,5 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Xml;
4using OpenMetaverse; 3using OpenMetaverse;
5using OpenMetaverse.StructuredData; 4using OpenMetaverse.StructuredData;
6 5
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs
index 70322e4..517da28 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/AuthorizeAllPlugin.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
38 public class AuthorizeAllPlugin : IAuthorizationProvider 38 public class AuthorizeAllPlugin : IAuthorizationProvider
39 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 AssetInventoryServer server; 41 //private AssetInventoryServer m_server;
42 42
43 public AuthorizeAllPlugin() 43 public AuthorizeAllPlugin()
44 { 44 {
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
48 48
49 public void Initialise(AssetInventoryServer server) 49 public void Initialise(AssetInventoryServer server)
50 { 50 {
51 this.server = server; 51 //m_server = server;
52 52
53 m_log.Info("[ASSET] Authorize All loaded."); 53 m_log.Info("[ASSET] Authorize All loaded.");
54 } 54 }
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
index 09e91dc..6afda79 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs
@@ -30,7 +30,6 @@
30using System; 30using System;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Collections.Generic;
34using System.Collections.Specialized; 33using System.Collections.Specialized;
35using System.Net; 34using System.Net;
36using System.Text; 35using System.Text;
@@ -45,7 +44,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
45 public class BrowseFrontendPlugin : IAssetInventoryServerPlugin 44 public class BrowseFrontendPlugin : IAssetInventoryServerPlugin
46 { 45 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 AssetInventoryServer m_server; 47 private AssetInventoryServer m_server;
49 48
50 public BrowseFrontendPlugin() 49 public BrowseFrontendPlugin()
51 { 50 {
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs
index 92caa04..386822a 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/NullAuthenticationPlugin.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
38 public class NullAuthenticationPlugin : IAuthenticationProvider 38 public class NullAuthenticationPlugin : IAuthenticationProvider
39 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 AssetInventoryServer server; 41 //private AssetInventoryServer m_server;
42 42
43 public NullAuthenticationPlugin() 43 public NullAuthenticationPlugin()
44 { 44 {
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
48 48
49 public void Initialise(AssetInventoryServer server) 49 public void Initialise(AssetInventoryServer server)
50 { 50 {
51 this.server = server; 51 //m_server = server;
52 52
53 m_log.Info("[ASSET] Null Authentication loaded."); 53 m_log.Info("[ASSET] Null Authentication loaded.");
54 } 54 }
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
index 39844f4..7edab93 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/NullMetricsPlugin.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
37 public class NullMetricsPlugin : IMetricsProvider 37 public class NullMetricsPlugin : IMetricsProvider
38 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 AssetInventoryServer server; 40 //private AssetInventoryServer m_server;
41 41
42 public NullMetricsPlugin() 42 public NullMetricsPlugin()
43 { 43 {
@@ -122,7 +122,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
122 122
123 public void Initialise(AssetInventoryServer server) 123 public void Initialise(AssetInventoryServer server)
124 { 124 {
125 this.server = server; 125 //m_server = server;
126 } 126 }
127 127
128 /// <summary> 128 /// <summary>
@@ -130,7 +130,6 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins
130 /// </summary> 130 /// </summary>
131 public void Initialise() 131 public void Initialise()
132 { 132 {
133 this.server = null;
134 m_log.Info("[ASSET] Null metrics loaded."); 133 m_log.Info("[ASSET] Null metrics loaded.");
135 } 134 }
136 135
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs
index af69746..1ca4add 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetFrontendPlugin.cs
@@ -29,14 +29,12 @@
29 29
30using System; 30using System;
31using System.Reflection; 31using System.Reflection;
32using System.Collections.Generic;
33using System.Net; 32using System.Net;
34using System.IO; 33using System.IO;
35using System.Text; 34using System.Text;
36using System.Xml; 35using System.Xml;
37using System.Xml.Serialization; 36using System.Xml.Serialization;
38using OpenMetaverse; 37using OpenMetaverse;
39using HttpServer;
40using OpenSim.Framework; 38using OpenSim.Framework;
41using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
42using log4net; 40using log4net;
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
index 26a7300..bcd1900 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimAssetStoragePlugin.cs
@@ -29,12 +29,9 @@
29 29
30using System; 30using System;
31using System.Reflection; 31using System.Reflection;
32using System.Collections.Generic;
33using System.Net;
34using System.Data; 32using System.Data;
35using MySql.Data.MySqlClient; 33using MySql.Data.MySqlClient;
36using OpenMetaverse; 34using OpenMetaverse;
37using OpenMetaverse.StructuredData;
38using OpenSim.Framework; 35using OpenSim.Framework;
39using OpenSim.Data; 36using OpenSim.Data;
40using Nini.Config; 37using Nini.Config;
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs
index d4e9097..7f8d8f9 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryFrontendPlugin.cs
@@ -30,12 +30,9 @@
30using System; 30using System;
31using System.Reflection; 31using System.Reflection;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using System.Net;
34using System.IO; 33using System.IO;
35using System.Xml; 34using System.Xml;
36using OpenMetaverse; 35using OpenMetaverse;
37using OpenMetaverse.StructuredData;
38using HttpServer;
39using OpenSim.Framework; 36using OpenSim.Framework;
40using log4net; 37using log4net;
41 38
@@ -44,10 +41,10 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
44 public class OpenSimInventoryFrontendPlugin : IAssetInventoryServerPlugin 41 public class OpenSimInventoryFrontendPlugin : IAssetInventoryServerPlugin
45 { 42 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 private AssetInventoryServer server; 44 //private AssetInventoryServer m_server;
48 private Utils.InventoryItemSerializer itemSerializer = new Utils.InventoryItemSerializer(); 45 //private Utils.InventoryItemSerializer itemSerializer = new Utils.InventoryItemSerializer();
49 private Utils.InventoryFolderSerializer folderSerializer = new Utils.InventoryFolderSerializer(); 46 //private Utils.InventoryFolderSerializer folderSerializer = new Utils.InventoryFolderSerializer();
50 private Utils.InventoryCollectionSerializer collectionSerializer = new Utils.InventoryCollectionSerializer(); 47 //private Utils.InventoryCollectionSerializer collectionSerializer = new Utils.InventoryCollectionSerializer();
51 48
52 public OpenSimInventoryFrontendPlugin() 49 public OpenSimInventoryFrontendPlugin()
53 { 50 {
@@ -57,18 +54,18 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
57 54
58 public void Initialise(AssetInventoryServer server) 55 public void Initialise(AssetInventoryServer server)
59 { 56 {
60 this.server = server; 57 //m_server = server;
61 58
62 //server.HttpServer.AddHandler("post", null, @"^/GetInventory/", GetInventoryHandler); 59 //m_server.HttpServer.AddHandler("post", null, @"^/GetInventory/", GetInventoryHandler);
63 //server.HttpServer.AddHandler("post", null, @"^/CreateInventory/", CreateInventoryHandler); 60 //m_server.HttpServer.AddHandler("post", null, @"^/CreateInventory/", CreateInventoryHandler);
64 //server.HttpServer.AddHandler("post", null, @"^/NewFolder/", NewFolderHandler); 61 //m_server.HttpServer.AddHandler("post", null, @"^/NewFolder/", NewFolderHandler);
65 //server.HttpServer.AddHandler("post", null, @"^/UpdateFolder/", UpdateFolderHandler); 62 //m_server.HttpServer.AddHandler("post", null, @"^/UpdateFolder/", UpdateFolderHandler);
66 //server.HttpServer.AddHandler("post", null, @"^/MoveFolder/", MoveFolderHandler); 63 //m_server.HttpServer.AddHandler("post", null, @"^/MoveFolder/", MoveFolderHandler);
67 //server.HttpServer.AddHandler("post", null, @"^/PurgeFolder/", PurgeFolderHandler); 64 //m_server.HttpServer.AddHandler("post", null, @"^/PurgeFolder/", PurgeFolderHandler);
68 //server.HttpServer.AddHandler("post", null, @"^/NewItem/", NewItemHandler); 65 //m_server.HttpServer.AddHandler("post", null, @"^/NewItem/", NewItemHandler);
69 //server.HttpServer.AddHandler("post", null, @"^/DeleteItem/", DeleteItemHandler); 66 //m_server.HttpServer.AddHandler("post", null, @"^/DeleteItem/", DeleteItemHandler);
70 //server.HttpServer.AddHandler("post", null, @"^/RootFolders/", RootFoldersHandler); 67 //m_server.HttpServer.AddHandler("post", null, @"^/RootFolders/", RootFoldersHandler);
71 //server.HttpServer.AddHandler("post", null, @"^/ActiveGestures/", ActiveGesturesHandler); 68 //m_server.HttpServer.AddHandler("post", null, @"^/ActiveGestures/", ActiveGesturesHandler);
72 69
73 m_log.Info("[INVENTORY] OpenSim Inventory Frontend loaded."); 70 m_log.Info("[INVENTORY] OpenSim Inventory Frontend loaded.");
74 } 71 }
@@ -110,7 +107,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
110 107
111 // Uri owner = Utils.GetOpenSimUri(ownerID); 108 // Uri owner = Utils.GetOpenSimUri(ownerID);
112 // InventoryCollection inventory; 109 // InventoryCollection inventory;
113 // BackendResponse storageResponse = server.InventoryProvider.TryFetchInventory(owner, out inventory); 110 // BackendResponse storageResponse = m_server.InventoryProvider.TryFetchInventory(owner, out inventory);
114 111
115 // if (storageResponse == BackendResponse.Success) 112 // if (storageResponse == BackendResponse.Success)
116 // { 113 // {
@@ -150,7 +147,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
150 // m_log.DebugFormat("Created URI {0} for inventory creation", owner); 147 // m_log.DebugFormat("Created URI {0} for inventory creation", owner);
151 148
152 // InventoryFolder rootFolder = new InventoryFolder("My Inventory", ownerID, UUID.Zero, (short)AssetType.Folder); 149 // InventoryFolder rootFolder = new InventoryFolder("My Inventory", ownerID, UUID.Zero, (short)AssetType.Folder);
153 // BackendResponse storageResponse = server.InventoryProvider.TryCreateInventory(owner, rootFolder); 150 // BackendResponse storageResponse = m_server.InventoryProvider.TryCreateInventory(owner, rootFolder);
154 // if (storageResponse == BackendResponse.Success) 151 // if (storageResponse == BackendResponse.Success)
155 // { 152 // {
156 // CreateFolder("Animations", ownerID, rootFolder.ID, AssetType.Animation); 153 // CreateFolder("Animations", ownerID, rootFolder.ID, AssetType.Animation);
@@ -192,11 +189,11 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
192 // if (String.IsNullOrEmpty(folder.Name)) 189 // if (String.IsNullOrEmpty(folder.Name))
193 // { 190 // {
194 // InventoryFolder oldFolder; 191 // InventoryFolder oldFolder;
195 // if (server.InventoryProvider.TryFetchFolder(owner, folder.ID, out oldFolder) == BackendResponse.Success) 192 // if (m_server.InventoryProvider.TryFetchFolder(owner, folder.ID, out oldFolder) == BackendResponse.Success)
196 // folder.Name = oldFolder.Name; 193 // folder.Name = oldFolder.Name;
197 // } 194 // }
198 195
199 // BackendResponse storageResponse = server.InventoryProvider.TryCreateFolder(owner, folder); 196 // BackendResponse storageResponse = m_server.InventoryProvider.TryCreateFolder(owner, folder);
200 197
201 // if (storageResponse == BackendResponse.Success) 198 // if (storageResponse == BackendResponse.Success)
202 // { 199 // {
@@ -227,7 +224,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
227 // if (folder != null) 224 // if (folder != null)
228 // { 225 // {
229 // Uri owner = Utils.GetOpenSimUri(folder.Owner); 226 // Uri owner = Utils.GetOpenSimUri(folder.Owner);
230 // BackendResponse storageResponse = server.InventoryProvider.TryPurgeFolder(owner, folder.ID); 227 // BackendResponse storageResponse = m_server.InventoryProvider.TryPurgeFolder(owner, folder.ID);
231 228
232 // if (storageResponse == BackendResponse.Success) 229 // if (storageResponse == BackendResponse.Success)
233 // { 230 // {
@@ -248,7 +245,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
248 // if (item != null) 245 // if (item != null)
249 // { 246 // {
250 // Uri owner = Utils.GetOpenSimUri(agentID); 247 // Uri owner = Utils.GetOpenSimUri(agentID);
251 // BackendResponse storageResponse = server.InventoryProvider.TryCreateItem(owner, item); 248 // BackendResponse storageResponse = m_server.InventoryProvider.TryCreateItem(owner, item);
252 249
253 // if (storageResponse == BackendResponse.Success) 250 // if (storageResponse == BackendResponse.Success)
254 // { 251 // {
@@ -269,7 +266,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
269 // if (item != null) 266 // if (item != null)
270 // { 267 // {
271 // Uri owner = Utils.GetOpenSimUri(item.Owner); 268 // Uri owner = Utils.GetOpenSimUri(item.Owner);
272 // BackendResponse storageResponse = server.InventoryProvider.TryDeleteItem(owner, item.ID); 269 // BackendResponse storageResponse = m_server.InventoryProvider.TryDeleteItem(owner, item.ID);
273 270
274 // if (storageResponse == BackendResponse.Success) 271 // if (storageResponse == BackendResponse.Success)
275 // { 272 // {
@@ -290,7 +287,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
290 // { 287 // {
291 // Uri owner = Utils.GetOpenSimUri(ownerID); 288 // Uri owner = Utils.GetOpenSimUri(ownerID);
292 // List<InventoryFolder> skeleton; 289 // List<InventoryFolder> skeleton;
293 // BackendResponse storageResponse = server.InventoryProvider.TryFetchFolderList(owner, out skeleton); 290 // BackendResponse storageResponse = m_server.InventoryProvider.TryFetchFolderList(owner, out skeleton);
294 291
295 // if (storageResponse == BackendResponse.Success) 292 // if (storageResponse == BackendResponse.Success)
296 // { 293 // {
@@ -323,7 +320,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
323 // { 320 // {
324 // Uri owner = Utils.GetOpenSimUri(ownerID); 321 // Uri owner = Utils.GetOpenSimUri(ownerID);
325 // List<InventoryItem> gestures; 322 // List<InventoryItem> gestures;
326 // BackendResponse storageResponse = server.InventoryProvider.TryFetchActiveGestures(owner, out gestures); 323 // BackendResponse storageResponse = m_server.InventoryProvider.TryFetchActiveGestures(owner, out gestures);
327 324
328 // if (storageResponse == BackendResponse.Success) 325 // if (storageResponse == BackendResponse.Success)
329 // { 326 // {
@@ -347,255 +344,255 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim
347 // return true; 344 // return true;
348 //} 345 //}
349 346
350 BackendResponse CreateFolder(string name, UUID ownerID, UUID parentID, AssetType assetType) 347 //BackendResponse CreateFolder(string name, UUID ownerID, UUID parentID, AssetType assetType)
351 { 348 //{
352 InventoryFolder folder = new InventoryFolder(name, ownerID, parentID, (short)assetType); 349 // InventoryFolder folder = new InventoryFolder(name, ownerID, parentID, (short)assetType);
353 Uri owner = Utils.GetOpenSimUri(ownerID); 350 // Uri owner = Utils.GetOpenSimUri(ownerID);
354 return server.InventoryProvider.TryCreateFolder(owner, folder); 351 // return m_server.InventoryProvider.TryCreateFolder(owner, folder);
355 } 352 //}
356 353
357 UUID DeserializeUUID(Stream stream) 354 //UUID DeserializeUUID(Stream stream)
358 { 355 //{
359 UUID id = UUID.Zero; 356 // UUID id = UUID.Zero;
360
361 try
362 {
363 using (XmlReader reader = XmlReader.Create(stream))
364 {
365 reader.MoveToContent();
366 UUID.TryParse(reader.ReadElementContentAsString("guid", String.Empty), out id);
367 }
368 }
369 catch (Exception ex)
370 {
371 m_log.Warn("Failed to parse POST data (expecting guid): " + ex.Message);
372 }
373
374 return id;
375 }
376 357
377 UUID DeserializeUUID(Stream stream, out UUID agentID, out UUID sessionID) 358 // try
378 { 359 // {
379 UUID id; 360 // using (XmlReader reader = XmlReader.Create(stream))
380 361 // {
381 try 362 // reader.MoveToContent();
382 { 363 // UUID.TryParse(reader.ReadElementContentAsString("guid", String.Empty), out id);
383 using (XmlReader reader = XmlReader.Create(stream)) 364 // }
384 { 365 // }
385 reader.MoveToContent(); 366 // catch (Exception ex)
386 reader.ReadStartElement("RestSessionObjectOfGuid"); 367 // {
387 UUID.TryParse(reader.ReadElementContentAsString("SessionID", String.Empty), out sessionID); 368 // m_log.Warn("Failed to parse POST data (expecting guid): " + ex.Message);
388 UUID.TryParse(reader.ReadElementContentAsString("AvatarID", String.Empty), out agentID); 369 // }
389 UUID.TryParse(reader.ReadElementContentAsString("Body", String.Empty), out id);
390 reader.ReadEndElement();
391 }
392 }
393 catch (Exception ex)
394 {
395 m_log.Warn("Failed to parse GetInventory POST data: " + ex.Message);
396 agentID = UUID.Zero;
397 sessionID = UUID.Zero;
398 return UUID.Zero;
399 }
400
401 return id;
402 }
403 370
404 InventoryFolder DeserializeFolder(Stream stream, out UUID agentID, out UUID sessionID) 371 // return id;
405 { 372 //}
406 InventoryFolder folder = new InventoryFolder();
407
408 try
409 {
410 using (XmlReader reader = XmlReader.Create(stream))
411 {
412 reader.MoveToContent();
413 reader.ReadStartElement("RestSessionObjectOfInventoryFolderBase");
414 UUID.TryParse(reader.ReadElementContentAsString("SessionID", String.Empty), out sessionID);
415 UUID.TryParse(reader.ReadElementContentAsString("AvatarID", String.Empty), out agentID);
416 reader.ReadStartElement("Body");
417 if (reader.Name == "Name")
418 folder.Name = reader.ReadElementContentAsString("Name", String.Empty);
419 else
420 folder.Name = String.Empty;
421 ReadUUID(reader, "Owner", out folder.Owner);
422 ReadUUID(reader, "ParentID", out folder.ParentID);
423 ReadUUID(reader, "ID", out folder.ID);
424 Int16.TryParse(reader.ReadElementContentAsString("Type", String.Empty), out folder.Type);
425 UInt16.TryParse(reader.ReadElementContentAsString("Version", String.Empty), out folder.Version);
426 reader.ReadEndElement();
427 reader.ReadEndElement();
428 }
429 }
430 catch (Exception ex)
431 {
432 m_log.Warn("Failed to parse POST data (expecting InventoryFolderBase): " + ex.Message);
433 agentID = UUID.Zero;
434 sessionID = UUID.Zero;
435 return null;
436 }
437
438 return folder;
439 }
440 373
441 InventoryItem DeserializeItem(Stream stream, out UUID agentID, out UUID sessionID) 374 //UUID DeserializeUUID(Stream stream, out UUID agentID, out UUID sessionID)
442 { 375 //{
443 InventoryItem item = new InventoryItem(); 376 // UUID id;
444
445 try
446 {
447 using (XmlReader reader = XmlReader.Create(stream))
448 {
449 reader.MoveToContent();
450 reader.ReadStartElement("RestSessionObjectOfInventoryItemBase");
451 UUID.TryParse(reader.ReadElementContentAsString("SessionID", String.Empty), out sessionID);
452 UUID.TryParse(reader.ReadElementContentAsString("AvatarID", String.Empty), out agentID);
453 reader.ReadStartElement("Body");
454 ReadUUID(reader, "ID", out item.ID);
455 Int32.TryParse(reader.ReadElementContentAsString("InvType", String.Empty), out item.InvType);
456 ReadUUID(reader, "Folder", out item.Folder);
457 ReadUUID(reader, "Owner", out item.Owner);
458 ReadUUID(reader, "Creator", out item.Creator);
459 item.Name = reader.ReadElementContentAsString("Name", String.Empty);
460 item.Description = reader.ReadElementContentAsString("Description", String.Empty);
461 UInt32.TryParse(reader.ReadElementContentAsString("NextPermissions", String.Empty), out item.NextPermissions);
462 UInt32.TryParse(reader.ReadElementContentAsString("CurrentPermissions", String.Empty), out item.CurrentPermissions);
463 UInt32.TryParse(reader.ReadElementContentAsString("BasePermissions", String.Empty), out item.BasePermissions);
464 UInt32.TryParse(reader.ReadElementContentAsString("EveryOnePermissions", String.Empty), out item.EveryOnePermissions);
465 UInt32.TryParse(reader.ReadElementContentAsString("GroupPermissions", String.Empty), out item.GroupPermissions);
466 Int32.TryParse(reader.ReadElementContentAsString("AssetType", String.Empty), out item.AssetType);
467 ReadUUID(reader, "AssetID", out item.AssetID);
468 ReadUUID(reader, "GroupID", out item.GroupID);
469 Boolean.TryParse(reader.ReadElementContentAsString("GroupOwned", String.Empty), out item.GroupOwned);
470 Int32.TryParse(reader.ReadElementContentAsString("SalePrice", String.Empty), out item.SalePrice);
471 Byte.TryParse(reader.ReadElementContentAsString("SaleType", String.Empty), out item.SaleType);
472 UInt32.TryParse(reader.ReadElementContentAsString("Flags", String.Empty), out item.Flags);
473 Int32.TryParse(reader.ReadElementContentAsString("CreationDate", String.Empty), out item.CreationDate);
474 reader.ReadEndElement();
475 reader.ReadEndElement();
476 }
477 }
478 catch (Exception ex)
479 {
480 m_log.Warn("Failed to parse POST data (expecting InventoryItemBase): " + ex.Message);
481 agentID = UUID.Zero;
482 sessionID = UUID.Zero;
483 return null;
484 }
485
486 return item;
487 }
488 377
489 void SerializeBool(Stream stream, bool value) 378 // try
490 { 379 // {
491 using (XmlWriter writer = XmlWriter.Create(stream)) 380 // using (XmlReader reader = XmlReader.Create(stream))
492 { 381 // {
493 writer.WriteStartDocument(); 382 // reader.MoveToContent();
494 writer.WriteStartElement("boolean"); 383 // reader.ReadStartElement("RestSessionObjectOfGuid");
495 writer.WriteAttributeString("xmlns", "xsi", null, "http://www.w3.org/2001/XMLSchema-instance"); 384 // UUID.TryParse(reader.ReadElementContentAsString("SessionID", String.Empty), out sessionID);
496 writer.WriteAttributeString("xmlns", "xsd", null, "http://www.w3.org/2001/XMLSchema"); 385 // UUID.TryParse(reader.ReadElementContentAsString("AvatarID", String.Empty), out agentID);
497 writer.WriteString(value.ToString().ToLower()); 386 // UUID.TryParse(reader.ReadElementContentAsString("Body", String.Empty), out id);
498 writer.WriteEndElement(); 387 // reader.ReadEndElement();
499 writer.WriteEndDocument(); 388 // }
500 writer.Flush(); 389 // }
501 } 390 // catch (Exception ex)
502 391 // {
503 stream.Flush(); 392 // m_log.Warn("Failed to parse GetInventory POST data: " + ex.Message);
504 } 393 // agentID = UUID.Zero;
394 // sessionID = UUID.Zero;
395 // return UUID.Zero;
396 // }
505 397
506 void SerializeFolderList(Stream stream, List<InventoryFolder> folders) 398 // return id;
507 { 399 //}
508 using (XmlWriter writer = XmlWriter.Create(stream))
509 {
510 writer.WriteStartDocument();
511 writer.WriteStartElement("ArrayOfInventoryFolderBase");
512 writer.WriteAttributeString("xmlns", "xsi", null, "http://www.w3.org/2001/XMLSchema-instance");
513 writer.WriteAttributeString("xmlns", "xsd", null, "http://www.w3.org/2001/XMLSchema");
514
515 if (folders != null)
516 {
517 foreach (InventoryFolder folder in folders)
518 {
519 writer.WriteStartElement("InventoryFolderBase");
520 writer.WriteElementString("Name", folder.Name);
521 WriteUUID(writer, "Owner", folder.Owner);
522 WriteUUID(writer, "ParentID", folder.ParentID);
523 WriteUUID(writer, "ID", folder.ID);
524 writer.WriteElementString("Type", XmlConvert.ToString(folder.Type));
525 writer.WriteElementString("Version", XmlConvert.ToString(folder.Version));
526 writer.WriteEndElement();
527 }
528 }
529
530 writer.WriteEndElement();
531 writer.WriteEndDocument();
532
533 writer.Flush();
534 }
535
536 stream.Flush();
537 }
538 400
539 void SerializeItemList(Stream stream, List<InventoryItem> items) 401 //InventoryFolder DeserializeFolder(Stream stream, out UUID agentID, out UUID sessionID)
540 { 402 //{
541 using (XmlWriter writer = XmlWriter.Create(stream)) 403 // InventoryFolder folder = new InventoryFolder();
542 {
543 writer.WriteStartDocument();
544 writer.WriteStartElement("ArrayOfInventoryItemBase");
545 writer.WriteAttributeString("xmlns", "xsi", null, "http://www.w3.org/2001/XMLSchema-instance");
546 writer.WriteAttributeString("xmlns", "xsd", null, "http://www.w3.org/2001/XMLSchema");
547
548 if (items != null)
549 {
550 foreach (InventoryItem item in items)
551 {
552 writer.WriteStartElement("InventoryItemBase");
553 WriteUUID(writer, "ID", item.ID);
554 writer.WriteElementString("InvType", XmlConvert.ToString(item.InvType));
555 WriteUUID(writer, "Folder", item.Folder);
556 WriteUUID(writer, "Owner", item.Owner);
557 WriteUUID(writer, "Creator", item.Creator);
558 writer.WriteElementString("Name", item.Name);
559 writer.WriteElementString("Description", item.Description);
560 writer.WriteElementString("NextPermissions", XmlConvert.ToString(item.NextPermissions));
561 writer.WriteElementString("CurrentPermissions", XmlConvert.ToString(item.CurrentPermissions));
562 writer.WriteElementString("BasePermissions", XmlConvert.ToString(item.BasePermissions));
563 writer.WriteElementString("EveryOnePermissions", XmlConvert.ToString(item.EveryOnePermissions));
564 writer.WriteElementString("GroupPermissions", XmlConvert.ToString(item.GroupPermissions));
565 writer.WriteElementString("AssetType", XmlConvert.ToString(item.AssetType));
566 WriteUUID(writer, "AssetID", item.AssetID);
567 WriteUUID(writer, "GroupID", item.GroupID);
568 writer.WriteElementString("GroupOwned", XmlConvert.ToString(item.GroupOwned));
569 writer.WriteElementString("SalePrice", XmlConvert.ToString(item.SalePrice));
570 writer.WriteElementString("SaleType", XmlConvert.ToString(item.SaleType));
571 writer.WriteElementString("Flags", XmlConvert.ToString(item.Flags));
572 writer.WriteElementString("CreationDate", XmlConvert.ToString(item.CreationDate));
573 writer.WriteEndElement();
574 }
575 }
576
577 writer.WriteEndElement();
578 writer.WriteEndDocument();
579
580 writer.Flush();
581 }
582
583 stream.Flush();
584 }
585 404
586 void WriteUUID(XmlWriter writer, string name, UUID id) 405 // try
587 { 406 // {
588 writer.WriteStartElement(name); 407 // using (XmlReader reader = XmlReader.Create(stream))
589 writer.WriteElementString("Guid", XmlConvert.ToString(id.Guid)); 408 // {
590 writer.WriteEndElement(); 409 // reader.MoveToContent();
591 } 410 // reader.ReadStartElement("RestSessionObjectOfInventoryFolderBase");
411 // UUID.TryParse(reader.ReadElementContentAsString("SessionID", String.Empty), out sessionID);
412 // UUID.TryParse(reader.ReadElementContentAsString("AvatarID", String.Empty), out agentID);
413 // reader.ReadStartElement("Body");
414 // if (reader.Name == "Name")
415 // folder.Name = reader.ReadElementContentAsString("Name", String.Empty);
416 // else
417 // folder.Name = String.Empty;
418 // ReadUUID(reader, "Owner", out folder.Owner);
419 // ReadUUID(reader, "ParentID", out folder.ParentID);
420 // ReadUUID(reader, "ID", out folder.ID);
421 // Int16.TryParse(reader.ReadElementContentAsString("Type", String.Empty), out folder.Type);
422 // UInt16.TryParse(reader.ReadElementContentAsString("Version", String.Empty), out folder.Version);
423 // reader.ReadEndElement();
424 // reader.ReadEndElement();
425 // }
426 // }
427 // catch (Exception ex)
428 // {
429 // m_log.Warn("Failed to parse POST data (expecting InventoryFolderBase): " + ex.Message);
430 // agentID = UUID.Zero;
431 // sessionID = UUID.Zero;
432 // return null;
433 // }
592 434
593 void ReadUUID(XmlReader reader, string name, out UUID id) 435 // return folder;
594 { 436 //}
595 reader.ReadStartElement(name); 437
596 UUID.TryParse(reader.ReadElementContentAsString("Guid", String.Empty), out id); 438 //InventoryItem DeserializeItem(Stream stream, out UUID agentID, out UUID sessionID)
597 reader.ReadEndElement(); 439 //{
598 } 440 // InventoryItem item = new InventoryItem();
441
442 // try
443 // {
444 // using (XmlReader reader = XmlReader.Create(stream))
445 // {
446 // reader.MoveToContent();
447 // reader.ReadStartElement("RestSessionObjectOfInventoryItemBase");
448 // UUID.TryParse(reader.ReadElementContentAsString("SessionID", String.Empty), out sessionID);
449 // UUID.TryParse(reader.ReadElementContentAsString("AvatarID", String.Empty), out agentID);
450 // reader.ReadStartElement("Body");
451 // ReadUUID(reader, "ID", out item.ID);
452 // Int32.TryParse(reader.ReadElementContentAsString("InvType", String.Empty), out item.InvType);
453 // ReadUUID(reader, "Folder", out item.Folder);
454 // ReadUUID(reader, "Owner", out item.Owner);
455 // ReadUUID(reader, "Creator", out item.Creator);
456 // item.Name = reader.ReadElementContentAsString("Name", String.Empty);
457 // item.Description = reader.ReadElementContentAsString("Description", String.Empty);
458 // UInt32.TryParse(reader.ReadElementContentAsString("NextPermissions", String.Empty), out item.NextPermissions);
459 // UInt32.TryParse(reader.ReadElementContentAsString("CurrentPermissions", String.Empty), out item.CurrentPermissions);
460 // UInt32.TryParse(reader.ReadElementContentAsString("BasePermissions", String.Empty), out item.BasePermissions);
461 // UInt32.TryParse(reader.ReadElementContentAsString("EveryOnePermissions", String.Empty), out item.EveryOnePermissions);
462 // UInt32.TryParse(reader.ReadElementContentAsString("GroupPermissions", String.Empty), out item.GroupPermissions);
463 // Int32.TryParse(reader.ReadElementContentAsString("AssetType", String.Empty), out item.AssetType);
464 // ReadUUID(reader, "AssetID", out item.AssetID);
465 // ReadUUID(reader, "GroupID", out item.GroupID);
466 // Boolean.TryParse(reader.ReadElementContentAsString("GroupOwned", String.Empty), out item.GroupOwned);
467 // Int32.TryParse(reader.ReadElementContentAsString("SalePrice", String.Empty), out item.SalePrice);
468 // Byte.TryParse(reader.ReadElementContentAsString("SaleType", String.Empty), out item.SaleType);
469 // UInt32.TryParse(reader.ReadElementContentAsString("Flags", String.Empty), out item.Flags);
470 // Int32.TryParse(reader.ReadElementContentAsString("CreationDate", String.Empty), out item.CreationDate);
471 // reader.ReadEndElement();
472 // reader.ReadEndElement();
473 // }
474 // }
475 // catch (Exception ex)
476 // {
477 // m_log.Warn("Failed to parse POST data (expecting InventoryItemBase): " + ex.Message);
478 // agentID = UUID.Zero;
479 // sessionID = UUID.Zero;
480 // return null;
481 // }
482
483 // return item;
484 //}
485
486 //void SerializeBool(Stream stream, bool value)
487 //{
488 // using (XmlWriter writer = XmlWriter.Create(stream))
489 // {
490 // writer.WriteStartDocument();
491 // writer.WriteStartElement("boolean");
492 // writer.WriteAttributeString("xmlns", "xsi", null, "http://www.w3.org/2001/XMLSchema-instance");
493 // writer.WriteAttributeString("xmlns", "xsd", null, "http://www.w3.org/2001/XMLSchema");
494 // writer.WriteString(value.ToString().ToLower());
495 // writer.WriteEndElement();
496 // writer.WriteEndDocument();
497 // writer.Flush();
498 // }
499
500 // stream.Flush();
501 //}
502
503 //void SerializeFolderList(Stream stream, List<InventoryFolder> folders)
504 //{
505 // using (XmlWriter writer = XmlWriter.Create(stream))
506 // {
507 // writer.WriteStartDocument();
508 // writer.WriteStartElement("ArrayOfInventoryFolderBase");
509 // writer.WriteAttributeString("xmlns", "xsi", null, "http://www.w3.org/2001/XMLSchema-instance");
510 // writer.WriteAttributeString("xmlns", "xsd", null, "http://www.w3.org/2001/XMLSchema");
511
512 // if (folders != null)
513 // {
514 // foreach (InventoryFolder folder in folders)
515 // {
516 // writer.WriteStartElement("InventoryFolderBase");
517 // writer.WriteElementString("Name", folder.Name);
518 // WriteUUID(writer, "Owner", folder.Owner);
519 // WriteUUID(writer, "ParentID", folder.ParentID);
520 // WriteUUID(writer, "ID", folder.ID);
521 // writer.WriteElementString("Type", XmlConvert.ToString(folder.Type));
522 // writer.WriteElementString("Version", XmlConvert.ToString(folder.Version));
523 // writer.WriteEndElement();
524 // }
525 // }
526
527 // writer.WriteEndElement();
528 // writer.WriteEndDocument();
529
530 // writer.Flush();
531 // }
532
533 // stream.Flush();
534 //}
535
536 //void SerializeItemList(Stream stream, List<InventoryItem> items)
537 //{
538 // using (XmlWriter writer = XmlWriter.Create(stream))
539 // {
540 // writer.WriteStartDocument();
541 // writer.WriteStartElement("ArrayOfInventoryItemBase");
542 // writer.WriteAttributeString("xmlns", "xsi", null, "http://www.w3.org/2001/XMLSchema-instance");
543 // writer.WriteAttributeString("xmlns", "xsd", null, "http://www.w3.org/2001/XMLSchema");
544
545 // if (items != null)
546 // {
547 // foreach (InventoryItem item in items)
548 // {
549 // writer.WriteStartElement("InventoryItemBase");
550 // WriteUUID(writer, "ID", item.ID);
551 // writer.WriteElementString("InvType", XmlConvert.ToString(item.InvType));
552 // WriteUUID(writer, "Folder", item.Folder);
553 // WriteUUID(writer, "Owner", item.Owner);
554 // WriteUUID(writer, "Creator", item.Creator);
555 // writer.WriteElementString("Name", item.Name);
556 // writer.WriteElementString("Description", item.Description);
557 // writer.WriteElementString("NextPermissions", XmlConvert.ToString(item.NextPermissions));
558 // writer.WriteElementString("CurrentPermissions", XmlConvert.ToString(item.CurrentPermissions));
559 // writer.WriteElementString("BasePermissions", XmlConvert.ToString(item.BasePermissions));
560 // writer.WriteElementString("EveryOnePermissions", XmlConvert.ToString(item.EveryOnePermissions));
561 // writer.WriteElementString("GroupPermissions", XmlConvert.ToString(item.GroupPermissions));
562 // writer.WriteElementString("AssetType", XmlConvert.ToString(item.AssetType));
563 // WriteUUID(writer, "AssetID", item.AssetID);
564 // WriteUUID(writer, "GroupID", item.GroupID);
565 // writer.WriteElementString("GroupOwned", XmlConvert.ToString(item.GroupOwned));
566 // writer.WriteElementString("SalePrice", XmlConvert.ToString(item.SalePrice));
567 // writer.WriteElementString("SaleType", XmlConvert.ToString(item.SaleType));
568 // writer.WriteElementString("Flags", XmlConvert.ToString(item.Flags));
569 // writer.WriteElementString("CreationDate", XmlConvert.ToString(item.CreationDate));
570 // writer.WriteEndElement();
571 // }
572 // }
573
574 // writer.WriteEndElement();
575 // writer.WriteEndDocument();
576
577 // writer.Flush();
578 // }
579
580 // stream.Flush();
581 //}
582
583 //void WriteUUID(XmlWriter writer, string name, UUID id)
584 //{
585 // writer.WriteStartElement(name);
586 // writer.WriteElementString("Guid", XmlConvert.ToString(id.Guid));
587 // writer.WriteEndElement();
588 //}
589
590 //void ReadUUID(XmlReader reader, string name, out UUID id)
591 //{
592 // reader.ReadStartElement(name);
593 // UUID.TryParse(reader.ReadElementContentAsString("Guid", String.Empty), out id);
594 // reader.ReadEndElement();
595 //}
599 } 596 }
600 597
601 #region OpenSim AssetType 598 #region OpenSim AssetType
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs
index f5a1f78..86cf1de 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim/OpenSimInventoryStoragePlugin.cs
@@ -30,11 +30,9 @@
30using System; 30using System;
31using System.Reflection; 31using System.Reflection;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using System.Net;
34using System.Data; 33using System.Data;
35using MySql.Data.MySqlClient; 34using MySql.Data.MySqlClient;
36using OpenMetaverse; 35using OpenMetaverse;
37using OpenMetaverse.StructuredData;
38using OpenSim.Framework; 36using OpenSim.Framework;
39using OpenSim.Data; 37using OpenSim.Data;
40using Nini.Config; 38using Nini.Config;
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
index f22dc67..7ff5dfa 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
@@ -30,12 +30,9 @@
30using System; 30using System;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Collections.Generic;
34using System.Net; 33using System.Net;
35using System.Xml;
36using OpenMetaverse; 34using OpenMetaverse;
37using OpenMetaverse.StructuredData; 35using OpenMetaverse.StructuredData;
38using HttpServer;
39using OpenSim.Framework; 36using OpenSim.Framework;
40using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
41using log4net; 38using log4net;
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs
index d66fc69..cd0a454 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleAssetStoragePlugin.cs
@@ -30,10 +30,8 @@
30using System; 30using System;
31using System.Reflection; 31using System.Reflection;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using System.Net;
34using System.IO; 33using System.IO;
35using OpenMetaverse; 34using OpenMetaverse;
36using OpenMetaverse.StructuredData;
37using OpenSim.Framework; 35using OpenSim.Framework;
38using log4net; 36using log4net;
39 37
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs
index 8be6f8c..e317ae3 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/Simple/SimpleInventoryStoragePlugin.cs
@@ -30,11 +30,9 @@
30using System; 30using System;
31using System.Reflection; 31using System.Reflection;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using System.Net;
34using System.IO; 33using System.IO;
35using System.Text; 34using System.Text;
36using OpenMetaverse; 35using OpenMetaverse;
37using OpenMetaverse.StructuredData;
38using OpenSim.Framework; 36using OpenSim.Framework;
39using log4net; 37using log4net;
40 38
diff --git a/OpenSim/Grid/AssetInventoryServer/Utils.cs b/OpenSim/Grid/AssetInventoryServer/Utils.cs
index 52e2370..01ca5a6 100644
--- a/OpenSim/Grid/AssetInventoryServer/Utils.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Utils.cs
@@ -28,14 +28,10 @@
28 */ 28 */
29 29
30using System; 30using System;
31using System.Collections.Specialized;
32using System.Globalization; 31using System.Globalization;
33using System.Net;
34using System.Xml; 32using System.Xml;
35using System.Xml.Serialization; 33using System.Xml.Serialization;
36using OpenMetaverse; 34using OpenMetaverse;
37using OpenMetaverse.StructuredData;
38using HttpServer;
39using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
40 36
41namespace OpenSim.Grid.AssetInventoryServer 37namespace OpenSim.Grid.AssetInventoryServer
@@ -791,11 +787,11 @@ namespace OpenSim.Grid.AssetInventoryServer
791 public class GeneratedWriter : XmlSerializationWriter 787 public class GeneratedWriter : XmlSerializationWriter
792 { 788 {
793 const string xmlNamespace = "http://www.w3.org/2000/xmlns/"; 789 const string xmlNamespace = "http://www.w3.org/2000/xmlns/";
794 static readonly System.Reflection.MethodInfo toBinHexStringMethod = typeof(XmlConvert).GetMethod("ToBinHexString", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic, null, new Type[] { typeof(byte[]) }, null); 790 //static readonly System.Reflection.MethodInfo toBinHexStringMethod = typeof(XmlConvert).GetMethod("ToBinHexString", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic, null, new Type[] { typeof(byte[]) }, null);
795 static string ToBinHexString(byte[] input) 791 //static string ToBinHexString(byte[] input)
796 { 792 //{
797 return input == null ? null : (string)toBinHexStringMethod.Invoke(null, new object[] { input }); 793 // return input == null ? null : (string)toBinHexStringMethod.Invoke(null, new object[] { input });
798 } 794 //}
799 public void WriteRoot_InventoryFolder(object o) 795 public void WriteRoot_InventoryFolder(object o)
800 { 796 {
801 WriteStartDocument(); 797 WriteStartDocument();
diff --git a/prebuild.xml b/prebuild.xml
index f5f410f..a9af08e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -760,27 +760,17 @@
760 760
761 <ReferencePath>../../../bin/</ReferencePath> 761 <ReferencePath>../../../bin/</ReferencePath>
762 <Reference name="System"/> 762 <Reference name="System"/>
763 <Reference name="System.ServiceProcess"/>
764 <Reference name="System.Web"/>
765 <Reference name="System.Xml"/> 763 <Reference name="System.Xml"/>
766 <Reference name="OpenSim.Framework"/>
767 <Reference name="OpenSim.Framework.Console"/>
768 <Reference name="OpenSim.Framework.Servers"/>
769 <Reference name="log4net"/>
770 <Reference name="OpenMetaverseTypes"/> 764 <Reference name="OpenMetaverseTypes"/>
771 <Reference name="OpenMetaverse.StructuredData"/> 765 <Reference name="OpenMetaverse.StructuredData"/>
772 <Reference name="HttpServer"/> 766 <Reference name="OpenSim.Framework"/>
767 <Reference name="OpenSim.Framework.Servers"/>
768 <Reference name="OpenSim.Framework.Console"/>
773 <Reference name="Nini.dll" /> 769 <Reference name="Nini.dll" />
774 770 <Reference name="log4net"/>
775 <!-- for Simple Storage and MySQL storage -->
776 <Reference name="System.Data"/>
777 <Reference name="MySql.Data"/>
778 <Reference name="OpenMetaverse"/>
779 771
780 <Files> 772 <Files>
781 <Match pattern="*.cs" recurse="false"/> 773 <Match pattern="*.cs" recurse="false"/>
782 <Match path="Extensions" pattern="*.cs" recurse="false"/>
783 <!--Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true"/-->
784 </Files> 774 </Files>
785 </Project> 775 </Project>
786 776
@@ -797,15 +787,13 @@
797 </Configuration> 787 </Configuration>
798 788
799 <ReferencePath>../../../../bin/</ReferencePath> 789 <ReferencePath>../../../../bin/</ReferencePath>
800 <Reference name="System" /> 790 <Reference name="System"/>
801 <Reference name="System.Web"/> 791 <Reference name="System.Web"/>
802 <Reference name="OpenSim.Grid.AssetInventoryServer" />
803 <Reference name="OpenSim.Framework"/>
804 <Reference name="OpenSim.Framework.Servers"/>
805 <Reference name="OpenMetaverse"/>
806 <Reference name="OpenMetaverseTypes"/> 792 <Reference name="OpenMetaverseTypes"/>
807 <Reference name="OpenMetaverse.StructuredData"/> 793 <Reference name="OpenMetaverse.StructuredData"/>
808 <Reference name="HttpServer"/> 794 <Reference name="OpenSim.Framework"/>
795 <Reference name="OpenSim.Framework.Servers"/>
796 <Reference name="OpenSim.Grid.AssetInventoryServer" />
809 <Reference name="log4net"/> 797 <Reference name="log4net"/>
810 798
811 <Files> 799 <Files>
@@ -827,20 +815,15 @@
827 </Configuration> 815 </Configuration>
828 816
829 <ReferencePath>../../../../../bin/</ReferencePath> 817 <ReferencePath>../../../../../bin/</ReferencePath>
830 <Reference name="System" /> 818 <Reference name="System"/>
831 <Reference name="System.Data" /> 819 <Reference name="System.Xml" />
832 <Reference name="OpenSim.Framework" />
833 <Reference name="OpenSim.Data" />
834 <Reference name="OpenSim.Grid.AssetInventoryServer" />
835 <Reference name="OpenMetaverse"/> 820 <Reference name="OpenMetaverse"/>
836 <Reference name="OpenMetaverseTypes"/> 821 <Reference name="OpenMetaverseTypes"/>
837 <Reference name="OpenMetaverse.StructuredData"/> 822 <Reference name="OpenSim.Framework" />
838 <Reference name="HttpServer"/> 823 <Reference name="OpenSim.Framework.Servers"/>
824 <Reference name="OpenSim.Grid.AssetInventoryServer" />
839 <Reference name="log4net"/> 825 <Reference name="log4net"/>
840 826
841 <!-- Remove these eventually -->
842 <Reference name="MySql.Data" />
843
844 <Files> 827 <Files>
845 <Match pattern="*.cs" recurse="false" /> 828 <Match pattern="*.cs" recurse="false" />
846 <Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true" /> 829 <Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true" />
@@ -860,20 +843,17 @@
860 </Configuration> 843 </Configuration>
861 844
862 <ReferencePath>../../../../../bin/</ReferencePath> 845 <ReferencePath>../../../../../bin/</ReferencePath>
863 <Reference name="System" /> 846 <Reference name="System"/>
847 <Reference name="System.Xml" />
864 <Reference name="System.Data" /> 848 <Reference name="System.Data" />
865 <Reference name="OpenSim.Framework" /> 849 <Reference name="OpenMetaverseTypes"/>
866 <Reference name="OpenSim.Framework.Servers"/>
867 <Reference name="OpenSim.Data" /> 850 <Reference name="OpenSim.Data" />
851 <Reference name="OpenSim.Framework" />
868 <Reference name="OpenSim.Grid.AssetInventoryServer" /> 852 <Reference name="OpenSim.Grid.AssetInventoryServer" />
869 <Reference name="OpenMetaverseTypes"/> 853 <Reference name="OpenSim.Framework.Servers"/>
870 <Reference name="OpenMetaverse.StructuredData"/> 854 <Reference name="MySql.Data"/>
871 <Reference name="HttpServer"/>
872 <Reference name="Nini.dll" />
873 <Reference name="log4net"/> 855 <Reference name="log4net"/>
874 856 <Reference name="Nini.dll" />
875 <!-- Remove these eventually -->
876 <Reference name="MySql.Data" />
877 857
878 <Files> 858 <Files>
879 <Match pattern="*.cs" recurse="false" /> 859 <Match pattern="*.cs" recurse="false" />
generated by cgit v1.1 at 2024-11-16 04:02:54 +0000