aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AvatarAppearance.cs
diff options
context:
space:
mode:
authorMelanie2011-10-11 22:51:44 +0100
committerMelanie2011-10-11 22:51:44 +0100
commitb40157fc9b4236173c8399bbab27fb81faf94b57 (patch)
tree9b8978674eb4ba07b65550606b4d66dad837c4f2 /OpenSim/Framework/AvatarAppearance.cs
parentMerge commit '41616cad09ad5a2936635dfca4caf38c89d00b38' into bigmerge (diff)
parentFix avatar parameter updating for viewer 3 and maybe 2. (diff)
downloadopensim-SC_OLD-b40157fc9b4236173c8399bbab27fb81faf94b57.zip
opensim-SC_OLD-b40157fc9b4236173c8399bbab27fb81faf94b57.tar.gz
opensim-SC_OLD-b40157fc9b4236173c8399bbab27fb81faf94b57.tar.bz2
opensim-SC_OLD-b40157fc9b4236173c8399bbab27fb81faf94b57.tar.xz
Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge
Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 21e2233..f147e14 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -225,6 +225,8 @@ namespace OpenSim.Framework
225 /// </summary> 225 /// </summary>
226 public virtual void ResetAppearance() 226 public virtual void ResetAppearance()
227 { 227 {
228// m_log.WarnFormat("[AVATAR APPEARANCE]: Reset appearance");
229
228 m_serial = 0; 230 m_serial = 0;
229 231
230 SetDefaultTexture(); 232 SetDefaultTexture();