From ae4b02e1152b775dc1cdccd1abfbff44ab1a8949 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Nov 2010 11:14:16 -0800
Subject: WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG
 CONFIGS. Added capability to preserve creator information on HG asset
 transfers. Added a new HGAssetService that is intended to be the one outside
 the firewall. It processes and filters the assets that go out of the grid.
 Also fixed the normal AssetService to do special things for the main instance
 (console commands, etc). Moved HGInventoryService to
 OpenSim.Services.HypergridService. Changed the way the login service gets the
 ServiceURL configs.

---
 OpenSim/Server/Handlers/Asset/AssetServerConnector.cs      | 5 ++++-
 OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Server/Handlers')

diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index b6425f4..df571fa 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -53,12 +53,15 @@ namespace OpenSim.Server.Handlers.Asset
                     String.Empty);
 
             if (assetService == String.Empty)
-                throw new Exception("No AssetService in config file");
+                throw new Exception("No LocalServiceModule in config file");
 
             Object[] args = new Object[] { config };
             m_AssetService =
                     ServerUtils.LoadPlugin<IAssetService>(assetService, args);
 
+            if (m_AssetService == null)
+                throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
+
             bool allowDelete = serverConfig.GetBoolean("AllowRemoteDelete", false);
 
             server.AddStreamHandler(new AssetServerGetHandler(m_AssetService));
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 22a718a..00f035c 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Server.Handlers.Asset
             }
             catch (Exception e)
             {
-                m_log.Debug("[XINVENTORY HANDLER]: Exception {0}", e);
+                m_log.DebugFormat("[XINVENTORY HANDLER]: Exception {0}", e);
             }
 
             return FailureResult();
@@ -604,6 +604,10 @@ namespace OpenSim.Server.Handlers.Asset
                 ret["CreatorId"] = item.CreatorId.ToString();
             else
                 ret["CreatorId"] = String.Empty;
+            if (item.CreatorData != null)
+                ret["CreatorData"] = item.CreatorData;
+            else
+                ret["CreatorData"] = String.Empty;
             ret["CurrentPermissions"] = item.CurrentPermissions.ToString();
             ret["Description"] = item.Description.ToString();
             ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString();
-- 
cgit v1.1