diff options
author | Justin Clark-Casey (justincc) | 2010-06-04 20:44:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-04 20:44:01 +0100 |
commit | f319d2ef5e4ef73b081036f7778329858586a07a (patch) | |
tree | 8e1338af08d784e9201dbaafb31254b16b586c3f /OpenSim/Services/PresenceService/PresenceService.cs | |
parent | get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAu... (diff) | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-f319d2ef5e4ef73b081036f7778329858586a07a.zip opensim-SC_OLD-f319d2ef5e4ef73b081036f7778329858586a07a.tar.gz opensim-SC_OLD-f319d2ef5e4ef73b081036f7778329858586a07a.tar.bz2 opensim-SC_OLD-f319d2ef5e4ef73b081036f7778329858586a07a.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/PresenceService/PresenceService.cs')
-rw-r--r-- | OpenSim/Services/PresenceService/PresenceService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index 601a69f..976153f 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Services.PresenceService | |||
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 | //m_Database.Get("UserID", userID); |
59 | 59 | ||
60 | PresenceData data = new PresenceData(); | 60 | PresenceData data = new PresenceData(); |
61 | 61 | ||