Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.

This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems: 
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e5c59aa..fbae9c8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1341,7 +1341,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             + textLength.ToString() + "\n" + notecardData + "}\n";
 
             asset.Data = Encoding.ASCII.GetBytes(notecardData);
-            World.CommsManager.AssetCache.AddAsset(asset);
+            World.AssetService.Store(asset);
 
             // Create Task Entry
             TaskInventoryItem taskItem=new TaskInventoryItem();
@@ -1402,7 +1402,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (!NotecardCache.IsCached(assetID))
             {
-                AssetBase a = World.CommsManager.AssetCache.GetAsset(assetID, false);
+                AssetBase a = World.AssetService.Get(assetID.ToString());
                 if (a != null)
                 {
                     System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
@@ -1455,7 +1455,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (!NotecardCache.IsCached(assetID))
             {
-                AssetBase a = World.CommsManager.AssetCache.GetAsset(assetID, false);
+                AssetBase a = World.AssetService.Get(assetID.ToString());
                 if (a != null)
                 {
                     System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
@@ -1512,7 +1512,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (!NotecardCache.IsCached(assetID))
             {
-                AssetBase a = World.CommsManager.AssetCache.GetAsset(assetID, false);
+                AssetBase a = World.AssetService.Get(assetID.ToString());
                 if (a != null)
                 {
                     System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();