diff options
author | Melanie | 2010-02-14 22:27:39 +0000 |
---|---|---|
committer | Melanie | 2010-02-14 22:27:39 +0000 |
commit | 2084e08ad7a24908a4465108f2b76ee639c91ae6 (patch) | |
tree | 1cc1aa8f1c08de402f27036762b9ac2d1eccabfe /OpenSim/Data/MySQL | |
parent | Resolve a merge issue (diff) | |
parent | * SQLite match code casing with regionsettings table field casing (what's wit... (diff) | |
download | opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.zip opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.gz opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.bz2 opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserData.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index 2cf88b8..0a9d2e3 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs | |||
@@ -622,11 +622,6 @@ namespace OpenSim.Data.MySQL | |||
622 | return false; | 622 | return false; |
623 | } | 623 | } |
624 | 624 | ||
625 | /// <summary> | ||
626 | /// Appearance | ||
627 | /// TODO: stubs for now to get us to a compiling state gently | ||
628 | /// override | ||
629 | /// </summary> | ||
630 | public override AvatarAppearance GetUserAppearance(UUID user) | 625 | public override AvatarAppearance GetUserAppearance(UUID user) |
631 | { | 626 | { |
632 | try | 627 | try |