diff options
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index 211b775..08efefb 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | |||
@@ -121,7 +121,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
121 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) | 121 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) |
122 | serviceUrl = serviceUrl + '/'; | 122 | serviceUrl = serviceUrl + '/'; |
123 | m_serverUrl = serviceUrl; | 123 | m_serverUrl = serviceUrl; |
124 | m_activityDetector = new SimianActivityDetector(this); | 124 | m_activityDetector = new SimianActivityDetector(this); |
125 | m_Enabled = true; | 125 | m_Enabled = true; |
126 | } | 126 | } |
127 | } | 127 | } |
@@ -210,7 +210,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
210 | m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session {0}: {1}",sessionID.ToString(),sessionResponse["Message"].AsString()); | 210 | m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session {0}: {1}",sessionID.ToString(),sessionResponse["Message"].AsString()); |
211 | return null; | 211 | return null; |
212 | } | 212 | } |
213 | 213 | ||
214 | UUID userID = sessionResponse["UserID"].AsUUID(); | 214 | UUID userID = sessionResponse["UserID"].AsUUID(); |
215 | OSDMap userResponse = GetUserData(userID); | 215 | OSDMap userResponse = GetUserData(userID); |
216 | if (userResponse == null) | 216 | if (userResponse == null) |
@@ -238,7 +238,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
238 | m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString()); | 238 | m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString()); |
239 | return null; | 239 | return null; |
240 | } | 240 | } |
241 | 241 | ||
242 | OSDArray sessionList = sessionListResponse["Sessions"] as OSDArray; | 242 | OSDArray sessionList = sessionListResponse["Sessions"] as OSDArray; |
243 | for (int i = 0; i < sessionList.Count; i++) | 243 | for (int i = 0; i < sessionList.Count; i++) |
244 | { | 244 | { |
@@ -311,7 +311,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
311 | 311 | ||
312 | public GridUserInfo GetGridUserInfo(string user) | 312 | public GridUserInfo GetGridUserInfo(string user) |
313 | { | 313 | { |
314 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); | 314 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); |
315 | 315 | ||
316 | UUID userID = new UUID(user); | 316 | UUID userID = new UUID(user); |
317 | OSDMap userResponse = GetUserData(userID); | 317 | OSDMap userResponse = GetUserData(userID); |
@@ -421,7 +421,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
421 | 421 | ||
422 | return null; | 422 | return null; |
423 | } | 423 | } |
424 | 424 | ||
425 | private string SerializeLocation(UUID regionID, Vector3 position, Vector3 lookAt) | 425 | private string SerializeLocation(UUID regionID, Vector3 position, Vector3 lookAt) |
426 | { | 426 | { |
427 | return "{" + String.Format("\"SceneID\":\"{0}\",\"Position\":\"{1}\",\"LookAt\":\"{2}\"", regionID, position, lookAt) + "}"; | 427 | return "{" + String.Format("\"SceneID\":\"{0}\",\"Position\":\"{1}\",\"LookAt\":\"{2}\"", regionID, position, lookAt) + "}"; |