diff options
| author | UbitUmarov | 2012-02-10 23:03:30 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-02-10 23:03:30 +0000 |
| commit | e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7 (patch) | |
| tree | 0fff77027caf8e6ba723489c45e0cf1cb77bb0ec /OpenSim/Data | |
| parent | Changes to vehicles code etc. Includes some debug aids to remove later. (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.zip opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.tar.gz opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.tar.bz2 opensim-SC-e3f5fd81f1bdcccb5fb0cad75d85bf1f733667d7.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
prebuild.xml
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteFriendsData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteFriendsData.cs b/OpenSim/Data/SQLite/SQLiteFriendsData.cs index b14c348..5f68977 100644 --- a/OpenSim/Data/SQLite/SQLiteFriendsData.cs +++ b/OpenSim/Data/SQLite/SQLiteFriendsData.cs | |||
| @@ -75,7 +75,7 @@ namespace OpenSim.Data.SQLite | |||
| 75 | cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString()); | 75 | cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString()); |
| 76 | cmd.Parameters.AddWithValue(":Friend", friend); | 76 | cmd.Parameters.AddWithValue(":Friend", friend); |
| 77 | 77 | ||
| 78 | ExecuteNonQuery(cmd, cmd.Connection); | 78 | ExecuteNonQuery(cmd, m_Connection); |
| 79 | 79 | ||
| 80 | return true; | 80 | return true; |
| 81 | } | 81 | } |