Some Rearranging of CommsManager.

3 files changed, 12 insertions, 61 deletions

diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs b/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
index 1d6a0aa..27e6fc7 100644
--- a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerLocal.cs
+++ b/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
@@ -28,10 +28,14 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

+using OpenSim.Framework.Types;

+using OpenSim.Framework;

 

-namespace OpenGrid.Framework.Communications.UserServer

+namespace OpenGrid.Framework.Communications

 {

-    public class UserCommsManagerLocal : UserCommsManagerBase

+    public  interface IInterRegionCommunications

     {

+         bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData);

+         bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 

     }

 }

diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs b/Common/OpenGrid.Framework.Communications/IUserServices.cs
index 615bb2d..9eed195 100644
--- a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerOGS.cs
+++ b/Common/OpenGrid.Framework.Communications/IUserServices.cs
@@ -28,10 +28,14 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

+using libsecondlife;

 

-namespace OpenGrid.Framework.Communications.UserServer

+namespace OpenGrid.Framework.Communications

 {

-    public class UserCommsManagerOGS : UserCommsManagerBase

+    public interface IUserServices

     {

+        void GetUserProfile(string name);

+        void GetUserProfile(LLUUID avatar_id); //should be returning UserProfile

+        

     }

 }

diff --git a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs b/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
deleted file mode 100644
index 623dc42..0000000
--- a/Common/OpenGrid.Framework.Communications/UserServer/UserCommsManagerBase.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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.Collections.Generic;

-using System.Text;

-

-using libsecondlife;

-namespace OpenGrid.Framework.Communications.UserServer

-{

-    public class UserCommsManagerBase

-    {

-        public UserCommsManagerBase()

-        {

-        }

-

-        public virtual UserProfileData GetUserProfile(string name)

-        {

-            return null;

-        }

-        public virtual UserProfileData GetUserProfile(LLUUID avatar_id)

-        {

-            return null;

-        }

-    }

-

-    public class UserProfileData

-    {

-        public UserProfileData()

-        {

-        }

-    }

-}