From 9588328242f4004446b5cc08251995b8d004b4f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 2 Feb 2013 00:59:26 +0000
Subject: Stop exceptions being thrown if GenerateMapTiles = false but no
static map tile has been set. Do more informative warn instead.
---
.../MapImage/MapImageServiceModule.cs | 8 ++++++--
.../CoreModules/World/LegacyMap/MapImageModule.cs | 17 ++++++++++++-----
2 files changed, 18 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region/CoreModules')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index a839086..26d22b8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
public void Close() { }
public void PostInitialise() { }
-
///
///
///
@@ -133,7 +132,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
///
public void AddRegion(Scene scene)
{
- if (! m_enabled)
+ if (!m_enabled)
return;
// Every shared region module has to maintain an indepedent list of
@@ -206,6 +205,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
using (Image mapTile = tileGenerator.CreateMapTile())
{
+ // XXX: The MapImageModule will return a null if the user has chosen not to create map tiles and there
+ // is no static map tile.
+ if (mapTile == null)
+ return;
+
using (MemoryStream stream = new MemoryStream())
{
mapTile.Save(stream, ImageFormat.Jpeg);
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index d412efc..e7065dc 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -113,7 +113,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
//t = System.Environment.TickCount - t;
//m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t);
-
if (drawPrimVolume)
{
DrawObjectVolume(m_scene, mapbmp);
@@ -121,7 +120,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
}
else
{
- mapbmp = fetchTexture(m_scene.RegionInfo.RegionSettings.TerrainImageID);
+ mapbmp = FetchTexture(m_scene.RegionInfo.RegionSettings.TerrainImageID);
}
return mapbmp;
}
@@ -232,11 +231,19 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
// }
// }
- private Bitmap fetchTexture(UUID id)
+ private Bitmap FetchTexture(UUID id)
{
AssetBase asset = m_scene.AssetService.Get(id.ToString());
- m_log.DebugFormat("[MAPTILE]: Fetched static texture {0}, found: {1}", id, asset != null);
- if (asset == null) return null;
+
+ if (asset != null)
+ {
+ m_log.DebugFormat("[MAPTILE]: Static map image texture {0} found for {1}", id, m_scene.Name);
+ }
+ else
+ {
+ m_log.WarnFormat("[MAPTILE]: Static map image texture {0} not found for {1}", id, m_scene.Name);
+ return null;
+ }
ManagedImage managedImage;
Image image;
--
cgit v1.1
From 9822bb664b58693790201606126e3fd26f7a4d52 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 2 Feb 2013 02:57:38 +0000
Subject: Log missing assets on "fcache assets" found. This ignores references
found by scanning LSL/notecard files since these are the source of false
positives.
This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures.
This is added to help people in determining when they have missing assets such as textures, etc.
In this case, one wants to run "fcache clear" first.
---
.../Region/CoreModules/Asset/FlotsamAssetCache.cs | 41 ++++++++++++++--------
1 file changed, 26 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Region/CoreModules')
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 8e800cb..00af175 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -707,32 +707,43 @@ namespace OpenSim.Region.CoreModules.Asset
{
UuidGatherer gatherer = new UuidGatherer(m_AssetService);
+ HashSet uniqueUuids = new HashSet();
Dictionary assets = new Dictionary();
+
foreach (Scene s in m_Scenes)
{
StampRegionStatusFile(s.RegionInfo.RegionID);
s.ForEachSOG(delegate(SceneObjectGroup e)
- {
+ {
gatherer.GatherAssetUuids(e, assets);
- });
- }
- foreach (UUID assetID in assets.Keys)
- {
- string filename = GetFileName(assetID.ToString());
+ foreach (UUID assetID in assets.Keys)
+ {
+ uniqueUuids.Add(assetID);
- if (File.Exists(filename))
- {
- File.SetLastAccessTime(filename, DateTime.Now);
- }
- else if (storeUncached)
- {
- m_AssetService.Get(assetID.ToString());
- }
+ string filename = GetFileName(assetID.ToString());
+
+ if (File.Exists(filename))
+ {
+ File.SetLastAccessTime(filename, DateTime.Now);
+ }
+ else if (storeUncached)
+ {
+ AssetBase cachedAsset = m_AssetService.Get(assetID.ToString());
+ if (cachedAsset == null && assets[assetID] != AssetType.Unknown)
+ m_log.DebugFormat(
+ "[FLOTSAM ASSET CACHE]: Could not find asset {0}, type {1} referenced by object {2} at {3} in scene {4} when pre-caching all scene assets",
+ assetID, assets[assetID], e.Name, e.AbsolutePosition, s.Name);
+ }
+ }
+
+ assets.Clear();
+ });
}
- return assets.Keys.Count;
+
+ return uniqueUuids.Count;
}
///
--
cgit v1.1
From 141ad829f448b9138b12be7cf99c834c1f3977ec Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 1 Feb 2013 21:57:49 -0500
Subject: Update assembly version numbers
---
OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/CoreModules')
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
index 5a8c4a2..f6353f9 100644
--- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using Mono.Addins;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyVersion("0.7.6.*")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: Addin("OpenSim.Region.CoreModules", "0.1")]
--
cgit v1.1
From 0ab68f6c31c5540789bbd8311b4a87678e0276d3 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 1 Feb 2013 23:13:33 -0500
Subject: Revert "Update assembly version numbers"
This reverts commit 141ad829f448b9138b12be7cf99c834c1f3977ec.
---
OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/CoreModules')
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
index f6353f9..5a8c4a2 100644
--- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using Mono.Addins;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.7.6.*")]
+[assembly: AssemblyVersion("0.7.5.*")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: Addin("OpenSim.Region.CoreModules", "0.1")]
--
cgit v1.1