diff options
author | John Hurliman | 2010-03-09 12:19:11 -0800 |
---|---|---|
committer | John Hurliman | 2010-03-09 12:19:11 -0800 |
commit | 4b8af2e1aa794ee51ae6b6751eeed3e8b2b47664 (patch) | |
tree | 468a94ac8fbd5e660312917bd95e24912f4f4b83 /OpenSim/Data/MSSQL/MSSQLFriendsData.cs | |
parent | * Typo fixes (diff) | |
parent | MSSQL tweaks for latest ROBUST - friends handling fixed, GridUserData placeho... (diff) | |
download | opensim-SC_OLD-4b8af2e1aa794ee51ae6b6751eeed3e8b2b47664.zip opensim-SC_OLD-4b8af2e1aa794ee51ae6b6751eeed3e8b2b47664.tar.gz opensim-SC_OLD-4b8af2e1aa794ee51ae6b6751eeed3e8b2b47664.tar.bz2 opensim-SC_OLD-4b8af2e1aa794ee51ae6b6751eeed3e8b2b47664.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLFriendsData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs index 34da943..af4fd9b 100644 --- a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs +++ b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Data.MSSQL | |||
72 | using (SqlCommand cmd = new SqlCommand()) | 72 | using (SqlCommand cmd = new SqlCommand()) |
73 | { | 73 | { |
74 | 74 | ||
75 | cmd.CommandText = String.Format("select a.*,b.Flags as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = ?PrincipalID and b.Flags is not null", m_Realm); | 75 | cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = @PrincipalID", m_Realm); |
76 | cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString())); | 76 | cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString())); |
77 | cmd.Connection = conn; | 77 | cmd.Connection = conn; |
78 | conn.Open(); | 78 | conn.Open(); |