diff options
author | MW | 2007-08-09 12:59:42 +0000 |
---|---|---|
committer | MW | 2007-08-09 12:59:42 +0000 |
commit | a56a17fab20e1ef94e70dbf6648ebb2f437de364 (patch) | |
tree | e19a6a858725ffadbcf34c8f9a7409db350a5681 /OpenSim/Framework/General | |
parent | Transition between not flying / flying should be smoother (diff) | |
download | opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.zip opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.gz opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.bz2 opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.xz |
Making sure my local working copy is in sync with svn before I start the job of enabling the new SceneObject classes.
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IClientAPI.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/General/NullClientAPI.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs index da4e03b..fa323ba 100644 --- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs +++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs | |||
@@ -187,10 +187,10 @@ namespace OpenSim.Framework.Interfaces | |||
187 | void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); | 187 | void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); |
188 | void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint ); | 188 | void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint ); |
189 | AgentCircuitData RequestClientInfo(); | 189 | AgentCircuitData RequestClientInfo(); |
190 | void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint ); | 190 | void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL ); |
191 | void SendMapBlock(List<MapBlockData> mapBlocks); | 191 | void SendMapBlock(List<MapBlockData> mapBlocks); |
192 | void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); | 192 | void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); |
193 | void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags); | 193 | void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL); |
194 | void SendTeleportCancel(); | 194 | void SendTeleportCancel(); |
195 | void SendTeleportLocationStart(); | 195 | void SendTeleportLocationStart(); |
196 | void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); | 196 | void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); |
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs index bc98cc1..459e12b 100644 --- a/OpenSim/Framework/General/NullClientAPI.cs +++ b/OpenSim/Framework/General/NullClientAPI.cs | |||
@@ -118,10 +118,10 @@ namespace OpenSim.Framework | |||
118 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){} | 118 | public virtual void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look){} |
119 | public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){} | 119 | public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint){} |
120 | public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); } | 120 | public virtual AgentCircuitData RequestClientInfo() { return new AgentCircuitData(); } |
121 | public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint){} | 121 | public virtual void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL){} |
122 | public virtual void SendMapBlock(List<MapBlockData> mapBlocks){} | 122 | public virtual void SendMapBlock(List<MapBlockData> mapBlocks){} |
123 | public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){} | 123 | public virtual void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags){} |
124 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags){} | 124 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL){} |
125 | public virtual void SendTeleportCancel(){} | 125 | public virtual void SendTeleportCancel(){} |
126 | public virtual void SendTeleportLocationStart(){} | 126 | public virtual void SendTeleportLocationStart(){} |
127 | public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){} | 127 | public virtual void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance){} |