diff options
| author | Tom Grimshaw | 2010-06-12 04:36:14 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-12 04:36:14 -0700 |
| commit | 63531b1df5463d43821c91a26bd0f6414716d0d0 (patch) | |
| tree | 381fddf86dbe4880b6e5114f3db8737fc9ecb53a /OpenSim/Client | |
| parent | Get rid of spamming SOG debug message (diff) | |
| parent | Preserving the link numbers is a serializer's highest duty. (diff) | |
| download | opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.zip opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.tar.gz opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.tar.bz2 opensim-SC-63531b1df5463d43821c91a26bd0f6414716d0d0.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -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 | } |