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

conflict resolution due to drift in ValidateBakedTextureCache args

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-12-06 22:20:44 +00:00
parent cc80377325
commit 5d4fee6eb9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
View File

@ -186,7 +186,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
ScenePresence sp = scene.GetScenePresence(optionalTargetFirstName, optionalTargetLastName); ScenePresence sp = scene.GetScenePresence(optionalTargetFirstName, optionalTargetLastName);
if (sp != null && !sp.IsChildAgent) if (sp != null && !sp.IsChildAgent)
{ {
bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp); bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp.ControllingClient);
MainConsole.Instance.OutputFormat( MainConsole.Instance.OutputFormat(
"{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "corrupt"); "{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "corrupt");
} }
@ -196,7 +196,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
scene.ForEachRootScenePresence( scene.ForEachRootScenePresence(
sp => sp =>
{ {
bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp); bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp.ControllingClient);
MainConsole.Instance.OutputFormat( MainConsole.Instance.OutputFormat(
"{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "corrupt"); "{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "corrupt");
} }