Merge branch 'master' into careminster-presence-refactor

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
         {
         }
 
+        public void StopFlying(ISceneEntity presence)
+        {
+        }
+
         #endregion
     }
 }