Merge branch 'master' of /var/git/opensim/

2010-11-08 04:50:04 -08:00 · 2010-11-08 04:50:04 -08:00 · 4a20a544d6
parent 2e4c0c66ff ae9c4a4d11
commit 4a20a544d6
10 changed files with 86 additions and 88 deletions
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@ -351,7 +351,6 @@ namespace OpenSim.Framework
                m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
        }

-
 // DEBUG ON
        public override String ToString()
        {
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@ -139,7 +139,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
            return cached;
        }

-
        /// <summary>
        /// Set appearance data (textureentry and slider settings) received from the client
        /// </summary>