diff options
| author | Melanie | 2010-06-04 21:11:15 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-04 21:11:15 +0100 |
| commit | c5878b6610d4a729752fddf15ad6c99c302375a3 (patch) | |
| tree | 12c570c68ed6f49965ce42fa0147b79ca21d9f96 /OpenSim/Services/PresenceService | |
| parent | Change the admin kick message to something more generic, "OpenSim Manager" is... (diff) | |
| parent | bring TestLoadIarV0_1AbsentUsers() back online (diff) | |
| download | opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.zip opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.gz opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.bz2 opensim-SC-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/PresenceService')
| -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 | ||