OpenSim changed the way FSAssets directory structure works by default, sort that out.

Otherwise updating from 0.8 to 0.9 with FSAssets will fail to find new
assets.

1 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs
index d1a59d1..f130c20 100644
--- a/OpenSim/Services/FSAssetService/FSAssetService.cs
+++ b/OpenSim/Services/FSAssetService/FSAssetService.cs
@@ -185,7 +185,18 @@ namespace OpenSim.Services.FSAssetService
                 throw new Exception("Configuration error");
             }
 
+            // OSGrid format is /3/3/, OpenSims default format is /2/2/2/4/.  Try to figure out which we have.
+            List<string> dirs = new List<string>(Directory.EnumerateDirectories(m_FSBase));
+            foreach (var dir in dirs)
+            {
+                if (3 == dir.Substring(dir.LastIndexOf(Path.DirectorySeparatorChar) + 1).Length)
+                {
+                    m_useOsgridFormat = true;
+                    break;
+                }
+            }
             m_useOsgridFormat = assetConfig.GetBoolean("UseOsgridFormat", m_useOsgridFormat);
+            m_log.InfoFormat("[FSASSETS]: UseOsgridFormat is {0}", m_useOsgridFormat);
 
             // Default is to show stats to retain original behaviour
             m_showStats = assetConfig.GetBoolean("ShowConsoleStats", m_showStats);