diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Data/Null/NullFriendsData.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Data/Null/NullFriendsData.cs')
-rw-r--r-- | OpenSim/Data/Null/NullFriendsData.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/Null/NullFriendsData.cs b/OpenSim/Data/Null/NullFriendsData.cs index 473999f..dc9cd38 100644 --- a/OpenSim/Data/Null/NullFriendsData.cs +++ b/OpenSim/Data/Null/NullFriendsData.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Data.Null | |||
79 | { | 79 | { |
80 | return fdata.PrincipalID == userID.ToString(); | 80 | return fdata.PrincipalID == userID.ToString(); |
81 | }); | 81 | }); |
82 | 82 | ||
83 | if (lst != null) | 83 | if (lst != null) |
84 | { | 84 | { |
85 | lst.ForEach(f => | 85 | lst.ForEach(f => |
@@ -87,14 +87,14 @@ namespace OpenSim.Data.Null | |||
87 | FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID); | 87 | FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID); |
88 | if (f2 != null) | 88 | if (f2 != null) |
89 | f.Data["TheirFlags"] = f2.Data["Flags"]; | 89 | f.Data["TheirFlags"] = f2.Data["Flags"]; |
90 | 90 | ||
91 | // m_log.DebugFormat( | 91 | // m_log.DebugFormat( |
92 | // "[NULL FRIENDS DATA]: Got {0} {1} {2} for {3}", | 92 | // "[NULL FRIENDS DATA]: Got {0} {1} {2} for {3}", |
93 | // f.Friend, f.Data["Flags"], f2 != null ? f.Data["TheirFlags"] : "not found!", f.PrincipalID); | 93 | // f.Friend, f.Data["Flags"], f2 != null ? f.Data["TheirFlags"] : "not found!", f.PrincipalID); |
94 | }); | 94 | }); |
95 | 95 | ||
96 | // m_log.DebugFormat("[NULL FRIENDS DATA]: Got {0} friends for {1}", lst.Count, userID); | 96 | // m_log.DebugFormat("[NULL FRIENDS DATA]: Got {0} friends for {1}", lst.Count, userID); |
97 | 97 | ||
98 | return lst.ToArray(); | 98 | return lst.ToArray(); |
99 | } | 99 | } |
100 | } | 100 | } |
@@ -134,7 +134,7 @@ namespace OpenSim.Data.Null | |||
134 | // m_log.DebugFormat( | 134 | // m_log.DebugFormat( |
135 | // "[NULL FRIENDS DATA]: Deleting friend {0} {1} for {2}", | 135 | // "[NULL FRIENDS DATA]: Deleting friend {0} {1} for {2}", |
136 | // friend.Friend, friend.Data["Flags"], friend.PrincipalID); | 136 | // friend.Friend, friend.Data["Flags"], friend.PrincipalID); |
137 | 137 | ||
138 | m_Data.Remove(friend); | 138 | m_Data.Remove(friend); |
139 | return true; | 139 | return true; |
140 | } | 140 | } |