aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
Diffstat (limited to 'Common')
-rw-r--r--Common/OpenGrid.Framework.Communications/CommunicationsManager.cs2
-rw-r--r--Common/OpenGrid.Framework.Communications/IGridServices.cs3
-rw-r--r--Common/OpenSim.Framework/IRegionCommsListener.cs (renamed from Common/OpenSim.Framework/IRegionCommsHost.cs)2
-rw-r--r--Common/OpenSim.Framework/Interfaces/IClientAPI.cs15
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj7
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build5
-rw-r--r--Common/OpenSim.Framework/RegionCommsListener.cs (renamed from Common/OpenSim.Framework/RegionCommsHostBase.cs)2
-rw-r--r--Common/OpenSim.Framework/Types/MapBlockData.cs25
8 files changed, 52 insertions, 9 deletions
diff --git a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
index 10fe251..2ed4fd2 100644
--- a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
@@ -41,7 +41,7 @@ namespace OpenGrid.Framework.Communications
41 { 41 {
42 public IUserServices UserServer; 42 public IUserServices UserServer;
43 public IGridServices GridServer; 43 public IGridServices GridServer;
44 public IInterRegionCommunications InterSims; 44 public IInterRegionCommunications InterRegion;
45 45
46 public CommunicationsManager() 46 public CommunicationsManager()
47 { 47 {
diff --git a/Common/OpenGrid.Framework.Communications/IGridServices.cs b/Common/OpenGrid.Framework.Communications/IGridServices.cs
index 9466647..b4bc3b6 100644
--- a/Common/OpenGrid.Framework.Communications/IGridServices.cs
+++ b/Common/OpenGrid.Framework.Communications/IGridServices.cs
@@ -36,8 +36,9 @@ namespace OpenGrid.Framework.Communications
36{ 36{
37 public interface IGridServices 37 public interface IGridServices
38 { 38 {
39 RegionCommsHostBase RegisterRegion(RegionInfo regionInfo); 39 RegionCommsListener RegisterRegion(RegionInfo regionInfo);
40 List<RegionInfo> RequestNeighbours(RegionInfo regionInfo); 40 List<RegionInfo> RequestNeighbours(RegionInfo regionInfo);
41 RegionInfo RequestNeighbourInfo(ulong regionHandle); 41 RegionInfo RequestNeighbourInfo(ulong regionHandle);
42 List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
42 } 43 }
43} 44}
diff --git a/Common/OpenSim.Framework/IRegionCommsHost.cs b/Common/OpenSim.Framework/IRegionCommsListener.cs
index 658afe6..0e80941 100644
--- a/Common/OpenSim.Framework/IRegionCommsHost.cs
+++ b/Common/OpenSim.Framework/IRegionCommsListener.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 public delegate void UpdateNeighbours(List<RegionInfo> neighbours); 37 public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
38 public delegate void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 38 public delegate void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
39 39
40 public interface IRegionCommsHost 40 public interface IRegionCommsListener
41 { 41 {
42 event ExpectUserDelegate OnExpectUser; 42 event ExpectUserDelegate OnExpectUser;
43 event GenericCall2 OnExpectChildAgent; 43 event GenericCall2 OnExpectChildAgent;
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index 45d73ef..6e758b2 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -41,12 +41,16 @@ namespace OpenSim.Framework.Interfaces
41 public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam); 41 public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
42 public delegate void StartAnim(LLUUID animID, int seq); 42 public delegate void StartAnim(LLUUID animID, int seq);
43 public delegate void LinkObjects(uint parent, List<uint> children); 43 public delegate void LinkObjects(uint parent, List<uint> children);
44 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);
45 public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
46
44 public delegate void GenericCall(IClientAPI remoteClient); 47 public delegate void GenericCall(IClientAPI remoteClient);
45 public delegate void GenericCall2(); 48 public delegate void GenericCall2();
46 public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary. 49 public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.
47 public delegate void GenericCall4(Packet packet, IClientAPI remoteClient); 50 public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
48 public delegate void GenericCall5(IClientAPI remoteClient, bool status); 51 public delegate void GenericCall5(IClientAPI remoteClient, bool status);
49 public delegate void GenericCall6(LLUUID uid); 52 public delegate void GenericCall6(LLUUID uid);
53
50 public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); 54 public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
51 public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); 55 public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
52 public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); 56 public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);
@@ -72,6 +76,9 @@ namespace OpenSim.Framework.Interfaces
72 event SetAppearance OnSetAppearance; 76 event SetAppearance OnSetAppearance;
73 event StartAnim OnStartAnim; 77 event StartAnim OnStartAnim;
74 event LinkObjects OnLinkObjects; 78 event LinkObjects OnLinkObjects;
79 event RequestMapBlocks OnRequestMapBlocks;
80 event TeleportLocationRequest OnTeleportLocationRequest;
81
75 event GenericCall4 OnDeRezObject; 82 event GenericCall4 OnDeRezObject;
76 event GenericCall OnRegionHandShakeReply; 83 event GenericCall OnRegionHandShakeReply;
77 event GenericCall OnRequestWearables; 84 event GenericCall OnRequestWearables;
@@ -79,6 +86,7 @@ namespace OpenSim.Framework.Interfaces
79 event UpdateAgent OnAgentUpdate; 86 event UpdateAgent OnAgentUpdate;
80 event GenericCall OnRequestAvatarsData; 87 event GenericCall OnRequestAvatarsData;
81 event GenericCall4 OnAddPrim; 88 event GenericCall4 OnAddPrim;
89
82 event UpdateShape OnUpdatePrimShape; 90 event UpdateShape OnUpdatePrimShape;
83 event ObjectSelect OnObjectSelect; 91 event ObjectSelect OnObjectSelect;
84 event UpdatePrimFlags OnUpdatePrimFlags; 92 event UpdatePrimFlags OnUpdatePrimFlags;
@@ -125,10 +133,15 @@ namespace OpenSim.Framework.Interfaces
125 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 133 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
126 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 134 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
127 void SendLayerData(float[] map); 135 void SendLayerData(float[] map);
128 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos); 136 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
129 void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort); 137 void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);
130 AgentCircuitData RequestClientInfo(); 138 AgentCircuitData RequestClientInfo();
131 void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort); 139 void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort);
140 void SendMapBlock(List<MapBlockData> mapBlocks);
141 void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
142 void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags);
143 void SendTeleportCancel();
144 void SendTeleportLocationStart();
132 145
133 void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos); 146 void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos);
134 void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity); 147 void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 4939b59..060e471 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -99,13 +99,13 @@
99 <Compile Include="BlockingQueue.cs"> 99 <Compile Include="BlockingQueue.cs">
100 <SubType>Code</SubType> 100 <SubType>Code</SubType>
101 </Compile> 101 </Compile>
102 <Compile Include="IRegionCommsHost.cs"> 102 <Compile Include="IRegionCommsListener.cs">
103 <SubType>Code</SubType> 103 <SubType>Code</SubType>
104 </Compile> 104 </Compile>
105 <Compile Include="LoginService.cs"> 105 <Compile Include="LoginService.cs">
106 <SubType>Code</SubType> 106 <SubType>Code</SubType>
107 </Compile> 107 </Compile>
108 <Compile Include="RegionCommsHostBase.cs"> 108 <Compile Include="RegionCommsListener.cs">
109 <SubType>Code</SubType> 109 <SubType>Code</SubType>
110 </Compile> 110 </Compile>
111 <Compile Include="Remoting.cs"> 111 <Compile Include="Remoting.cs">
@@ -183,6 +183,9 @@
183 <Compile Include="Types\Login.cs"> 183 <Compile Include="Types\Login.cs">
184 <SubType>Code</SubType> 184 <SubType>Code</SubType>
185 </Compile> 185 </Compile>
186 <Compile Include="Types\MapBlockData.cs">
187 <SubType>Code</SubType>
188 </Compile>
186 <Compile Include="Types\NeighbourInfo.cs"> 189 <Compile Include="Types\NeighbourInfo.cs">
187 <SubType>Code</SubType> 190 <SubType>Code</SubType>
188 </Compile> 191 </Compile>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 65a58dc..524255c 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -14,9 +14,9 @@
14 <include name="AgentInventory.cs" /> 14 <include name="AgentInventory.cs" />
15 <include name="AuthenticateSessionBase.cs" /> 15 <include name="AuthenticateSessionBase.cs" />
16 <include name="BlockingQueue.cs" /> 16 <include name="BlockingQueue.cs" />
17 <include name="IRegionCommsHost.cs" /> 17 <include name="IRegionCommsListener.cs" />
18 <include name="LoginService.cs" /> 18 <include name="LoginService.cs" />
19 <include name="RegionCommsHostBase.cs" /> 19 <include name="RegionCommsListener.cs" />
20 <include name="Remoting.cs" /> 20 <include name="Remoting.cs" />
21 <include name="SimProfile.cs" /> 21 <include name="SimProfile.cs" />
22 <include name="UserProfile.cs" /> 22 <include name="UserProfile.cs" />
@@ -42,6 +42,7 @@
42 <include name="Types/AssetStorage.cs" /> 42 <include name="Types/AssetStorage.cs" />
43 <include name="Types/EstateSettings.cs" /> 43 <include name="Types/EstateSettings.cs" />
44 <include name="Types/Login.cs" /> 44 <include name="Types/Login.cs" />
45 <include name="Types/MapBlockData.cs" />
45 <include name="Types/NeighbourInfo.cs" /> 46 <include name="Types/NeighbourInfo.cs" />
46 <include name="Types/NetworkServersInfo.cs" /> 47 <include name="Types/NetworkServersInfo.cs" />
47 <include name="Types/ParcelData.cs" /> 48 <include name="Types/ParcelData.cs" />
diff --git a/Common/OpenSim.Framework/RegionCommsHostBase.cs b/Common/OpenSim.Framework/RegionCommsListener.cs
index 88751b8..3fec937 100644
--- a/Common/OpenSim.Framework/RegionCommsHostBase.cs
+++ b/Common/OpenSim.Framework/RegionCommsListener.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Types;
33 33
34namespace OpenSim.Framework 34namespace OpenSim.Framework
35{ 35{
36 public class RegionCommsHostBase :IRegionCommsHost 36 public class RegionCommsListener :IRegionCommsListener
37 { 37 {
38 public event ExpectUserDelegate OnExpectUser; 38 public event ExpectUserDelegate OnExpectUser;
39 public event GenericCall2 OnExpectChildAgent; 39 public event GenericCall2 OnExpectChildAgent;
diff --git a/Common/OpenSim.Framework/Types/MapBlockData.cs b/Common/OpenSim.Framework/Types/MapBlockData.cs
new file mode 100644
index 0000000..2e6f56e
--- /dev/null
+++ b/Common/OpenSim.Framework/Types/MapBlockData.cs
@@ -0,0 +1,25 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5
6namespace OpenSim.Framework.Types
7{
8 public class MapBlockData
9 {
10 public uint Flags;
11 public ushort X;
12 public ushort Y;
13 public byte Agents;
14 public byte Access;
15 public byte WaterHeight;
16 public LLUUID MapImageId;
17 public String Name;
18 public uint RegionFlags;
19
20 public MapBlockData()
21 {
22
23 }
24 }
25}