Merge branch 'master' into careminster-presence-refactor

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

1 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 11eed09..e6d1c48 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -519,6 +519,10 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
             throw new System.NotImplementedException();
         }
 
+        public void SendGenericMessage(string method, List<string> message)
+        {
+        }
+
         public void SendGenericMessage(string method, List<byte[]> message)
         {
             throw new System.NotImplementedException();