aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2013-02-21 17:27:03 -0800
committerDiva Canto2013-02-21 17:27:03 -0800
commit56c979afe8cfc563b9fd0ecfcf39495de20a5f24 (patch)
tree28f3f63bb7e465bbb1892f54aba1ad15fb9c5c65 /OpenSim/Region
parentMinor formatting cleanup. No changes. (diff)
parentAdd a virtual ToOSDMap() function to Monitoring.Stat for future (diff)
downloadopensim-SC_OLD-56c979afe8cfc563b9fd0ecfcf39495de20a5f24.zip
opensim-SC_OLD-56c979afe8cfc563b9fd0ecfcf39495de20a5f24.tar.gz
opensim-SC_OLD-56c979afe8cfc563b9fd0ecfcf39495de20a5f24.tar.bz2
opensim-SC_OLD-56c979afe8cfc563b9fd0ecfcf39495de20a5f24.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index ce79f07..00d1fd8 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -693,7 +693,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
693 } 693 }
694 694
695 bool bakedTextureValid = m_scene.AvatarFactory.ValidateBakedTextureCache(sp); 695 bool bakedTextureValid = m_scene.AvatarFactory.ValidateBakedTextureCache(sp);
696 outputAction("{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "corrupt"); 696 outputAction("{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "incomplete");
697 } 697 }
698 } 698 }
699} 699}
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
index d718a2f..fa35f0f 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
@@ -222,7 +222,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
222 { 222 {
223 bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp); 223 bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp);
224 MainConsole.Instance.OutputFormat( 224 MainConsole.Instance.OutputFormat(
225 "{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "corrupt"); 225 "{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "incomplete");
226 } 226 }
227 ); 227 );
228 } 228 }