aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Sirikata/ClientStack
diff options
context:
space:
mode:
authorMelanie2010-06-12 01:26:55 +0100
committerMelanie2010-06-12 01:26:55 +0100
commit508bfa1de81d6de0c75109451558271140d79d50 (patch)
tree199f6924ace32b7060008a3776b762fedfce49cf /OpenSim/Client/Sirikata/ClientStack
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMove "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet (diff)
downloadopensim-SC-508bfa1de81d6de0c75109451558271140d79d50.zip
opensim-SC-508bfa1de81d6de0c75109451558271140d79d50.tar.gz
opensim-SC-508bfa1de81d6de0c75109451558271140d79d50.tar.bz2
opensim-SC-508bfa1de81d6de0c75109451558271140d79d50.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Client/Sirikata/ClientStack')
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs4
1 files changed, 4 insertions, 0 deletions
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}