OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2016-08-02 18:19:34 +01:00
parent d0ccaead0e a99df75a30
commit c035871e76
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@ -288,23 +288,24 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
if (bakedTextures.Count == 0) if (bakedTextures.Count == 0)
return false; return false;
IImprovedAssetCache cache = sp.Scene.RequestModuleInterface<IImprovedAssetCache>();
if(cache == null)
return true; // no baked local caching so nothing to do
foreach (BakeType bakeType in bakedTextures.Keys) foreach (BakeType bakeType in bakedTextures.Keys)
{ {
Primitive.TextureEntryFace bakedTextureFace = bakedTextures[bakeType]; Primitive.TextureEntryFace bakedTextureFace = bakedTextures[bakeType];
if (bakedTextureFace == null) if (bakedTextureFace == null)
{
// This can happen legitimately, since some baked textures might not exist
//m_log.WarnFormat(
// "[AV FACTORY]: No texture ID set for {0} for {1} in {2} not found when trying to save permanently",
// bakeType, sp.Name, m_scene.RegionInfo.RegionName);
continue; continue;
}
AssetBase asset = m_scene.AssetService.Get(bakedTextureFace.TextureID.ToString()); AssetBase asset = cache.Get(bakedTextureFace.TextureID.ToString());
if (asset != null) if (asset != null && asset.Local)
{ {
// cache does not update asset contents
cache.Expire(bakedTextureFace.TextureID.ToString());
// Replace an HG ID with the simple asset ID so that we can persist textures for foreign HG avatars // Replace an HG ID with the simple asset ID so that we can persist textures for foreign HG avatars
asset.ID = asset.FullID.ToString(); asset.ID = asset.FullID.ToString();
@ -312,7 +313,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
asset.Local = false; asset.Local = false;
m_scene.AssetService.Store(asset); m_scene.AssetService.Store(asset);
} }
else
if (asset == null)
{ {
m_log.WarnFormat( m_log.WarnFormat(
"[AV FACTORY]: Baked texture id {0} not found for bake {1} for avatar {2} in {3} when trying to save permanently", "[AV FACTORY]: Baked texture id {0} not found for bake {1} for avatar {2} in {3} when trying to save permanently",

8
OpenSim/Services/GridService/GridService.cs
View File

@ -341,7 +341,7 @@ namespace OpenSim.Services.GridService
return String.Empty; return String.Empty;
} }
/*
/// <summary> /// <summary>
/// Search the region map for regions conflicting with this region. /// Search the region map for regions conflicting with this region.
/// The region to be added is passed and we look for any existing regions that are /// The region to be added is passed and we look for any existing regions that are
@ -433,7 +433,7 @@ namespace OpenSim.Services.GridService
// is the non-conflicting region found at the location being requested. // is the non-conflicting region found at the location being requested.
return region; return region;
} }
*/
// String describing name and region location of passed region // String describing name and region location of passed region
private String RegionString(RegionData reg) private String RegionString(RegionData reg)
{ {
@ -548,8 +548,8 @@ namespace OpenSim.Services.GridService
} }
else else
{ {
m_log.DebugFormat("{0} GetRegionByPosition. Did not find region in database. Pos=<{1},{2}>", // m_log.DebugFormat("{0} GetRegionByPosition. Did not find region in database. Pos=<{1},{2}>",
LogHeader, regionX, regionY); // LogHeader, regionX, regionY);
return null; return null;
} }
} }