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

When saving appearance, only save the baked textures, not the other face textures (which are already stored permanently)

bulletsim
Justin Clark-Casey (justincc) 2011-08-12 01:24:15 +01:00
parent 65c4b8d37b
commit 2169cf04f9
2 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,16 +271,30 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
"[AV FACTORY]: Permanently saving baked textures for {0} in {1}", "[AV FACTORY]: Permanently saving baked textures for {0} in {1}",
sp.Name, m_scene.RegionInfo.RegionName); sp.Name, m_scene.RegionInfo.RegionName);
for (int i = 0; i < faceTextures.Length; i++) foreach (int i in Enum.GetValues(typeof(BakeType)))
{ {
BakeType bakeType = (BakeType)i;
if (bakeType == BakeType.Unknown)
continue;
// m_log.DebugFormat( // m_log.DebugFormat(
// "[AVFACTORY]: NPC avatar {0} has texture id {1} : {2}", // "[AVFACTORY]: NPC avatar {0} has texture id {1} : {2}",
// acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]); // acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
if (faceTextures[i] == null) int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType);
continue; Primitive.TextureEntryFace bakedTextureFace = faceTextures[ftIndex];
AssetBase asset = m_scene.AssetService.Get(faceTextures[i].TextureID.ToString()); if (bakedTextureFace == null)
{
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;
}
AssetBase asset = m_scene.AssetService.Get(bakedTextureFace.TextureID.ToString());
if (asset != null) if (asset != null)
{ {
@ -290,11 +304,35 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
else else
{ {
m_log.WarnFormat( m_log.WarnFormat(
"[AV FACTORY]: Baked texture {0} for {1} in {2} unexpectedly not found 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",
faceTextures[i].TextureID, sp.Name, m_scene.RegionInfo.RegionName); bakedTextureFace.TextureID, bakeType, sp.Name, m_scene.RegionInfo.RegionName);
} }
} }
// for (int i = 0; i < faceTextures.Length; i++)
// {
//// m_log.DebugFormat(
//// "[AVFACTORY]: NPC avatar {0} has texture id {1} : {2}",
//// acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
//
// if (faceTextures[i] == null)
// continue;
//
// AssetBase asset = m_scene.AssetService.Get(faceTextures[i].TextureID.ToString());
//
// if (asset != null)
// {
// asset.Temporary = false;
// m_scene.AssetService.Store(asset);
// }
// else
// {
// m_log.WarnFormat(
// "[AV FACTORY]: Baked texture {0} for {1} in {2} not found when trying to save permanently",
// faceTextures[i].TextureID, sp.Name, m_scene.RegionInfo.RegionName);
// }
// }
return true; return true;
} }

2
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -843,7 +843,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
public void Close() public void Close()
{ {
// Remove ourselves from the scene // Remove ourselves from the scene
m_scene.RemoveClient(AgentId, false); m_scene.RemoveClient(AgentId, false);
} }
public void Start() public void Start()