From 587b17e23b3919377f4f1af08e2a59e8eec69ef6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 25 May 2011 12:37:37 -0700
Subject: HG: Renamed, shuffled some interfaces around. Move them all to
IHypergridServices.
---
OpenSim/Services/Interfaces/IGatekeeperService.cs | 74 -------------------
OpenSim/Services/Interfaces/IHypergridServices.cs | 83 ++++++++++++++++++++++
.../Services/Interfaces/ISimulatorSocialService.cs | 45 ------------
3 files changed, 83 insertions(+), 119 deletions(-)
delete mode 100644 OpenSim/Services/Interfaces/IGatekeeperService.cs
create mode 100644 OpenSim/Services/Interfaces/IHypergridServices.cs
delete mode 100644 OpenSim/Services/Interfaces/ISimulatorSocialService.cs
(limited to 'OpenSim/Services')
diff --git a/OpenSim/Services/Interfaces/IGatekeeperService.cs b/OpenSim/Services/Interfaces/IGatekeeperService.cs
deleted file mode 100644
index ffab9ea..0000000
--- a/OpenSim/Services/Interfaces/IGatekeeperService.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Net;
-using System.Collections.Generic;
-
-using OpenSim.Framework;
-using OpenMetaverse;
-
-namespace OpenSim.Services.Interfaces
-{
- public interface IGatekeeperService
- {
- bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason);
- GridRegion GetHyperlinkRegion(UUID regionID);
-
- bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason);
-
- }
-
- /// <summary>
- /// HG1.5 only
- /// </summary>
- public interface IUserAgentService
- {
- // called by login service only
- bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, IPEndPoint clientIP, out string reason);
- // called by simulators
- bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, out string reason);
- void LogoutAgent(UUID userID, UUID sessionID);
- GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt);
- Dictionary<string, object> GetServerURLs(UUID userID);
-
- string LocateUser(UUID userID);
-
- void StatusNotification(List<string> friends, UUID userID, bool online);
- List<UUID> GetOnlineFriends(UUID userID, List<string> friends);
-
- bool AgentIsComingHome(UUID sessionID, string thisGridExternalName);
- bool VerifyAgent(UUID sessionID, string token);
- bool VerifyClient(UUID sessionID, string reportedIP);
- }
-
- public interface IInstantMessage
- {
- bool IncomingInstantMessage(GridInstantMessage im);
- bool OutgoingInstantMessage(GridInstantMessage im, string url);
- }
-}
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs
new file mode 100644
index 0000000..3ab6d4f
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IHypergridServices.cs
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Net;
+using System.Collections.Generic;
+
+using OpenSim.Framework;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+ public interface IGatekeeperService
+ {
+ bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason);
+ GridRegion GetHyperlinkRegion(UUID regionID);
+
+ bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason);
+
+ }
+
+ /// <summary>
+ /// HG1.5 only
+ /// </summary>
+ public interface IUserAgentService
+ {
+ // called by login service only
+ bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, IPEndPoint clientIP, out string reason);
+ // called by simulators
+ bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, out string reason);
+ void LogoutAgent(UUID userID, UUID sessionID);
+ GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt);
+ Dictionary<string, object> GetServerURLs(UUID userID);
+
+ string LocateUser(UUID userID);
+
+ void StatusNotification(List<string> friends, UUID userID, bool online);
+ List<UUID> GetOnlineFriends(UUID userID, List<string> friends);
+
+ bool AgentIsComingHome(UUID sessionID, string thisGridExternalName);
+ bool VerifyAgent(UUID sessionID, string token);
+ bool VerifyClient(UUID sessionID, string reportedIP);
+ }
+
+ public interface IInstantMessage
+ {
+ bool IncomingInstantMessage(GridInstantMessage im);
+ bool OutgoingInstantMessage(GridInstantMessage im, string url);
+ }
+ public interface IFriendsSimConnector
+ {
+ bool StatusNotify(UUID userID, UUID friendID, bool online);
+ }
+
+ public interface IInstantMessageSimConnector
+ {
+ bool SendInstantMessage(GridInstantMessage im);
+ }
+}
diff --git a/OpenSim/Services/Interfaces/ISimulatorSocialService.cs b/OpenSim/Services/Interfaces/ISimulatorSocialService.cs
deleted file mode 100644
index df9e7e7..0000000
--- a/OpenSim/Services/Interfaces/ISimulatorSocialService.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenSim.Framework;
-using OpenMetaverse;
-
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
-
-namespace OpenSim.Services.Interfaces
-{
- public interface IFriendsSimConnector
- {
- bool StatusNotify(UUID userID, UUID friendID, bool online);
- }
-
- public interface IInstantMessageSimConnector
- {
- bool SendInstantMessage(GridInstantMessage im);
- }
-}
--
cgit v1.1