aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authordahlia2009-11-20 03:12:36 -0800
committerdahlia2009-11-20 03:12:36 -0800
commit0561cf7d9348e97e77983fedb8f7124edea02eb6 (patch)
tree3de4494e036327b6fa5c294b64f88ef0ff6f7bfc /OpenSim/Services
parentremove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a s... (diff)
parentminor: tweak log message to say which region is being enabled for logins (diff)
downloadopensim-SC_OLD-0561cf7d9348e97e77983fedb8f7124edea02eb6.zip
opensim-SC_OLD-0561cf7d9348e97e77983fedb8f7124edea02eb6.tar.gz
opensim-SC_OLD-0561cf7d9348e97e77983fedb8f7124edea02eb6.tar.bz2
opensim-SC_OLD-0561cf7d9348e97e77983fedb8f7124edea02eb6.tar.xz
Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs44
-rw-r--r--OpenSim/Services/Interfaces/IPresenceService.cs8
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs14
3 files changed, 43 insertions, 23 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index e047f71..f86b453 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -231,13 +231,14 @@ namespace OpenSim.Services.Connectors
231 } 231 }
232 catch (TimeoutException e) 232 catch (TimeoutException e)
233 { 233 {
234 m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation to {0} timed out {0} {1}.", m_ServerURI, 234 m_log.ErrorFormat(
235 e.Source, e.Message); 235 "[INVENTORY CONNECTOR]: GetFolderContent operation to {0} for {1} timed out {2} {3}.",
236 m_ServerURI, folderID, e.Source, e.Message);
236 } 237 }
237 catch (Exception e) 238 catch (Exception e)
238 { 239 {
239 m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed, {0} {1} (old server?).", 240 m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed for {0}, {1} {2} (old server?).",
240 e.Source, e.Message); 241 folderID, e.Source, e.Message);
241 } 242 }
242 243
243 InventoryCollection nullCollection = new InventoryCollection(); 244 InventoryCollection nullCollection = new InventoryCollection();
@@ -256,8 +257,8 @@ namespace OpenSim.Services.Connectors
256 } 257 }
257 catch (Exception e) 258 catch (Exception e)
258 { 259 {
259 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory folder operation failed, {0} {1}", 260 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory folder operation failed for {0} {1}, {2} {3}",
260 e.Source, e.Message); 261 folder.Name, folder.ID, e.Source, e.Message);
261 } 262 }
262 263
263 return false; 264 return false;
@@ -272,8 +273,8 @@ namespace OpenSim.Services.Connectors
272 } 273 }
273 catch (Exception e) 274 catch (Exception e)
274 { 275 {
275 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update inventory folder operation failed, {0} {1}", 276 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update inventory folder operation failed for {0} {1}, {2} {3}",
276 e.Source, e.Message); 277 folder.Name, folder.ID, e.Source, e.Message);
277 } 278 }
278 279
279 return false; 280 return false;
@@ -307,8 +308,8 @@ namespace OpenSim.Services.Connectors
307 } 308 }
308 catch (Exception e) 309 catch (Exception e)
309 { 310 {
310 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory folder operation failed, {0} {1}", 311 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory folder operation failed for {0} {1}, {2} {3}",
311 e.Source, e.Message); 312 folder.Name, folder.ID, e.Source, e.Message);
312 } 313 }
313 314
314 return false; 315 return false;
@@ -323,8 +324,8 @@ namespace OpenSim.Services.Connectors
323 } 324 }
324 catch (Exception e) 325 catch (Exception e)
325 { 326 {
326 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory folder operation failed, {0} {1}", 327 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Purge inventory folder operation failed for {0} {1}, {2} {3}",
327 e.Source, e.Message); 328 folder.Name, folder.ID, e.Source, e.Message);
328 } 329 }
329 330
330 return false; 331 return false;
@@ -340,8 +341,8 @@ namespace OpenSim.Services.Connectors
340 } 341 }
341 catch (Exception e) 342 catch (Exception e)
342 { 343 {
343 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Get folder items operation failed, {0} {1}", 344 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Get folder items operation failed for folder {0}, {1} {2}",
344 e.Source, e.Message); 345 folderID, e.Source, e.Message);
345 } 346 }
346 347
347 return null; 348 return null;
@@ -356,8 +357,8 @@ namespace OpenSim.Services.Connectors
356 } 357 }
357 catch (Exception e) 358 catch (Exception e)
358 { 359 {
359 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory item operation failed, {0} {1}", 360 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory item operation failed for {0} {1}, {2} {3}",
360 e.Source, e.Message); 361 item.Name, item.ID, e.Source, e.Message);
361 } 362 }
362 363
363 return false; 364 return false;
@@ -372,8 +373,8 @@ namespace OpenSim.Services.Connectors
372 } 373 }
373 catch (Exception e) 374 catch (Exception e)
374 { 375 {
375 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update new inventory item operation failed, {0} {1}", 376 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update new inventory item operation failed for {0} {1}, {2} {3}",
376 e.Source, e.Message); 377 item.Name, item.ID, e.Source, e.Message);
377 } 378 }
378 379
379 return false; 380 return false;
@@ -443,7 +444,7 @@ namespace OpenSim.Services.Connectors
443 } 444 }
444 catch (Exception e) 445 catch (Exception e)
445 { 446 {
446 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Delete inventory item operation failed, {0} {1}", 447 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Delete inventory items operation failed, {0} {1}",
447 e.Source, e.Message); 448 e.Source, e.Message);
448 } 449 }
449 450
@@ -475,7 +476,7 @@ namespace OpenSim.Services.Connectors
475 } 476 }
476 catch (Exception e) 477 catch (Exception e)
477 { 478 {
478 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Query inventory item operation failed, {0} {1}", 479 m_log.ErrorFormat("[INVENTORY CONNECTOR]: Query inventory folder operation failed, {0} {1}",
479 e.Source, e.Message); 480 e.Source, e.Message);
480 } 481 }
481 482
@@ -576,9 +577,6 @@ namespace OpenSim.Services.Connectors
576 } 577 }
577 578
578 callback(folders, items); 579 callback(folders, items);
579
580 } 580 }
581
582
583 } 581 }
584} 582}
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index d33b6bc..aa1c5bf 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -31,7 +31,15 @@ using OpenMetaverse;
31 31
32namespace OpenSim.Services.Interfaces 32namespace OpenSim.Services.Interfaces
33{ 33{
34 public class PresenceInfo
35 {
36 public UUID PrincipalID;
37 public UUID RegionID;
38 public Dictionary<string, string> Data;
39 }
40
34 public interface IPresenceService 41 public interface IPresenceService
35 { 42 {
43 bool Report(PresenceInfo presence);
36 } 44 }
37} 45}
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index ba8eec8..2157462 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -49,5 +49,19 @@ namespace OpenSim.Services.PresenceService
49 : base(config) 49 : base(config)
50 { 50 {
51 } 51 }
52
53 public bool Report(PresenceInfo presence)
54 {
55 PresenceData p = new PresenceData();
56 p.Data = new Dictionary<string, string>();
57
58 p.UUID = presence.PrincipalID;
59 p.currentRegion = presence.RegionID;
60
61 foreach (KeyValuePair<string, string> kvp in presence.Data)
62 p.Data[kvp.Key] = kvp.Value;
63
64 return false;
65 }
52 } 66 }
53} 67}