diff options
author | John Hurliman | 2010-03-26 15:13:55 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-26 15:13:55 -0700 |
commit | 1430441cf32c659502c6ed1bd7fd54e55a107c05 (patch) | |
tree | 23e3e318fc2b043e1f5ec9c8dc3dee436b8fbfa1 /OpenSim/Services/Connectors | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.zip opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.gz opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.bz2 opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.xz |
Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion
Diffstat (limited to '')
9 files changed, 112 insertions, 112 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index c5fbc9e..27434ad 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -90,14 +90,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
90 | IConfig gridConfig = source.Configs["AssetService"]; | 90 | IConfig gridConfig = source.Configs["AssetService"]; |
91 | if (gridConfig == null) | 91 | if (gridConfig == null) |
92 | { | 92 | { |
93 | m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini"); | 93 | m_log.Error("[SIMIAN ASSET CONNECTOR]: AssetService missing from OpenSim.ini"); |
94 | throw new Exception("Asset connector init error"); | 94 | throw new Exception("Asset connector init error"); |
95 | } | 95 | } |
96 | 96 | ||
97 | string serviceUrl = gridConfig.GetString("AssetServerURI"); | 97 | string serviceUrl = gridConfig.GetString("AssetServerURI"); |
98 | if (String.IsNullOrEmpty(serviceUrl)) | 98 | if (String.IsNullOrEmpty(serviceUrl)) |
99 | { | 99 | { |
100 | m_log.Error("[ASSET CONNECTOR]: No AssetServerURI in section AssetService"); | 100 | m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI in section AssetService"); |
101 | throw new Exception("Asset connector init error"); | 101 | throw new Exception("Asset connector init error"); |
102 | } | 102 | } |
103 | 103 | ||
@@ -162,7 +162,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
162 | } | 162 | } |
163 | catch (Exception ex) | 163 | catch (Exception ex) |
164 | { | 164 | { |
165 | m_log.Warn("[ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); | 165 | m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); |
166 | return null; | 166 | return null; |
167 | } | 167 | } |
168 | } | 168 | } |
@@ -220,7 +220,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
220 | } | 220 | } |
221 | catch (Exception ex) | 221 | catch (Exception ex) |
222 | { | 222 | { |
223 | m_log.Warn("[ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); | 223 | m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); |
224 | } | 224 | } |
225 | 225 | ||
226 | return metadata; | 226 | return metadata; |
@@ -356,7 +356,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
356 | errorMessage = ex.Message; | 356 | errorMessage = ex.Message; |
357 | } | 357 | } |
358 | 358 | ||
359 | m_log.WarnFormat("[ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}", | 359 | m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}", |
360 | asset.Name, asset.ID, asset.Metadata.ContentType, errorMessage); | 360 | asset.Name, asset.ID, asset.Metadata.ContentType, errorMessage); |
361 | return null; | 361 | return null; |
362 | } | 362 | } |
@@ -374,7 +374,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
374 | 374 | ||
375 | if (asset == null) | 375 | if (asset == null) |
376 | { | 376 | { |
377 | m_log.Warn("[ASSET CONNECTOR]: Failed to fetch asset " + id + " for updating"); | 377 | m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to fetch asset " + id + " for updating"); |
378 | return false; | 378 | return false; |
379 | } | 379 | } |
380 | 380 | ||
@@ -400,7 +400,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
400 | if (response["Success"].AsBoolean()) | 400 | if (response["Success"].AsBoolean()) |
401 | return true; | 401 | return true; |
402 | else | 402 | else |
403 | m_log.Warn("[ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service"); | 403 | m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service"); |
404 | 404 | ||
405 | return false; | 405 | return false; |
406 | } | 406 | } |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 031b326..e78429d 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -78,14 +78,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
78 | IConfig assetConfig = source.Configs["AuthenticationService"]; | 78 | IConfig assetConfig = source.Configs["AuthenticationService"]; |
79 | if (assetConfig == null) | 79 | if (assetConfig == null) |
80 | { | 80 | { |
81 | m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini"); | 81 | m_log.Error("[SIMIAN AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini"); |
82 | throw new Exception("Authentication connector init error"); | 82 | throw new Exception("Authentication connector init error"); |
83 | } | 83 | } |
84 | 84 | ||
85 | string serviceURI = assetConfig.GetString("AuthenticationServerURI"); | 85 | string serviceURI = assetConfig.GetString("AuthenticationServerURI"); |
86 | if (String.IsNullOrEmpty(serviceURI)) | 86 | if (String.IsNullOrEmpty(serviceURI)) |
87 | { | 87 | { |
88 | m_log.Error("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService"); | 88 | m_log.Error("[SIMIAN AUTH CONNECTOR]: No Server URI named in section AuthenticationService"); |
89 | throw new Exception("Authentication connector init error"); | 89 | throw new Exception("Authentication connector init error"); |
90 | } | 90 | } |
91 | 91 | ||
@@ -120,11 +120,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
120 | } | 120 | } |
121 | } | 121 | } |
122 | 122 | ||
123 | m_log.Warn("[AUTH CONNECTOR]: Authentication failed for " + principalID); | 123 | m_log.Warn("[SIMIAN AUTH CONNECTOR]: Authentication failed for " + principalID); |
124 | } | 124 | } |
125 | else | 125 | else |
126 | { | 126 | { |
127 | m_log.Warn("[AUTH CONNECTOR]: Failed to retrieve identities for " + principalID + ": " + | 127 | m_log.Warn("[SIMIAN AUTH CONNECTOR]: Failed to retrieve identities for " + principalID + ": " + |
128 | response["Message"].AsString()); | 128 | response["Message"].AsString()); |
129 | } | 129 | } |
130 | 130 | ||
@@ -146,7 +146,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
146 | } | 146 | } |
147 | else | 147 | else |
148 | { | 148 | { |
149 | m_log.Warn("[AUTH CONNECTOR]: Could not verify session for " + principalID + ": " + | 149 | m_log.Warn("[SIMIAN AUTH CONNECTOR]: Could not verify session for " + principalID + ": " + |
150 | response["Message"].AsString()); | 150 | response["Message"].AsString()); |
151 | } | 151 | } |
152 | 152 | ||
@@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
168 | } | 168 | } |
169 | else | 169 | else |
170 | { | 170 | { |
171 | m_log.Warn("[AUTH CONNECTOR]: Failed to remove session for " + principalID + ": " + | 171 | m_log.Warn("[SIMIAN AUTH CONNECTOR]: Failed to remove session for " + principalID + ": " + |
172 | response["Message"].AsString()); | 172 | response["Message"].AsString()); |
173 | } | 173 | } |
174 | 174 | ||
@@ -206,14 +206,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
206 | bool success = response["Success"].AsBoolean(); | 206 | bool success = response["Success"].AsBoolean(); |
207 | 207 | ||
208 | if (!success) | 208 | if (!success) |
209 | m_log.WarnFormat("[AUTH CONNECTOR]: Failed to set password for {0} ({1})", identifier, principalID); | 209 | m_log.WarnFormat("[SIMIAN AUTH CONNECTOR]: Failed to set password for {0} ({1})", identifier, principalID); |
210 | 210 | ||
211 | return success; | 211 | return success; |
212 | } | 212 | } |
213 | } | 213 | } |
214 | else | 214 | else |
215 | { | 215 | { |
216 | m_log.Warn("[AUTH CONNECTOR]: Failed to retrieve identities for " + principalID + ": " + | 216 | m_log.Warn("[SIMIAN AUTH CONNECTOR]: Failed to retrieve identities for " + principalID + ": " + |
217 | response["Message"].AsString()); | 217 | response["Message"].AsString()); |
218 | } | 218 | } |
219 | 219 | ||
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs index 00f9f36..a47f32c 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | |||
@@ -83,14 +83,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
83 | IConfig gridConfig = source.Configs["AvatarService"]; | 83 | IConfig gridConfig = source.Configs["AvatarService"]; |
84 | if (gridConfig == null) | 84 | if (gridConfig == null) |
85 | { | 85 | { |
86 | m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini"); | 86 | m_log.Error("[SIMIAN AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini"); |
87 | throw new Exception("Avatar connector init error"); | 87 | throw new Exception("Avatar connector init error"); |
88 | } | 88 | } |
89 | 89 | ||
90 | string serviceUrl = gridConfig.GetString("AvatarServerURI"); | 90 | string serviceUrl = gridConfig.GetString("AvatarServerURI"); |
91 | if (String.IsNullOrEmpty(serviceUrl)) | 91 | if (String.IsNullOrEmpty(serviceUrl)) |
92 | { | 92 | { |
93 | m_log.Error("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService"); | 93 | m_log.Error("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService"); |
94 | throw new Exception("Avatar connector init error"); | 94 | throw new Exception("Avatar connector init error"); |
95 | } | 95 | } |
96 | 96 | ||
@@ -156,14 +156,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
156 | } | 156 | } |
157 | else | 157 | else |
158 | { | 158 | { |
159 | m_log.Warn("[AVATAR CONNECTOR]: Failed to get user appearance for " + userID + | 159 | m_log.Warn("[SIMIAN AVATAR CONNECTOR]: Failed to get user appearance for " + userID + |
160 | ", LLAppearance is missing or invalid"); | 160 | ", LLAppearance is missing or invalid"); |
161 | return null; | 161 | return null; |
162 | } | 162 | } |
163 | } | 163 | } |
164 | else | 164 | else |
165 | { | 165 | { |
166 | m_log.Warn("[AVATAR CONNECTOR]: Failed to get user appearance for " + userID + ": " + | 166 | m_log.Warn("[SIMIAN AVATAR CONNECTOR]: Failed to get user appearance for " + userID + ": " + |
167 | response["Message"].AsString()); | 167 | response["Message"].AsString()); |
168 | } | 168 | } |
169 | 169 | ||
@@ -172,7 +172,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
172 | 172 | ||
173 | public bool SetAvatar(UUID userID, AvatarData avatar) | 173 | public bool SetAvatar(UUID userID, AvatarData avatar) |
174 | { | 174 | { |
175 | m_log.Debug("[AVATAR CONNECTOR]: SetAvatar called for " + userID); | 175 | m_log.Debug("[SIMIAN AVATAR CONNECTOR]: SetAvatar called for " + userID); |
176 | 176 | ||
177 | if (avatar.AvatarType == 1) // LLAvatar | 177 | if (avatar.AvatarType == 1) // LLAvatar |
178 | { | 178 | { |
@@ -228,32 +228,32 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
228 | bool success = response["Success"].AsBoolean(); | 228 | bool success = response["Success"].AsBoolean(); |
229 | 229 | ||
230 | if (!success) | 230 | if (!success) |
231 | m_log.Warn("[AVATAR CONNECTOR]: Failed saving appearance for " + userID + ": " + response["Message"].AsString()); | 231 | m_log.Warn("[SIMIAN AVATAR CONNECTOR]: Failed saving appearance for " + userID + ": " + response["Message"].AsString()); |
232 | 232 | ||
233 | return success; | 233 | return success; |
234 | } | 234 | } |
235 | else | 235 | else |
236 | { | 236 | { |
237 | m_log.Error("[AVATAR CONNECTOR]: Can't save appearance for " + userID + ". Unhandled avatar type " + avatar.AvatarType); | 237 | m_log.Error("[SIMIAN AVATAR CONNECTOR]: Can't save appearance for " + userID + ". Unhandled avatar type " + avatar.AvatarType); |
238 | return false; | 238 | return false; |
239 | } | 239 | } |
240 | } | 240 | } |
241 | 241 | ||
242 | public bool ResetAvatar(UUID userID) | 242 | public bool ResetAvatar(UUID userID) |
243 | { | 243 | { |
244 | m_log.Error("[AVATAR CONNECTOR]: ResetAvatar called for " + userID + ", implement this"); | 244 | m_log.Error("[SIMIAN AVATAR CONNECTOR]: ResetAvatar called for " + userID + ", implement this"); |
245 | return false; | 245 | return false; |
246 | } | 246 | } |
247 | 247 | ||
248 | public bool SetItems(UUID userID, string[] names, string[] values) | 248 | public bool SetItems(UUID userID, string[] names, string[] values) |
249 | { | 249 | { |
250 | m_log.Error("[AVATAR CONNECTOR]: SetItems called for " + userID + " with " + names.Length + " names and " + values.Length + " values, implement this"); | 250 | m_log.Error("[SIMIAN AVATAR CONNECTOR]: SetItems called for " + userID + " with " + names.Length + " names and " + values.Length + " values, implement this"); |
251 | return false; | 251 | return false; |
252 | } | 252 | } |
253 | 253 | ||
254 | public bool RemoveItems(UUID userID, string[] names) | 254 | public bool RemoveItems(UUID userID, string[] names) |
255 | { | 255 | { |
256 | m_log.Error("[AVATAR CONNECTOR]: RemoveItems called for " + userID + " with " + names.Length + " names, implement this"); | 256 | m_log.Error("[SIMIAN AVATAR CONNECTOR]: RemoveItems called for " + userID + " with " + names.Length + " names, implement this"); |
257 | return false; | 257 | return false; |
258 | } | 258 | } |
259 | 259 | ||
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs index 89eb72d..89f3594 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs | |||
@@ -89,14 +89,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
89 | IConfig assetConfig = source.Configs["FriendsService"]; | 89 | IConfig assetConfig = source.Configs["FriendsService"]; |
90 | if (assetConfig == null) | 90 | if (assetConfig == null) |
91 | { | 91 | { |
92 | m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini"); | 92 | m_log.Error("[SIMIAN FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini"); |
93 | throw new Exception("Friends connector init error"); | 93 | throw new Exception("Friends connector init error"); |
94 | } | 94 | } |
95 | 95 | ||
96 | string serviceURI = assetConfig.GetString("FriendsServerURI"); | 96 | string serviceURI = assetConfig.GetString("FriendsServerURI"); |
97 | if (String.IsNullOrEmpty(serviceURI)) | 97 | if (String.IsNullOrEmpty(serviceURI)) |
98 | { | 98 | { |
99 | m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService"); | 99 | m_log.Error("[SIMIAN FRIENDS CONNECTOR]: No Server URI named in section FriendsService"); |
100 | throw new Exception("Friends connector init error"); | 100 | throw new Exception("Friends connector init error"); |
101 | } | 101 | } |
102 | 102 | ||
@@ -169,7 +169,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
169 | bool success = response["Success"].AsBoolean(); | 169 | bool success = response["Success"].AsBoolean(); |
170 | 170 | ||
171 | if (!success) | 171 | if (!success) |
172 | m_log.Error("[FRIENDS CONNECTOR]: Failed to store friend " + friend + " for user " + principalID + ": " + response["Message"].AsString()); | 172 | m_log.Error("[SIMIAN FRIENDS CONNECTOR]: Failed to store friend " + friend + " for user " + principalID + ": " + response["Message"].AsString()); |
173 | 173 | ||
174 | return success; | 174 | return success; |
175 | } | 175 | } |
@@ -188,7 +188,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
188 | bool success = response["Success"].AsBoolean(); | 188 | bool success = response["Success"].AsBoolean(); |
189 | 189 | ||
190 | if (!success) | 190 | if (!success) |
191 | m_log.Error("[FRIENDS CONNECTOR]: Failed to remove friend " + friend + " for user " + principalID + ": " + response["Message"].AsString()); | 191 | m_log.Error("[SIMIAN FRIENDS CONNECTOR]: Failed to remove friend " + friend + " for user " + principalID + ": " + response["Message"].AsString()); |
192 | 192 | ||
193 | return success; | 193 | return success; |
194 | } | 194 | } |
@@ -211,7 +211,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
211 | } | 211 | } |
212 | else | 212 | else |
213 | { | 213 | { |
214 | m_log.Warn("[FRIENDS CONNECTOR]: Failed to retrieve friends for user " + ownerID + ": " + response["Message"].AsString()); | 214 | m_log.Warn("[SIMIAN FRIENDS CONNECTOR]: Failed to retrieve friends for user " + ownerID + ": " + response["Message"].AsString()); |
215 | return new OSDArray(0); | 215 | return new OSDArray(0); |
216 | } | 216 | } |
217 | } | 217 | } |
@@ -232,7 +232,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
232 | } | 232 | } |
233 | else | 233 | else |
234 | { | 234 | { |
235 | m_log.Warn("[FRIENDS CONNECTOR]: Failed to retrieve reverse friends for user " + ownerID + ": " + response["Message"].AsString()); | 235 | m_log.Warn("[SIMIAN FRIENDS CONNECTOR]: Failed to retrieve reverse friends for user " + ownerID + ": " + response["Message"].AsString()); |
236 | return new OSDArray(0); | 236 | return new OSDArray(0); |
237 | } | 237 | } |
238 | } | 238 | } |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 071a481..3a61226 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -85,14 +85,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
85 | IConfig gridConfig = source.Configs["GridService"]; | 85 | IConfig gridConfig = source.Configs["GridService"]; |
86 | if (gridConfig == null) | 86 | if (gridConfig == null) |
87 | { | 87 | { |
88 | m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini"); | 88 | m_log.Error("[SIMIAN GRID CONNECTOR]: GridService missing from OpenSim.ini"); |
89 | throw new Exception("Grid connector init error"); | 89 | throw new Exception("Grid connector init error"); |
90 | } | 90 | } |
91 | 91 | ||
92 | string serviceUrl = gridConfig.GetString("GridServerURI"); | 92 | string serviceUrl = gridConfig.GetString("GridServerURI"); |
93 | if (String.IsNullOrEmpty(serviceUrl)) | 93 | if (String.IsNullOrEmpty(serviceUrl)) |
94 | { | 94 | { |
95 | m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService"); | 95 | m_log.Error("[SIMIAN GRID CONNECTOR]: No Server URI named in section GridService"); |
96 | throw new Exception("Grid connector init error"); | 96 | throw new Exception("Grid connector init error"); |
97 | } | 97 | } |
98 | 98 | ||
@@ -155,7 +155,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
155 | bool success = response["Success"].AsBoolean(); | 155 | bool success = response["Success"].AsBoolean(); |
156 | 156 | ||
157 | if (!success) | 157 | if (!success) |
158 | m_log.Warn("[GRID CONNECTOR]: Region deregistration for " + regionID + " failed: " + response["Message"].AsString()); | 158 | m_log.Warn("[SIMIAN GRID CONNECTOR]: Region deregistration for " + regionID + " failed: " + response["Message"].AsString()); |
159 | 159 | ||
160 | return success; | 160 | return success; |
161 | } | 161 | } |
@@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
181 | } | 181 | } |
182 | } | 182 | } |
183 | 183 | ||
184 | m_log.Debug("[GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID); | 184 | m_log.Debug("[SIMIAN GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID); |
185 | return regions; | 185 | return regions; |
186 | } | 186 | } |
187 | 187 | ||
@@ -203,7 +203,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
203 | } | 203 | } |
204 | else | 204 | else |
205 | { | 205 | { |
206 | m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region " + regionID); | 206 | m_log.Warn("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region " + regionID); |
207 | return null; | 207 | return null; |
208 | } | 208 | } |
209 | } | 209 | } |
@@ -228,7 +228,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
228 | } | 228 | } |
229 | else | 229 | else |
230 | { | 230 | { |
231 | //m_log.InfoFormat("[GRID CONNECTOR]: Grid service did not find a match for region at {0},{1}", | 231 | //m_log.InfoFormat("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region at {0},{1}", |
232 | // x / Constants.RegionSize, y / Constants.RegionSize); | 232 | // x / Constants.RegionSize, y / Constants.RegionSize); |
233 | return null; | 233 | return null; |
234 | } | 234 | } |
@@ -238,7 +238,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
238 | { | 238 | { |
239 | List<GridRegion> regions = GetRegionsByName(scopeID, regionName, 1); | 239 | List<GridRegion> regions = GetRegionsByName(scopeID, regionName, 1); |
240 | 240 | ||
241 | m_log.Debug("[GRID CONNECTOR]: Got " + regions.Count + " matches for region name " + regionName); | 241 | m_log.Debug("[SIMIAN GRID CONNECTOR]: Got " + regions.Count + " matches for region name " + regionName); |
242 | 242 | ||
243 | if (regions.Count > 0) | 243 | if (regions.Count > 0) |
244 | return regions[0]; | 244 | return regions[0]; |
@@ -349,7 +349,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
349 | } | 349 | } |
350 | else | 350 | else |
351 | { | 351 | { |
352 | m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region " + regionID + " during region flags check"); | 352 | m_log.Warn("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region " + regionID + " during region flags check"); |
353 | return -1; | 353 | return -1; |
354 | } | 354 | } |
355 | } | 355 | } |
@@ -374,7 +374,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
374 | } | 374 | } |
375 | else | 375 | else |
376 | { | 376 | { |
377 | m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region at " + position); | 377 | m_log.Warn("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region at " + position); |
378 | return null; | 378 | return null; |
379 | } | 379 | } |
380 | } | 380 | } |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 67f8e80..56e7475 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -97,14 +97,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
97 | IConfig gridConfig = source.Configs["InventoryService"]; | 97 | IConfig gridConfig = source.Configs["InventoryService"]; |
98 | if (gridConfig == null) | 98 | if (gridConfig == null) |
99 | { | 99 | { |
100 | m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); | 100 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); |
101 | throw new Exception("Inventory connector init error"); | 101 | throw new Exception("Inventory connector init error"); |
102 | } | 102 | } |
103 | 103 | ||
104 | string serviceUrl = gridConfig.GetString("InventoryServerURI"); | 104 | string serviceUrl = gridConfig.GetString("InventoryServerURI"); |
105 | if (String.IsNullOrEmpty(serviceUrl)) | 105 | if (String.IsNullOrEmpty(serviceUrl)) |
106 | { | 106 | { |
107 | m_log.Error("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService"); | 107 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: No Server URI named in section InventoryService"); |
108 | throw new Exception("Inventory connector init error"); | 108 | throw new Exception("Inventory connector init error"); |
109 | } | 109 | } |
110 | 110 | ||
@@ -117,11 +117,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
117 | if (!String.IsNullOrEmpty(serviceUrl)) | 117 | if (!String.IsNullOrEmpty(serviceUrl)) |
118 | m_userServerUrl = serviceUrl; | 118 | m_userServerUrl = serviceUrl; |
119 | else | 119 | else |
120 | m_log.Info("[INVENTORY CONNECTOR]: No Server URI named in section UserAccountService"); | 120 | m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No Server URI named in section UserAccountService"); |
121 | } | 121 | } |
122 | else | 122 | else |
123 | { | 123 | { |
124 | m_log.Warn("[INVENTORY CONNECTOR]: UserAccountService missing from OpenSim.ini"); | 124 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: UserAccountService missing from OpenSim.ini"); |
125 | } | 125 | } |
126 | } | 126 | } |
127 | } | 127 | } |
@@ -143,7 +143,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
143 | bool success = response["Success"].AsBoolean(); | 143 | bool success = response["Success"].AsBoolean(); |
144 | 144 | ||
145 | if (!success) | 145 | if (!success) |
146 | m_log.Warn("[INVENTORY CONNECTOR]: Inventory creation for " + userID + " failed: " + response["Message"].AsString()); | 146 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Inventory creation for " + userID + " failed: " + response["Message"].AsString()); |
147 | 147 | ||
148 | return success; | 148 | return success; |
149 | } | 149 | } |
@@ -173,7 +173,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
173 | } | 173 | } |
174 | else | 174 | else |
175 | { | 175 | { |
176 | m_log.Warn("[INVENTORY CONNECTOR]: Failed to retrieve inventory skeleton for " + userID + ": " + | 176 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to retrieve inventory skeleton for " + userID + ": " + |
177 | response["Message"].AsString()); | 177 | response["Message"].AsString()); |
178 | return new List<InventoryFolderBase>(0); | 178 | return new List<InventoryFolderBase>(0); |
179 | } | 179 | } |
@@ -187,7 +187,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
187 | [Obsolete] | 187 | [Obsolete] |
188 | public InventoryCollection GetUserInventory(UUID userID) | 188 | public InventoryCollection GetUserInventory(UUID userID) |
189 | { | 189 | { |
190 | m_log.Error("[INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); | 190 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); |
191 | 191 | ||
192 | InventoryCollection inventory = new InventoryCollection(); | 192 | InventoryCollection inventory = new InventoryCollection(); |
193 | inventory.UserID = userID; | 193 | inventory.UserID = userID; |
@@ -206,7 +206,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
206 | [Obsolete] | 206 | [Obsolete] |
207 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | 207 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) |
208 | { | 208 | { |
209 | m_log.Error("[INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); | 209 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); |
210 | callback(new List<InventoryFolderImpl>(0), new List<InventoryItemBase>(0)); | 210 | callback(new List<InventoryFolderImpl>(0), new List<InventoryItemBase>(0)); |
211 | } | 211 | } |
212 | 212 | ||
@@ -273,7 +273,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
273 | } | 273 | } |
274 | else | 274 | else |
275 | { | 275 | { |
276 | m_log.Warn("[INVENTORY CONNECTOR]: Default folder not found for content type " + contentType); | 276 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Default folder not found for content type " + contentType + ": " + response["Message"].AsString()); |
277 | return GetRootFolder(userID); | 277 | return GetRootFolder(userID); |
278 | } | 278 | } |
279 | } | 279 | } |
@@ -311,7 +311,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
311 | } | 311 | } |
312 | } | 312 | } |
313 | 313 | ||
314 | m_log.Warn("[INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found"); | 314 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found"); |
315 | return null; | 315 | return null; |
316 | } | 316 | } |
317 | 317 | ||
@@ -376,7 +376,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
376 | } | 376 | } |
377 | else | 377 | else |
378 | { | 378 | { |
379 | m_log.Warn("[INVENTORY CONNECTOR]: Error fetching folder " + folderID + " content for " + userID + ": " + | 379 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error fetching folder " + folderID + " content for " + userID + ": " + |
380 | response["Message"].AsString()); | 380 | response["Message"].AsString()); |
381 | inventory.Folders = new List<InventoryFolderBase>(0); | 381 | inventory.Folders = new List<InventoryFolderBase>(0); |
382 | inventory.Items = new List<InventoryItemBase>(0); | 382 | inventory.Items = new List<InventoryItemBase>(0); |
@@ -414,7 +414,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
414 | } | 414 | } |
415 | else | 415 | else |
416 | { | 416 | { |
417 | m_log.Warn("[INVENTORY CONNECTOR]: Error fetching folder " + folderID + " for " + userID + ": " + | 417 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error fetching folder " + folderID + " for " + userID + ": " + |
418 | response["Message"].AsString()); | 418 | response["Message"].AsString()); |
419 | return new List<InventoryItemBase>(0); | 419 | return new List<InventoryItemBase>(0); |
420 | } | 420 | } |
@@ -442,7 +442,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
442 | 442 | ||
443 | if (!success) | 443 | if (!success) |
444 | { | 444 | { |
445 | m_log.Warn("[INVENTORY CONNECTOR]: Error creating folder " + folder.Name + " for " + folder.Owner + ": " + | 445 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error creating folder " + folder.Name + " for " + folder.Owner + ": " + |
446 | response["Message"].AsString()); | 446 | response["Message"].AsString()); |
447 | } | 447 | } |
448 | 448 | ||
@@ -506,7 +506,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
506 | 506 | ||
507 | if (!success) | 507 | if (!success) |
508 | { | 508 | { |
509 | m_log.Warn("[INVENTORY CONNECTOR]: Error removing item " + itemID + " for " + userID + ": " + | 509 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error removing item " + itemID + " for " + userID + ": " + |
510 | response["Message"].AsString()); | 510 | response["Message"].AsString()); |
511 | allSuccess = false; | 511 | allSuccess = false; |
512 | } | 512 | } |
@@ -534,7 +534,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
534 | 534 | ||
535 | if (!success) | 535 | if (!success) |
536 | { | 536 | { |
537 | m_log.Warn("[INVENTORY CONNECTOR]: Error purging folder " + folder.ID + " for " + folder.Owner + ": " + | 537 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error purging folder " + folder.ID + " for " + folder.Owner + ": " + |
538 | response["Message"].AsString()); | 538 | response["Message"].AsString()); |
539 | } | 539 | } |
540 | 540 | ||
@@ -562,7 +562,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
562 | UpdateGesture(item.Owner, item.ID, item.Flags == 1); | 562 | UpdateGesture(item.Owner, item.ID, item.Flags == 1); |
563 | 563 | ||
564 | if (item.BasePermissions == 0) | 564 | if (item.BasePermissions == 0) |
565 | m_log.WarnFormat("[INVENTORY CONNECTOR]: Adding inventory item {0} ({1}) with no base permissions", item.Name, item.ID); | 565 | m_log.WarnFormat("[SIMIAN INVENTORY CONNECTOR]: Adding inventory item {0} ({1}) with no base permissions", item.Name, item.ID); |
566 | 566 | ||
567 | OSDMap permissions = new OSDMap | 567 | OSDMap permissions = new OSDMap |
568 | { | 568 | { |
@@ -601,7 +601,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
601 | 601 | ||
602 | if (!success) | 602 | if (!success) |
603 | { | 603 | { |
604 | m_log.Warn("[INVENTORY CONNECTOR]: Error creating item " + item.Name + " for " + item.Owner + ": " + | 604 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error creating item " + item.Name + " for " + item.Owner + ": " + |
605 | response["Message"].AsString()); | 605 | response["Message"].AsString()); |
606 | } | 606 | } |
607 | 607 | ||
@@ -785,7 +785,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
785 | 785 | ||
786 | if (invItem.BasePermissions == 0) | 786 | if (invItem.BasePermissions == 0) |
787 | { | 787 | { |
788 | m_log.InfoFormat("[INVENTORY CONNECTOR]: Forcing item permissions to full for item {0} ({1})", | 788 | m_log.InfoFormat("[SIMIAN INVENTORY CONNECTOR]: Forcing item permissions to full for item {0} ({1})", |
789 | invItem.Name, invItem.ID); | 789 | invItem.Name, invItem.ID); |
790 | invItem.BasePermissions = (uint)PermissionMask.All; | 790 | invItem.BasePermissions = (uint)PermissionMask.All; |
791 | invItem.CurrentPermissions = (uint)PermissionMask.All; | 791 | invItem.CurrentPermissions = (uint)PermissionMask.All; |
@@ -820,7 +820,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
820 | 820 | ||
821 | if (!success) | 821 | if (!success) |
822 | { | 822 | { |
823 | m_log.Warn("[INVENTORY CONNECTOR]: Failed to move " + items.Count + " items to " + | 823 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to move " + items.Count + " items to " + |
824 | destFolderID + ": " + response["Message"].AsString()); | 824 | destFolderID + ": " + response["Message"].AsString()); |
825 | } | 825 | } |
826 | 826 | ||
@@ -863,12 +863,12 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
863 | if (gestures != null && gestures is OSDArray) | 863 | if (gestures != null && gestures is OSDArray) |
864 | return (OSDArray)gestures; | 864 | return (OSDArray)gestures; |
865 | else | 865 | else |
866 | m_log.Error("[INVENTORY CONNECTOR]: Unrecognized active gestures data for " + userID); | 866 | m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Unrecognized active gestures data for " + userID); |
867 | } | 867 | } |
868 | } | 868 | } |
869 | else | 869 | else |
870 | { | 870 | { |
871 | m_log.Warn("[INVENTORY CONNECTOR]: Failed to fetch active gestures for " + userID + ": " + | 871 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to fetch active gestures for " + userID + ": " + |
872 | response["Message"].AsString()); | 872 | response["Message"].AsString()); |
873 | } | 873 | } |
874 | 874 | ||
@@ -887,7 +887,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
887 | OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs); | 887 | OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs); |
888 | if (!response["Success"].AsBoolean()) | 888 | if (!response["Success"].AsBoolean()) |
889 | { | 889 | { |
890 | m_log.Warn("[INVENTORY CONNECTOR]: Failed to save active gestures for " + userID + ": " + | 890 | m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to save active gestures for " + userID + ": " + |
891 | response["Message"].AsString()); | 891 | response["Message"].AsString()); |
892 | } | 892 | } |
893 | } | 893 | } |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index f47bfbb..696be94 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | |||
@@ -109,14 +109,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
109 | IConfig gridConfig = source.Configs["PresenceService"]; | 109 | IConfig gridConfig = source.Configs["PresenceService"]; |
110 | if (gridConfig == null) | 110 | if (gridConfig == null) |
111 | { | 111 | { |
112 | m_log.Error("[PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini"); | 112 | m_log.Error("[SIMIAN PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini"); |
113 | throw new Exception("Presence connector init error"); | 113 | throw new Exception("Presence connector init error"); |
114 | } | 114 | } |
115 | 115 | ||
116 | string serviceUrl = gridConfig.GetString("PresenceServerURI"); | 116 | string serviceUrl = gridConfig.GetString("PresenceServerURI"); |
117 | if (String.IsNullOrEmpty(serviceUrl)) | 117 | if (String.IsNullOrEmpty(serviceUrl)) |
118 | { | 118 | { |
119 | m_log.Error("[PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService"); | 119 | m_log.Error("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService"); |
120 | throw new Exception("Presence connector init error"); | 120 | throw new Exception("Presence connector init error"); |
121 | } | 121 | } |
122 | 122 | ||
@@ -128,7 +128,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
128 | 128 | ||
129 | public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID) | 129 | public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID) |
130 | { | 130 | { |
131 | m_log.ErrorFormat("[PRESENCE CONNECTOR]: Login requested, UserID={0}, SessionID={1}, SecureSessionID={2}", | 131 | m_log.ErrorFormat("[SIMIAN PRESENCE CONNECTOR]: Login requested, UserID={0}, SessionID={1}, SecureSessionID={2}", |
132 | userID, sessionID, secureSessionID); | 132 | userID, sessionID, secureSessionID); |
133 | 133 | ||
134 | NameValueCollection requestArgs = new NameValueCollection | 134 | NameValueCollection requestArgs = new NameValueCollection |
@@ -146,14 +146,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
146 | bool success = response["Success"].AsBoolean(); | 146 | bool success = response["Success"].AsBoolean(); |
147 | 147 | ||
148 | if (!success) | 148 | if (!success) |
149 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to login agent " + userID + ": " + response["Message"].AsString()); | 149 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to login agent " + userID + ": " + response["Message"].AsString()); |
150 | 150 | ||
151 | return success; | 151 | return success; |
152 | } | 152 | } |
153 | 153 | ||
154 | public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookAt) | 154 | public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookAt) |
155 | { | 155 | { |
156 | m_log.InfoFormat("[PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID); | 156 | m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID); |
157 | 157 | ||
158 | NameValueCollection requestArgs = new NameValueCollection | 158 | NameValueCollection requestArgs = new NameValueCollection |
159 | { | 159 | { |
@@ -165,14 +165,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
165 | bool success = response["Success"].AsBoolean(); | 165 | bool success = response["Success"].AsBoolean(); |
166 | 166 | ||
167 | if (!success) | 167 | if (!success) |
168 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to logout agent with sessionID " + sessionID + ": " + response["Message"].AsString()); | 168 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to logout agent with sessionID " + sessionID + ": " + response["Message"].AsString()); |
169 | 169 | ||
170 | return success; | 170 | return success; |
171 | } | 171 | } |
172 | 172 | ||
173 | public bool LogoutRegionAgents(UUID regionID) | 173 | public bool LogoutRegionAgents(UUID regionID) |
174 | { | 174 | { |
175 | m_log.InfoFormat("[PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID); | 175 | m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID); |
176 | 176 | ||
177 | NameValueCollection requestArgs = new NameValueCollection | 177 | NameValueCollection requestArgs = new NameValueCollection |
178 | { | 178 | { |
@@ -184,14 +184,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
184 | bool success = response["Success"].AsBoolean(); | 184 | bool success = response["Success"].AsBoolean(); |
185 | 185 | ||
186 | if (!success) | 186 | if (!success) |
187 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to logout agents from region " + regionID + ": " + response["Message"].AsString()); | 187 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to logout agents from region " + regionID + ": " + response["Message"].AsString()); |
188 | 188 | ||
189 | return success; | 189 | return success; |
190 | } | 190 | } |
191 | 191 | ||
192 | public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt) | 192 | public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt) |
193 | { | 193 | { |
194 | //m_log.DebugFormat("[PRESENCE CONNECTOR]: Updating session data for agent with sessionID " + sessionID); | 194 | //m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Updating session data for agent with sessionID " + sessionID); |
195 | 195 | ||
196 | NameValueCollection requestArgs = new NameValueCollection | 196 | NameValueCollection requestArgs = new NameValueCollection |
197 | { | 197 | { |
@@ -206,14 +206,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
206 | bool success = response["Success"].AsBoolean(); | 206 | bool success = response["Success"].AsBoolean(); |
207 | 207 | ||
208 | if (!success) | 208 | if (!success) |
209 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to update agent session " + sessionID + ": " + response["Message"].AsString()); | 209 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to update agent session " + sessionID + ": " + response["Message"].AsString()); |
210 | 210 | ||
211 | return success; | 211 | return success; |
212 | } | 212 | } |
213 | 213 | ||
214 | public PresenceInfo GetAgent(UUID sessionID) | 214 | public PresenceInfo GetAgent(UUID sessionID) |
215 | { | 215 | { |
216 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID); | 216 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID); |
217 | 217 | ||
218 | NameValueCollection requestArgs = new NameValueCollection | 218 | NameValueCollection requestArgs = new NameValueCollection |
219 | { | 219 | { |
@@ -225,7 +225,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
225 | if (sessionResponse["Success"].AsBoolean()) | 225 | if (sessionResponse["Success"].AsBoolean()) |
226 | { | 226 | { |
227 | UUID userID = sessionResponse["UserID"].AsUUID(); | 227 | UUID userID = sessionResponse["UserID"].AsUUID(); |
228 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting user data for " + userID); | 228 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID); |
229 | 229 | ||
230 | requestArgs = new NameValueCollection | 230 | requestArgs = new NameValueCollection |
231 | { | 231 | { |
@@ -237,11 +237,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
237 | if (userResponse["Success"].AsBoolean()) | 237 | if (userResponse["Success"].AsBoolean()) |
238 | return ResponseToPresenceInfo(sessionResponse, userResponse); | 238 | return ResponseToPresenceInfo(sessionResponse, userResponse); |
239 | else | 239 | else |
240 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + userResponse["Message"].AsString()); | 240 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + userResponse["Message"].AsString()); |
241 | } | 241 | } |
242 | else | 242 | else |
243 | { | 243 | { |
244 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve session " + sessionID + ": " + sessionResponse["Message"].AsString()); | 244 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session " + sessionID + ": " + sessionResponse["Message"].AsString()); |
245 | } | 245 | } |
246 | 246 | ||
247 | return null; | 247 | return null; |
@@ -263,7 +263,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
263 | 263 | ||
264 | public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt) | 264 | public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt) |
265 | { | 265 | { |
266 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Setting home location for user " + userID); | 266 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user " + userID); |
267 | 267 | ||
268 | NameValueCollection requestArgs = new NameValueCollection | 268 | NameValueCollection requestArgs = new NameValueCollection |
269 | { | 269 | { |
@@ -276,7 +276,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
276 | bool success = response["Success"].AsBoolean(); | 276 | bool success = response["Success"].AsBoolean(); |
277 | 277 | ||
278 | if (!success) | 278 | if (!success) |
279 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to set home location for " + userID + ": " + response["Message"].AsString()); | 279 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to set home location for " + userID + ": " + response["Message"].AsString()); |
280 | 280 | ||
281 | return success; | 281 | return success; |
282 | } | 282 | } |
@@ -335,7 +335,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
335 | 335 | ||
336 | private OSDMap GetUserData(UUID userID) | 336 | private OSDMap GetUserData(UUID userID) |
337 | { | 337 | { |
338 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting user data for " + userID); | 338 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID); |
339 | 339 | ||
340 | NameValueCollection requestArgs = new NameValueCollection | 340 | NameValueCollection requestArgs = new NameValueCollection |
341 | { | 341 | { |
@@ -347,14 +347,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
347 | if (response["Success"].AsBoolean() && response["User"] is OSDMap) | 347 | if (response["Success"].AsBoolean() && response["User"] is OSDMap) |
348 | return response; | 348 | return response; |
349 | else | 349 | else |
350 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + response["Message"].AsString()); | 350 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + response["Message"].AsString()); |
351 | 351 | ||
352 | return null; | 352 | return null; |
353 | } | 353 | } |
354 | 354 | ||
355 | private OSDMap GetSessionData(UUID sessionID) | 355 | private OSDMap GetSessionData(UUID sessionID) |
356 | { | 356 | { |
357 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting session data for session " + sessionID); | 357 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for session " + sessionID); |
358 | 358 | ||
359 | NameValueCollection requestArgs = new NameValueCollection | 359 | NameValueCollection requestArgs = new NameValueCollection |
360 | { | 360 | { |
@@ -366,7 +366,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
366 | if (response["Success"].AsBoolean()) | 366 | if (response["Success"].AsBoolean()) |
367 | return response; | 367 | return response; |
368 | else | 368 | else |
369 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID); | 369 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID); |
370 | 370 | ||
371 | return null; | 371 | return null; |
372 | } | 372 | } |
@@ -378,7 +378,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
378 | OSDMap userResponse = GetUserData(userID); | 378 | OSDMap userResponse = GetUserData(userID); |
379 | if (userResponse != null) | 379 | if (userResponse != null) |
380 | { | 380 | { |
381 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting sessions for " + userID); | 381 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting sessions for " + userID); |
382 | 382 | ||
383 | NameValueCollection requestArgs = new NameValueCollection | 383 | NameValueCollection requestArgs = new NameValueCollection |
384 | { | 384 | { |
@@ -395,7 +395,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
395 | } | 395 | } |
396 | else | 396 | else |
397 | { | 397 | { |
398 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve sessions for " + userID + ": " + response["Message"].AsString()); | 398 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions for " + userID + ": " + response["Message"].AsString()); |
399 | } | 399 | } |
400 | } | 400 | } |
401 | 401 | ||
@@ -428,7 +428,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
428 | } | 428 | } |
429 | else | 429 | else |
430 | { | 430 | { |
431 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve presence information for session " + sessionID + | 431 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve presence information for session " + sessionID + |
432 | " while saving last location: " + response["Message"].AsString()); | 432 | " while saving last location: " + response["Message"].AsString()); |
433 | } | 433 | } |
434 | 434 | ||
@@ -448,7 +448,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
448 | bool success = response["Success"].AsBoolean(); | 448 | bool success = response["Success"].AsBoolean(); |
449 | 449 | ||
450 | if (!success) | 450 | if (!success) |
451 | m_log.Warn("[PRESENCE CONNECTOR]: Failed to set last location for " + userID + ": " + response["Message"].AsString()); | 451 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to set last location for " + userID + ": " + response["Message"].AsString()); |
452 | 452 | ||
453 | return success; | 453 | return success; |
454 | } | 454 | } |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs index 0a36ae5..fbf4648 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |||
@@ -93,14 +93,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
93 | IConfig gridConfig = source.Configs["UserAccountService"]; | 93 | IConfig gridConfig = source.Configs["UserAccountService"]; |
94 | if (gridConfig == null) | 94 | if (gridConfig == null) |
95 | { | 95 | { |
96 | m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini"); | 96 | m_log.Error("[SIMIAN PROFILES]: UserAccountService missing from OpenSim.ini"); |
97 | throw new Exception("Profiles init error"); | 97 | throw new Exception("Profiles init error"); |
98 | } | 98 | } |
99 | 99 | ||
100 | string serviceUrl = gridConfig.GetString("UserAccountServerURI"); | 100 | string serviceUrl = gridConfig.GetString("UserAccountServerURI"); |
101 | if (String.IsNullOrEmpty(serviceUrl)) | 101 | if (String.IsNullOrEmpty(serviceUrl)) |
102 | { | 102 | { |
103 | m_log.Error("[PROFILES]: No UserAccountServerURI in section UserAccountService"); | 103 | m_log.Error("[SIMIAN PROFILES]: No UserAccountServerURI in section UserAccountService"); |
104 | throw new Exception("Profiles init error"); | 104 | throw new Exception("Profiles init error"); |
105 | } | 105 | } |
106 | 106 | ||
@@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
153 | UUID targetAvatarID; | 153 | UUID targetAvatarID; |
154 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) | 154 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) |
155 | { | 155 | { |
156 | m_log.Error("[PROFILES]: Unrecognized arguments for " + method); | 156 | m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); |
157 | return; | 157 | return; |
158 | } | 158 | } |
159 | 159 | ||
@@ -193,7 +193,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
193 | UUID targetAvatarID; | 193 | UUID targetAvatarID; |
194 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) | 194 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) |
195 | { | 195 | { |
196 | m_log.Error("[PROFILES]: Unrecognized arguments for " + method); | 196 | m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); |
197 | return; | 197 | return; |
198 | } | 198 | } |
199 | 199 | ||
@@ -211,7 +211,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
211 | UUID pickID; | 211 | UUID pickID; |
212 | if (args.Count < 2 || !UUID.TryParse(args[0], out avatarID) || !UUID.TryParse(args[1], out pickID)) | 212 | if (args.Count < 2 || !UUID.TryParse(args[0], out avatarID) || !UUID.TryParse(args[1], out pickID)) |
213 | { | 213 | { |
214 | m_log.Error("[PROFILES]: Unrecognized arguments for " + method); | 214 | m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); |
215 | return; | 215 | return; |
216 | } | 216 | } |
217 | 217 | ||
@@ -244,7 +244,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
244 | UUID targetAvatarID; | 244 | UUID targetAvatarID; |
245 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) | 245 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) |
246 | { | 246 | { |
247 | m_log.Error("[PROFILES]: Unrecognized arguments for " + method); | 247 | m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); |
248 | return; | 248 | return; |
249 | } | 249 | } |
250 | 250 | ||
@@ -305,7 +305,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
305 | } | 305 | } |
306 | else | 306 | else |
307 | { | 307 | { |
308 | m_log.Warn("[PROFILES]: Failed to fetch profile information for " + client.Name + ", returning default values"); | 308 | m_log.Warn("[SIMIAN PROFILES]: Failed to fetch profile information for " + client.Name + ", returning default values"); |
309 | client.SendAvatarProperties(avatarID, String.Empty, "1/1/1970", Utils.EmptyBytes, | 309 | client.SendAvatarProperties(avatarID, String.Empty, "1/1/1970", Utils.EmptyBytes, |
310 | String.Empty, (uint)flags, UUID.Zero, UUID.Zero, String.Empty, UUID.Zero); | 310 | String.Empty, (uint)flags, UUID.Zero, UUID.Zero, String.Empty, UUID.Zero); |
311 | } | 311 | } |
@@ -342,7 +342,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
342 | 342 | ||
343 | private void UserInfoRequestHandler(IClientAPI client) | 343 | private void UserInfoRequestHandler(IClientAPI client) |
344 | { | 344 | { |
345 | m_log.Error("[PROFILES]: UserInfoRequestHandler"); | 345 | m_log.Error("[SIMIAN PROFILES]: UserInfoRequestHandler"); |
346 | 346 | ||
347 | // Fetch this user's e-mail address | 347 | // Fetch this user's e-mail address |
348 | NameValueCollection requestArgs = new NameValueCollection | 348 | NameValueCollection requestArgs = new NameValueCollection |
@@ -355,14 +355,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
355 | string email = response["Email"].AsString(); | 355 | string email = response["Email"].AsString(); |
356 | 356 | ||
357 | if (!response["Success"].AsBoolean()) | 357 | if (!response["Success"].AsBoolean()) |
358 | m_log.Warn("[PROFILES]: GetUser failed during a user info request for " + client.Name); | 358 | m_log.Warn("[SIMIAN PROFILES]: GetUser failed during a user info request for " + client.Name); |
359 | 359 | ||
360 | client.SendUserInfoReply(false, true, email); | 360 | client.SendUserInfoReply(false, true, email); |
361 | } | 361 | } |
362 | 362 | ||
363 | private void UpdateUserInfoHandler(bool imViaEmail, bool visible, IClientAPI client) | 363 | private void UpdateUserInfoHandler(bool imViaEmail, bool visible, IClientAPI client) |
364 | { | 364 | { |
365 | m_log.Info("[PROFILES]: Ignoring user info update from " + client.Name); | 365 | m_log.Info("[SIMIAN PROFILES]: Ignoring user info update from " + client.Name); |
366 | } | 366 | } |
367 | 367 | ||
368 | #endregion Profiles | 368 | #endregion Profiles |
@@ -380,7 +380,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
380 | UserAccount admin = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, UUID.Zero); | 380 | UserAccount admin = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, UUID.Zero); |
381 | if (admin != null) | 381 | if (admin != null) |
382 | { | 382 | { |
383 | m_log.InfoFormat("[PROFILES]: Setting estate {0} (ID: {1}) owner to {2}", estate.EstateName, | 383 | m_log.InfoFormat("[SIMIAN PROFILES]: Setting estate {0} (ID: {1}) owner to {2}", estate.EstateName, |
384 | estate.EstateID, admin.Name); | 384 | estate.EstateID, admin.Name); |
385 | 385 | ||
386 | estate.EstateOwner = admin.PrincipalID; | 386 | estate.EstateOwner = admin.PrincipalID; |
@@ -388,7 +388,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
388 | } | 388 | } |
389 | else | 389 | else |
390 | { | 390 | { |
391 | m_log.WarnFormat("[PROFILES]: Estate {0} (ID: {1}) does not have an owner", estate.EstateName, estate.EstateID); | 391 | m_log.WarnFormat("[SIMIAN PROFILES]: Estate {0} (ID: {1}) does not have an owner", estate.EstateName, estate.EstateID); |
392 | } | 392 | } |
393 | } | 393 | } |
394 | } | 394 | } |
@@ -406,7 +406,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
406 | bool success = response["Success"].AsBoolean(); | 406 | bool success = response["Success"].AsBoolean(); |
407 | 407 | ||
408 | if (!success) | 408 | if (!success) |
409 | m_log.WarnFormat("[PROFILES]: Failed to add user data with key {0} for {1}: {2}", key, userID, response["Message"].AsString()); | 409 | m_log.WarnFormat("[SIMIAN PROFILES]: Failed to add user data with key {0} for {1}: {2}", key, userID, response["Message"].AsString()); |
410 | 410 | ||
411 | return success; | 411 | return success; |
412 | } | 412 | } |
@@ -426,7 +426,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
426 | } | 426 | } |
427 | else | 427 | else |
428 | { | 428 | { |
429 | m_log.Error("[PROFILES]: Failed to fetch user data for " + userID + ": " + response["Message"].AsString()); | 429 | m_log.Error("[SIMIAN PROFILES]: Failed to fetch user data for " + userID + ": " + response["Message"].AsString()); |
430 | } | 430 | } |
431 | 431 | ||
432 | return null; | 432 | return null; |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 491a9a2..874f1a2 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -82,14 +82,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
82 | IConfig assetConfig = source.Configs["UserAccountService"]; | 82 | IConfig assetConfig = source.Configs["UserAccountService"]; |
83 | if (assetConfig == null) | 83 | if (assetConfig == null) |
84 | { | 84 | { |
85 | m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini"); | 85 | m_log.Error("[SIMIAN ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini"); |
86 | throw new Exception("User account connector init error"); | 86 | throw new Exception("User account connector init error"); |
87 | } | 87 | } |
88 | 88 | ||
89 | string serviceURI = assetConfig.GetString("UserAccountServerURI"); | 89 | string serviceURI = assetConfig.GetString("UserAccountServerURI"); |
90 | if (String.IsNullOrEmpty(serviceURI)) | 90 | if (String.IsNullOrEmpty(serviceURI)) |
91 | { | 91 | { |
92 | m_log.Error("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector"); | 92 | m_log.Error("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector"); |
93 | throw new Exception("User account connector init error"); | 93 | throw new Exception("User account connector init error"); |
94 | } | 94 | } |
95 | 95 | ||
@@ -140,7 +140,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
140 | { | 140 | { |
141 | List<UserAccount> accounts = new List<UserAccount>(); | 141 | List<UserAccount> accounts = new List<UserAccount>(); |
142 | 142 | ||
143 | m_log.DebugFormat("[ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query); | 143 | m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query); |
144 | 144 | ||
145 | NameValueCollection requestArgs = new NameValueCollection | 145 | NameValueCollection requestArgs = new NameValueCollection |
146 | { | 146 | { |
@@ -163,12 +163,12 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
163 | } | 163 | } |
164 | else | 164 | else |
165 | { | 165 | { |
166 | m_log.Warn("[ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); | 166 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); |
167 | } | 167 | } |
168 | } | 168 | } |
169 | else | 169 | else |
170 | { | 170 | { |
171 | m_log.Warn("[ACCOUNT CONNECTOR]: Failed to search for account data by name " + query); | 171 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to search for account data by name " + query); |
172 | } | 172 | } |
173 | 173 | ||
174 | return accounts; | 174 | return accounts; |
@@ -176,7 +176,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
176 | 176 | ||
177 | public bool StoreUserAccount(UserAccount data) | 177 | public bool StoreUserAccount(UserAccount data) |
178 | { | 178 | { |
179 | m_log.InfoFormat("[ACCOUNT CONNECTOR]: Storing user account for " + data.Name); | 179 | m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name); |
180 | 180 | ||
181 | NameValueCollection requestArgs = new NameValueCollection | 181 | NameValueCollection requestArgs = new NameValueCollection |
182 | { | 182 | { |
@@ -191,7 +191,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
191 | 191 | ||
192 | if (response["Success"].AsBoolean()) | 192 | if (response["Success"].AsBoolean()) |
193 | { | 193 | { |
194 | m_log.InfoFormat("[ACCOUNT CONNECTOR]: Storing user account data for " + data.Name); | 194 | m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account data for " + data.Name); |
195 | 195 | ||
196 | requestArgs = new NameValueCollection | 196 | requestArgs = new NameValueCollection |
197 | { | 197 | { |
@@ -212,14 +212,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
212 | } | 212 | } |
213 | else | 213 | else |
214 | { | 214 | { |
215 | m_log.Warn("[ACCOUNT CONNECTOR]: Failed to store user account data for " + data.Name + ": " + response["Message"].AsString()); | 215 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to store user account data for " + data.Name + ": " + response["Message"].AsString()); |
216 | } | 216 | } |
217 | 217 | ||
218 | return success; | 218 | return success; |
219 | } | 219 | } |
220 | else | 220 | else |
221 | { | 221 | { |
222 | m_log.Warn("[ACCOUNT CONNECTOR]: Failed to store user account for " + data.Name + ": " + response["Message"].AsString()); | 222 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to store user account for " + data.Name + ": " + response["Message"].AsString()); |
223 | } | 223 | } |
224 | 224 | ||
225 | return false; | 225 | return false; |
@@ -233,7 +233,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
233 | private UserAccount GetUser(NameValueCollection requestArgs) | 233 | private UserAccount GetUser(NameValueCollection requestArgs) |
234 | { | 234 | { |
235 | string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; | 235 | string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; |
236 | m_log.DebugFormat("[ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); | 236 | m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); |
237 | 237 | ||
238 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 238 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); |
239 | if (response["Success"].AsBoolean()) | 239 | if (response["Success"].AsBoolean()) |
@@ -242,11 +242,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
242 | if (user != null) | 242 | if (user != null) |
243 | return ResponseToUserAccount(user); | 243 | return ResponseToUserAccount(user); |
244 | else | 244 | else |
245 | m_log.Warn("[ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); | 245 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); |
246 | } | 246 | } |
247 | else | 247 | else |
248 | { | 248 | { |
249 | m_log.Warn("[ACCOUNT CONNECTOR]: Failed to lookup user account with query: " + lookupValue); | 249 | m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to lookup user account with query: " + lookupValue); |
250 | } | 250 | } |
251 | 251 | ||
252 | return null; | 252 | return null; |