aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/PresenceService
diff options
context:
space:
mode:
authorMelanie2010-05-28 21:56:42 +0100
committerMelanie2010-05-28 21:56:42 +0100
commit542e6b8af4c9b8aa2ba753dbaed5032fb5293024 (patch)
tree4acfe25e2388f35da48f7eaf3b312d85f149625f /OpenSim/Services/PresenceService
parentMerge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/car... (diff)
parentget TestSaveIarV0_1() uncommented but not running as a test yet since I didn'... (diff)
downloadopensim-SC-542e6b8af4c9b8aa2ba753dbaed5032fb5293024.zip
opensim-SC-542e6b8af4c9b8aa2ba753dbaed5032fb5293024.tar.gz
opensim-SC-542e6b8af4c9b8aa2ba753dbaed5032fb5293024.tar.bz2
opensim-SC-542e6b8af4c9b8aa2ba753dbaed5032fb5293024.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/PresenceService')
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 19f636a..601a69f 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -54,7 +54,8 @@ namespace OpenSim.Services.PresenceService
54 public bool LoginAgent(string userID, UUID sessionID, 54 public bool LoginAgent(string userID, UUID sessionID,
55 UUID secureSessionID) 55 UUID secureSessionID)
56 { 56 {
57 PresenceData[] d = m_Database.Get("UserID", userID); 57 //PresenceData[] d = m_Database.Get("UserID", userID);
58 m_Database.Get("UserID", userID);
58 59
59 PresenceData data = new PresenceData(); 60 PresenceData data = new PresenceData();
60 61