diff options
| author | Melanie | 2009-12-28 17:34:42 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-28 17:34:42 +0000 |
| commit | 92a40129b5dfde0d8ef798941f5efb31ca3a73fd (patch) | |
| tree | 92f10121b7eb3d592621af7a74ebb6f06cea0858 /OpenSim/Region | |
| parent | * Added the new modules to Resources, making them active. (diff) | |
| download | opensim-SC_OLD-92a40129b5dfde0d8ef798941f5efb31ca3a73fd.zip opensim-SC_OLD-92a40129b5dfde0d8ef798941f5efb31ca3a73fd.tar.gz opensim-SC_OLD-92a40129b5dfde0d8ef798941f5efb31ca3a73fd.tar.bz2 opensim-SC_OLD-92a40129b5dfde0d8ef798941f5efb31ca3a73fd.tar.xz | |
Database and presence changes. Untested
Diffstat (limited to '')
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs index 8aad7e0..a80a355 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs | |||
| @@ -148,7 +148,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence | |||
| 148 | 148 | ||
| 149 | #region IPresenceService | 149 | #region IPresenceService |
| 150 | 150 | ||
| 151 | public bool LoginAgent(UUID principalID, UUID sessionID, UUID secureSessionID) | 151 | public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID) |
| 152 | { | 152 | { |
| 153 | m_log.Warn("[LOCAL PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators"); | 153 | m_log.Warn("[LOCAL PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators"); |
| 154 | return false; | 154 | return false; |
| @@ -175,9 +175,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence | |||
| 175 | return m_PresenceService.GetAgent(sessionID); | 175 | return m_PresenceService.GetAgent(sessionID); |
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | public PresenceInfo[] GetAgents(string[] principalIDs) | 178 | public PresenceInfo[] GetAgents(string[] userIDs) |
| 179 | { | 179 | { |
| 180 | return m_PresenceService.GetAgents(principalIDs); | 180 | return m_PresenceService.GetAgents(userIDs); |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | #endregion | 183 | #endregion |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs index 6a674ce..e652773 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs | |||
| @@ -121,7 +121,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence | |||
| 121 | 121 | ||
| 122 | #region IPresenceService | 122 | #region IPresenceService |
| 123 | 123 | ||
| 124 | public bool LoginAgent(UUID principalID, UUID sessionID, UUID secureSessionID) | 124 | public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID) |
| 125 | { | 125 | { |
| 126 | m_log.Warn("[REMOTE PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators"); | 126 | m_log.Warn("[REMOTE PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators"); |
| 127 | return false; | 127 | return false; |
| @@ -148,9 +148,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence | |||
| 148 | return m_RemoteConnector.GetAgent(sessionID); | 148 | return m_RemoteConnector.GetAgent(sessionID); |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | public PresenceInfo[] GetAgents(string[] principalIDs) | 151 | public PresenceInfo[] GetAgents(string[] userIDs) |
| 152 | { | 152 | { |
| 153 | return m_RemoteConnector.GetAgents(principalIDs); | 153 | return m_RemoteConnector.GetAgents(userIDs); |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | #endregion | 156 | #endregion |