diff options
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
3 files changed, 35 insertions, 35 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs index a47f32c..734bdd2 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -53,7 +53,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
53 | private static readonly ILog m_log = | 53 | private static readonly ILog m_log = |
54 | LogManager.GetLogger( | 54 | LogManager.GetLogger( |
55 | MethodBase.GetCurrentMethod().DeclaringType); | 55 | MethodBase.GetCurrentMethod().DeclaringType); |
56 | private static string ZeroID = UUID.Zero.ToString(); | 56 | // private static string ZeroID = UUID.Zero.ToString(); |
57 | 57 | ||
58 | private string m_serverUrl = String.Empty; | 58 | private string m_serverUrl = String.Empty; |
59 | 59 | ||
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 2b6d29c..89c1a5a 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
69 | 69 | ||
70 | private string m_serverUrl = String.Empty; | 70 | private string m_serverUrl = String.Empty; |
71 | private string m_userServerUrl = String.Empty; | 71 | private string m_userServerUrl = String.Empty; |
72 | private object m_gestureSyncRoot = new object(); | 72 | // private object m_gestureSyncRoot = new object(); |
73 | 73 | ||
74 | #region ISharedRegionModule | 74 | #region ISharedRegionModule |
75 | 75 | ||
@@ -687,12 +687,12 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
687 | for (int i = 0; i < items.Count; i++) | 687 | for (int i = 0; i < items.Count; i++) |
688 | itemIDs[i] = items[i].AsUUID().ToString(); | 688 | itemIDs[i] = items[i].AsUUID().ToString(); |
689 | 689 | ||
690 | NameValueCollection requestArgs = new NameValueCollection | 690 | // NameValueCollection requestArgs = new NameValueCollection |
691 | { | 691 | // { |
692 | { "RequestMethod", "GetInventoryNodes" }, | 692 | // { "RequestMethod", "GetInventoryNodes" }, |
693 | { "OwnerID", userID.ToString() }, | 693 | // { "OwnerID", userID.ToString() }, |
694 | { "Items", String.Join(",", itemIDs) } | 694 | // { "Items", String.Join(",", itemIDs) } |
695 | }; | 695 | // }; |
696 | 696 | ||
697 | // FIXME: Implement this in SimianGrid | 697 | // FIXME: Implement this in SimianGrid |
698 | return new List<InventoryItemBase>(0); | 698 | return new List<InventoryItemBase>(0); |
@@ -708,12 +708,12 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
708 | /// the user's inventory</returns> | 708 | /// the user's inventory</returns> |
709 | public int GetAssetPermissions(UUID userID, UUID assetID) | 709 | public int GetAssetPermissions(UUID userID, UUID assetID) |
710 | { | 710 | { |
711 | NameValueCollection requestArgs = new NameValueCollection | 711 | // NameValueCollection requestArgs = new NameValueCollection |
712 | { | 712 | // { |
713 | { "RequestMethod", "GetInventoryNodes" }, | 713 | // { "RequestMethod", "GetInventoryNodes" }, |
714 | { "OwnerID", userID.ToString() }, | 714 | // { "OwnerID", userID.ToString() }, |
715 | { "AssetID", assetID.ToString() } | 715 | // { "AssetID", assetID.ToString() } |
716 | }; | 716 | // }; |
717 | 717 | ||
718 | // FIXME: Implement this in SimianGrid | 718 | // FIXME: Implement this in SimianGrid |
719 | return (int)PermissionMask.All; | 719 | return (int)PermissionMask.All; |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index 6f17931..ca23e27 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -349,24 +349,24 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
349 | return null; | 349 | return null; |
350 | } | 350 | } |
351 | 351 | ||
352 | private OSDMap GetSessionData(UUID sessionID) | 352 | // private OSDMap GetSessionData(UUID sessionID) |
353 | { | 353 | // { |
354 | m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for session " + sessionID); | 354 | // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for session " + sessionID); |
355 | 355 | // | |
356 | NameValueCollection requestArgs = new NameValueCollection | 356 | // NameValueCollection requestArgs = new NameValueCollection |
357 | { | 357 | // { |
358 | { "RequestMethod", "GetSession" }, | 358 | // { "RequestMethod", "GetSession" }, |
359 | { "SessionID", sessionID.ToString() } | 359 | // { "SessionID", sessionID.ToString() } |
360 | }; | 360 | // }; |
361 | 361 | // | |
362 | OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); | 362 | // OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); |
363 | if (response["Success"].AsBoolean()) | 363 | // if (response["Success"].AsBoolean()) |
364 | return response; | 364 | // return response; |
365 | else | 365 | // else |
366 | m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID); | 366 | // m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID); |
367 | 367 | // | |
368 | return null; | 368 | // return null; |
369 | } | 369 | // } |
370 | 370 | ||
371 | private List<PresenceInfo> GetSessions(UUID userID) | 371 | private List<PresenceInfo> GetSessions(UUID userID) |
372 | { | 372 | { |