diff options
author | diva | 2009-02-20 03:39:50 +0000 |
---|---|---|
committer | diva | 2009-02-20 03:39:50 +0000 |
commit | 33330297d603a66cc157baa21c81328edc893e51 (patch) | |
tree | 264c9cc750e08383d4f126a66e6def4176dc2fa9 /OpenSim/Framework/Communications | |
parent | Update svn properties, add copyright headers, minor formatting cleanup. (diff) | |
download | opensim-SC-33330297d603a66cc157baa21c81328edc893e51.zip opensim-SC-33330297d603a66cc157baa21c81328edc893e51.tar.gz opensim-SC-33330297d603a66cc157baa21c81328edc893e51.tar.bz2 opensim-SC-33330297d603a66cc157baa21c81328edc893e51.tar.xz |
THE BIG ANTI-REMOTING SCHLEP -- StartRemoting is no more. Sims in older versions will have a hard time communicating with sims on this release and later, especially if they haven't transitioned to RESTComms at all.
There's still some cleanup to do on assorted data structures, but the main functional change here is that sims no longer listen on remoting ports.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/IInterRegionCommunications.cs | 52 |
2 files changed, 0 insertions, 58 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index e0e07b2..bb8e452 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -59,12 +59,6 @@ namespace OpenSim.Framework.Communications | |||
59 | } | 59 | } |
60 | protected IGridServices m_gridService; | 60 | protected IGridServices m_gridService; |
61 | 61 | ||
62 | public IInterRegionCommunications InterRegion | ||
63 | { | ||
64 | get { return m_interRegion; } | ||
65 | } | ||
66 | protected IInterRegionCommunications m_interRegion; | ||
67 | |||
68 | public UserProfileCacheService UserProfileCacheService | 62 | public UserProfileCacheService UserProfileCacheService |
69 | { | 63 | { |
70 | get { return m_userProfileCacheService; } | 64 | get { return m_userProfileCacheService; } |
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs deleted file mode 100644 index 2d4eb53..0000000 --- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System.Collections.Generic; | ||
29 | using OpenMetaverse; | ||
30 | |||
31 | namespace OpenSim.Framework.Communications | ||
32 | { | ||
33 | public interface IInterRegionCommunications | ||
34 | { | ||
35 | string rdebugRegionName { get; set; } | ||
36 | |||
37 | bool CheckRegion(string address, uint port); | ||
38 | bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); | ||
39 | bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod); | ||
40 | bool RegionUp(SerializableRegionInfo region, ulong regionhandle); | ||
41 | bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); | ||
42 | |||
43 | bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying); | ||
44 | bool ExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, bool isFlying); | ||
45 | |||
46 | bool AcknowledgeAgentCrossed(ulong regionHandle, UUID agentId); | ||
47 | bool AcknowledgePrimCrossed(ulong regionHandle, UUID primID); | ||
48 | |||
49 | bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID); | ||
50 | |||
51 | } | ||
52 | } | ||