Merge branch 'master' into careminster

2026-08-06 01:06:30 +08:00 · 2010-02-14 22:27:39 +00:00
parent 0ad8046582 45493171b0
commit 2084e08ad7
34 changed files with 357 additions and 400 deletions
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -622,11 +622,6 @@ namespace OpenSim.Data.MySQL
            return false;
        }

-        /// <summary>
-        /// Appearance
-        /// TODO: stubs for now to get us to a compiling state gently
-        /// override
-        /// </summary>
        public override AvatarAppearance GetUserAppearance(UUID user)
        {
            try