diff options
| author | Melanie | 2010-06-12 01:26:55 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-12 01:26:55 +0100 |
| commit | 508bfa1de81d6de0c75109451558271140d79d50 (patch) | |
| tree | 199f6924ace32b7060008a3776b762fedfce49cf /OpenSim/Client | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet (diff) | |
| download | opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.zip opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.tar.gz opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.tar.bz2 opensim-SC_OLD-508bfa1de81d6de0c75109451558271140d79d50.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 30c8e4c..5798a64 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -1723,5 +1723,9 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 1723 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | 1723 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) |
| 1724 | { | 1724 | { |
| 1725 | } | 1725 | } |
| 1726 | |||
| 1727 | public void StopFlying(ISceneEntity presence) | ||
| 1728 | { | ||
| 1729 | } | ||
| 1726 | } | 1730 | } |
| 1727 | } | 1731 | } |
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index bc48123..906947e 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
| @@ -1208,6 +1208,10 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
| 1208 | { | 1208 | { |
| 1209 | } | 1209 | } |
| 1210 | 1210 | ||
| 1211 | public void StopFlying(ISceneEntity presence) | ||
| 1212 | { | ||
| 1213 | } | ||
| 1214 | |||
| 1211 | #endregion | 1215 | #endregion |
| 1212 | } | 1216 | } |
| 1213 | } | 1217 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index e6d1c48..13a27f5 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -1223,5 +1223,9 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 1223 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | 1223 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) |
| 1224 | { | 1224 | { |
| 1225 | } | 1225 | } |
| 1226 | |||
| 1227 | public void StopFlying(ISceneEntity presence) | ||
| 1228 | { | ||
| 1229 | } | ||
| 1226 | } | 1230 | } |
| 1227 | } | 1231 | } |