From a0d80140f2d0ad6dd63970a3a3d5c0da8320ae75 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Apr 2011 00:42:06 +0100
Subject: Make all the objects in a coalescence reappears after being loaded
 from an IAR.  This still doesn't work proprerly since some required
 textures/contained item assets might be missing.

From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object.  However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
---
 OpenSim/Tests/Common/Mock/MockAssetService.cs | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Tests/Common/Mock/MockAssetService.cs')

diff --git a/OpenSim/Tests/Common/Mock/MockAssetService.cs b/OpenSim/Tests/Common/Mock/MockAssetService.cs
index 4118308..9d7c5e2 100644
--- a/OpenSim/Tests/Common/Mock/MockAssetService.cs
+++ b/OpenSim/Tests/Common/Mock/MockAssetService.cs
@@ -54,13 +54,19 @@ namespace OpenSim.Tests.Common.Mock
         
         public AssetBase Get(string id)
         {
-            m_log.DebugFormat("[MOCK ASSET SERVICE]: Getting asset with id {0}", id);
+//            m_log.DebugFormat("[MOCK ASSET SERVICE]: Getting asset with id {0}", id);
             
             AssetBase asset;
             if (Assets.ContainsKey(id))
+            {
                 asset = Assets[id];
+//                m_log.DebugFormat(
+//                    "[MOCK ASSET SERVICE]: Got asset {0} {1}, bytes {2}", asset.Name, asset.ID, asset.Data.Length);                
+            }
             else
-                asset = null;
+            {
+                asset = null;           
+            }
             
             return asset;
         }
@@ -77,7 +83,14 @@ namespace OpenSim.Tests.Common.Mock
 
         public byte[] GetData(string id)
         {
-            throw new System.NotImplementedException();
+//            m_log.DebugFormat("[MOCK ASSET SERVICE]: Requesting data for asset {0}", id);
+            
+            AssetBase asset = Get(id);
+            
+            if (asset == null)
+                return null;
+            else
+                return asset.Data;
         }
 
         public bool Get(string id, object sender, AssetRetrieved handler)
@@ -89,7 +102,8 @@ namespace OpenSim.Tests.Common.Mock
 
         public string Store(AssetBase asset)
         {
-            m_log.DebugFormat("[MOCK ASSET SERVICE]: Storing asset {0}", asset.ID);
+//            m_log.DebugFormat(
+//                "[MOCK ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.ID, asset.Data.Length);
             
             Assets[asset.ID] = asset;
 
-- 
cgit v1.1