diff options
author | Diva Canto | 2009-12-28 11:46:34 -0800 |
---|---|---|
committer | Diva Canto | 2009-12-28 11:46:34 -0800 |
commit | 43691e827070f630a2acfbb70d88c1aa555f3f4d (patch) | |
tree | 7bd3ae3b7762c2bddbc7bc071003dc29c34cdc29 | |
parent | Add the migration for friends and guard the presence Report function (diff) | |
download | opensim-SC_OLD-43691e827070f630a2acfbb70d88c1aa555f3f4d.zip opensim-SC_OLD-43691e827070f630a2acfbb70d88c1aa555f3f4d.tar.gz opensim-SC_OLD-43691e827070f630a2acfbb70d88c1aa555f3f4d.tar.bz2 opensim-SC_OLD-43691e827070f630a2acfbb70d88c1aa555f3f4d.tar.xz |
Added some more log messages. This is beginning to work.
3 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs index 150728f..3ca5560 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs | |||
@@ -26,17 +26,21 @@ | |||
26 | */ | 26 | */ |
27 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | ||
29 | 30 | ||
30 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
31 | using OpenSim.Region.Framework.Scenes; | 32 | using OpenSim.Region.Framework.Scenes; |
32 | using OpenSim.Services.Interfaces; | 33 | using OpenSim.Services.Interfaces; |
33 | 34 | ||
34 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using log4net; | ||
35 | 37 | ||
36 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence | 38 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence |
37 | { | 39 | { |
38 | public class PresenceDetector | 40 | public class PresenceDetector |
39 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | |||
40 | private IPresenceService m_PresenceService; | 44 | private IPresenceService m_PresenceService; |
41 | 45 | ||
42 | public PresenceDetector(IPresenceService presenceservice) | 46 | public PresenceDetector(IPresenceService presenceservice) |
@@ -62,6 +66,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence | |||
62 | 66 | ||
63 | public void OnMakeRootAgent(ScenePresence sp) | 67 | public void OnMakeRootAgent(ScenePresence sp) |
64 | { | 68 | { |
69 | m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName); | ||
65 | m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); | 70 | m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); |
66 | } | 71 | } |
67 | 72 | ||
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index fe36bd0..adbf430 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs | |||
@@ -41,13 +41,14 @@ namespace OpenSim.Services.PresenceService | |||
41 | { | 41 | { |
42 | public class PresenceService : PresenceServiceBase, IPresenceService | 42 | public class PresenceService : PresenceServiceBase, IPresenceService |
43 | { | 43 | { |
44 | // private static readonly ILog m_log = | 44 | private static readonly ILog m_log = |
45 | // LogManager.GetLogger( | 45 | LogManager.GetLogger( |
46 | // MethodBase.GetCurrentMethod().DeclaringType); | 46 | MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | public PresenceService(IConfigSource config) | 48 | public PresenceService(IConfigSource config) |
49 | : base(config) | 49 | : base(config) |
50 | { | 50 | { |
51 | m_log.Debug("[PRESENCE SERVICE]: Starting presence service"); | ||
51 | } | 52 | } |
52 | 53 | ||
53 | public bool LoginAgent(string userID, UUID sessionID, | 54 | public bool LoginAgent(string userID, UUID sessionID, |
@@ -93,8 +94,9 @@ namespace OpenSim.Services.PresenceService | |||
93 | 94 | ||
94 | public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt) | 95 | public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt) |
95 | { | 96 | { |
97 | m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID); | ||
96 | return m_Database.ReportAgent(sessionID, regionID, | 98 | return m_Database.ReportAgent(sessionID, regionID, |
97 | position.ToString(), lookAt.ToString()); | 99 | position.ToString(), lookAt.ToString()); |
98 | } | 100 | } |
99 | 101 | ||
100 | public PresenceInfo GetAgent(UUID sessionID) | 102 | public PresenceInfo GetAgent(UUID sessionID) |
diff --git a/OpenSim/Services/PresenceService/PresenceServiceBase.cs b/OpenSim/Services/PresenceService/PresenceServiceBase.cs index 41e2d9c..3ca70c1 100644 --- a/OpenSim/Services/PresenceService/PresenceServiceBase.cs +++ b/OpenSim/Services/PresenceService/PresenceServiceBase.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Services.PresenceService | |||
44 | { | 44 | { |
45 | string dllName = String.Empty; | 45 | string dllName = String.Empty; |
46 | string connString = String.Empty; | 46 | string connString = String.Empty; |
47 | string realm = "Presence"; | 47 | string realm = "presence"; |
48 | 48 | ||
49 | // | 49 | // |
50 | // Try reading the [DatabaseService] section, if it exists | 50 | // Try reading the [DatabaseService] section, if it exists |