diff options
| author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
| commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
| tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Data/SQLite | |
| parent | bad merge? (diff) | |
| download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz | |
seems to compile ( tests comented out)
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 9a47e37..70267de 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
| @@ -2013,7 +2013,7 @@ namespace OpenSim.Data.SQLite | |||
| 2013 | return entry; | 2013 | return entry; |
| 2014 | } | 2014 | } |
| 2015 | 2015 | ||
| 2016 | /* | 2016 | |
| 2017 | /// <summary> | 2017 | /// <summary> |
| 2018 | /// | 2018 | /// |
| 2019 | /// </summary> | 2019 | /// </summary> |
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs index 70579af..2dfdba3 100644 --- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | |||
| @@ -741,7 +741,7 @@ namespace OpenSim.Data.SQLite | |||
| 741 | return true; | 741 | return true; |
| 742 | } | 742 | } |
| 743 | 743 | ||
| 744 | /* | 744 | |
| 745 | public bool UpdateUserPreferences(ref UserPreferences pref, ref string result) | 745 | public bool UpdateUserPreferences(ref UserPreferences pref, ref string result) |
| 746 | { | 746 | { |
| 747 | string query = string.Empty; | 747 | string query = string.Empty; |
| @@ -826,7 +826,6 @@ namespace OpenSim.Data.SQLite | |||
| 826 | } | 826 | } |
| 827 | return true; | 827 | return true; |
| 828 | } | 828 | } |
| 829 | */ | ||
| 830 | 829 | ||
| 831 | public bool GetUserAppData(ref UserAppData props, ref string result) | 830 | public bool GetUserAppData(ref UserAppData props, ref string result) |
| 832 | { | 831 | { |