bad merge?

2026-08-04 16:22:50 +08:00 · 2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -741,6 +741,7 @@ namespace OpenSim.Data.SQLite
            return true;
        }

+        /*
        public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
        {           
            string query = string.Empty;
@@ -825,6 +826,7 @@ namespace OpenSim.Data.SQLite
            }
            return true;
        }
+        */

        public bool GetUserAppData(ref UserAppData props, ref string result)
        {