diff options
Diffstat (limited to 'OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs index c5ae0c0..41361ab 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs | |||
@@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
67 | IConfig gridConfig = source.Configs["FriendsService"]; | 67 | IConfig gridConfig = source.Configs["FriendsService"]; |
68 | if (gridConfig == null) | 68 | if (gridConfig == null) |
69 | { | 69 | { |
70 | m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini"); | 70 | m_log.Error("[FRIENDS SERVICE CONNECTOR]: FriendsService missing from OpenSim.ini"); |
71 | throw new Exception("Friends connector init error"); | 71 | throw new Exception("Friends connector init error"); |
72 | } | 72 | } |
73 | 73 | ||
@@ -76,7 +76,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
76 | 76 | ||
77 | if (serviceURI == String.Empty) | 77 | if (serviceURI == String.Empty) |
78 | { | 78 | { |
79 | m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService"); | 79 | m_log.Error("[FRIENDS SERVICE CONNECTOR]: No Server URI named in section FriendsService"); |
80 | throw new Exception("Friends connector init error"); | 80 | throw new Exception("Friends connector init error"); |
81 | } | 81 | } |
82 | m_ServerURI = serviceURI; | 82 | m_ServerURI = serviceURI; |
@@ -127,7 +127,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
127 | 127 | ||
128 | List<FriendInfo> finfos = new List<FriendInfo>(); | 128 | List<FriendInfo> finfos = new List<FriendInfo>(); |
129 | Dictionary<string, object>.ValueCollection finfosList = replyData.Values; | 129 | Dictionary<string, object>.ValueCollection finfosList = replyData.Values; |
130 | //m_log.DebugFormat("[FRIENDS CONNECTOR]: get neighbours returned {0} elements", rinfosList.Count); | 130 | //m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: get neighbours returned {0} elements", rinfosList.Count); |
131 | foreach (object f in finfosList) | 131 | foreach (object f in finfosList) |
132 | { | 132 | { |
133 | if (f is Dictionary<string, object>) | 133 | if (f is Dictionary<string, object>) |
@@ -136,7 +136,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
136 | finfos.Add(finfo); | 136 | finfos.Add(finfo); |
137 | } | 137 | } |
138 | else | 138 | else |
139 | m_log.DebugFormat("[FRIENDS CONNECTOR]: GetFriends {0} received invalid response type {1}", | 139 | m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: GetFriends {0} received invalid response type {1}", |
140 | PrincipalID, f.GetType()); | 140 | PrincipalID, f.GetType()); |
141 | } | 141 | } |
142 | 142 | ||
@@ -145,14 +145,14 @@ namespace OpenSim.Services.Connectors.Friends | |||
145 | } | 145 | } |
146 | 146 | ||
147 | else | 147 | else |
148 | m_log.DebugFormat("[FRIENDS CONNECTOR]: GetFriends {0} received null response", | 148 | m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: GetFriends {0} received null response", |
149 | PrincipalID); | 149 | PrincipalID); |
150 | 150 | ||
151 | } | 151 | } |
152 | } | 152 | } |
153 | catch (Exception e) | 153 | catch (Exception e) |
154 | { | 154 | { |
155 | m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); | 155 | m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message); |
156 | } | 156 | } |
157 | 157 | ||
158 | return new FriendInfo[0]; | 158 | return new FriendInfo[0]; |
@@ -175,7 +175,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
175 | } | 175 | } |
176 | catch (Exception e) | 176 | catch (Exception e) |
177 | { | 177 | { |
178 | m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); | 178 | m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message); |
179 | return false; | 179 | return false; |
180 | } | 180 | } |
181 | 181 | ||
@@ -190,11 +190,11 @@ namespace OpenSim.Services.Connectors.Friends | |||
190 | return success; | 190 | return success; |
191 | } | 191 | } |
192 | else | 192 | else |
193 | m_log.DebugFormat("[FRIENDS CONNECTOR]: StoreFriend {0} {1} received null response", | 193 | m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: StoreFriend {0} {1} received null response", |
194 | PrincipalID, Friend); | 194 | PrincipalID, Friend); |
195 | } | 195 | } |
196 | else | 196 | else |
197 | m_log.DebugFormat("[FRIENDS CONNECTOR]: StoreFriend received null reply"); | 197 | m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: StoreFriend received null reply"); |
198 | 198 | ||
199 | return false; | 199 | return false; |
200 | 200 | ||
@@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
231 | } | 231 | } |
232 | catch (Exception e) | 232 | catch (Exception e) |
233 | { | 233 | { |
234 | m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); | 234 | m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message); |
235 | return false; | 235 | return false; |
236 | } | 236 | } |
237 | 237 | ||
@@ -246,11 +246,11 @@ namespace OpenSim.Services.Connectors.Friends | |||
246 | return success; | 246 | return success; |
247 | } | 247 | } |
248 | else | 248 | else |
249 | m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend {0} {1} received null response", | 249 | m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: DeleteFriend {0} {1} received null response", |
250 | PrincipalID, Friend); | 250 | PrincipalID, Friend); |
251 | } | 251 | } |
252 | else | 252 | else |
253 | m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend received null reply"); | 253 | m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: DeleteFriend received null reply"); |
254 | 254 | ||
255 | return false; | 255 | return false; |
256 | } | 256 | } |