diff options
| author | Melanie | 2012-02-10 10:20:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-10 10:20:51 +0000 |
| commit | 215acbcc9667077fc665be6d5f81c66cf989891e (patch) | |
| tree | 291a607c6fd648b3488d6cc8f05a84ff4f134446 /OpenSim/Data | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.or... (diff) | |
| download | opensim-SC_OLD-215acbcc9667077fc665be6d5f81c66cf989891e.zip opensim-SC_OLD-215acbcc9667077fc665be6d5f81c66cf989891e.tar.gz opensim-SC_OLD-215acbcc9667077fc665be6d5f81c66cf989891e.tar.bz2 opensim-SC_OLD-215acbcc9667077fc665be6d5f81c66cf989891e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'OpenSim/Data')
| -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 | } |