diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteUserProfilesData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs index cd3e8b6..70579af 100644 --- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | |||
| @@ -741,6 +741,7 @@ namespace OpenSim.Data.SQLite | |||
| 741 | return true; | 741 | return true; |
| 742 | } | 742 | } |
| 743 | 743 | ||
| 744 | /* | ||
| 744 | public bool UpdateUserPreferences(ref UserPreferences pref, ref string result) | 745 | public bool UpdateUserPreferences(ref UserPreferences pref, ref string result) |
| 745 | { | 746 | { |
| 746 | string query = string.Empty; | 747 | string query = string.Empty; |
| @@ -825,6 +826,7 @@ namespace OpenSim.Data.SQLite | |||
| 825 | } | 826 | } |
| 826 | return true; | 827 | return true; |
| 827 | } | 828 | } |
| 829 | */ | ||
| 828 | 830 | ||
| 829 | public bool GetUserAppData(ref UserAppData props, ref string result) | 831 | public bool GetUserAppData(ref UserAppData props, ref string result) |
| 830 | { | 832 | { |