Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs

1 files changed, 1 insertions, 1 deletions

diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 95c2935..a4f1bba 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -564,7 +564,7 @@ namespace OpenSim.Services.UserAccountService
             return account;
         }
 
-        private void CreateDefaultAppearanceEntries(UUID principalID)
+        protected void CreateDefaultAppearanceEntries(UUID principalID)
         {
             m_log.DebugFormat("[USER ACCOUNT SERVICE]: Creating default appearance items for {0}", principalID);