diff options
author | John Hurliman | 2010-02-22 14:10:19 -0800 |
---|---|---|
committer | John Hurliman | 2010-02-22 14:10:19 -0800 |
commit | 71c6559a91a58d93588dcdd8c74b5fce0c1a3780 (patch) | |
tree | cca5b1ea88ad4b29156767afdd77e37ec072c8a7 /OpenSim/Data/Null | |
parent | * Adds CreatorID to asset metadata. This is just the plumbing to support Crea... (diff) | |
parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
download | opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.zip opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.gz opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.bz2 opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.xz |
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Data/Null')
-rw-r--r-- | OpenSim/Data/Null/NullPresenceData.cs | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs index 40700cf..5f78691 100644 --- a/OpenSim/Data/Null/NullPresenceData.cs +++ b/OpenSim/Data/Null/NullPresenceData.cs | |||
@@ -43,16 +43,18 @@ namespace OpenSim.Data.Null | |||
43 | public NullPresenceData(string connectionString, string realm) | 43 | public NullPresenceData(string connectionString, string realm) |
44 | { | 44 | { |
45 | if (Instance == null) | 45 | if (Instance == null) |
46 | { | ||
46 | Instance = this; | 47 | Instance = this; |
47 | 48 | ||
48 | //Console.WriteLine("[XXX] NullRegionData constructor"); | 49 | //Console.WriteLine("[XXX] NullRegionData constructor"); |
49 | // Let's stick in a test presence | 50 | // Let's stick in a test presence |
50 | PresenceData p = new PresenceData(); | 51 | PresenceData p = new PresenceData(); |
51 | p.SessionID = UUID.Zero; | 52 | p.SessionID = UUID.Zero; |
52 | p.UserID = UUID.Zero.ToString(); | 53 | p.UserID = UUID.Zero.ToString(); |
53 | p.Data = new Dictionary<string, string>(); | 54 | p.Data = new Dictionary<string, string>(); |
54 | p.Data["Online"] = "true"; | 55 | p.Data["Online"] = true.ToString(); |
55 | m_presenceData.Add(UUID.Zero, p); | 56 | m_presenceData.Add(UUID.Zero, p); |
57 | } | ||
56 | } | 58 | } |
57 | 59 | ||
58 | public bool Store(PresenceData data) | 60 | public bool Store(PresenceData data) |
@@ -70,7 +72,9 @@ namespace OpenSim.Data.Null | |||
70 | return Instance.Get(sessionID); | 72 | return Instance.Get(sessionID); |
71 | 73 | ||
72 | if (m_presenceData.ContainsKey(sessionID)) | 74 | if (m_presenceData.ContainsKey(sessionID)) |
75 | { | ||
73 | return m_presenceData[sessionID]; | 76 | return m_presenceData[sessionID]; |
77 | } | ||
74 | 78 | ||
75 | return null; | 79 | return null; |
76 | } | 80 | } |