diff options
author | Diva Canto | 2010-11-25 11:14:16 -0800 |
---|---|---|
committer | Diva Canto | 2010-11-25 11:14:16 -0800 |
commit | ae4b02e1152b775dc1cdccd1abfbff44ab1a8949 (patch) | |
tree | d0b89d3bf8f3256a3043c2d21bd7a22cb23891c0 /OpenSim/Server/Handlers/Inventory | |
parent | Attempt at fixing failing test. (diff) | |
download | opensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.zip opensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.tar.gz opensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.tar.bz2 opensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.tar.xz |
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.
Diffstat (limited to 'OpenSim/Server/Handlers/Inventory')
-rw-r--r-- | OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 6 |
1 files changed, 5 insertions, 1 deletions
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 | |||
153 | } | 153 | } |
154 | catch (Exception e) | 154 | catch (Exception e) |
155 | { | 155 | { |
156 | m_log.Debug("[XINVENTORY HANDLER]: Exception {0}", e); | 156 | m_log.DebugFormat("[XINVENTORY HANDLER]: Exception {0}", e); |
157 | } | 157 | } |
158 | 158 | ||
159 | return FailureResult(); | 159 | return FailureResult(); |
@@ -604,6 +604,10 @@ namespace OpenSim.Server.Handlers.Asset | |||
604 | ret["CreatorId"] = item.CreatorId.ToString(); | 604 | ret["CreatorId"] = item.CreatorId.ToString(); |
605 | else | 605 | else |
606 | ret["CreatorId"] = String.Empty; | 606 | ret["CreatorId"] = String.Empty; |
607 | if (item.CreatorData != null) | ||
608 | ret["CreatorData"] = item.CreatorData; | ||
609 | else | ||
610 | ret["CreatorData"] = String.Empty; | ||
607 | ret["CurrentPermissions"] = item.CurrentPermissions.ToString(); | 611 | ret["CurrentPermissions"] = item.CurrentPermissions.ToString(); |
608 | ret["Description"] = item.Description.ToString(); | 612 | ret["Description"] = item.Description.ToString(); |
609 | ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString(); | 613 | ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString(); |