Merge branch 'master' of openslx.org:pvs

Conflicts:
	CMakeLists.txt
	src/core/pvsConnectionManager.cpp
	src/pvs.cpp
	src/pvs.h

1 files changed, 19 insertions, 0 deletions

diff --git a/src/core/pvsConnectionManager.cpp b/src/core/pvsConnectionManager.cpp
index d0f1479..db302c4 100644
--- a/src/core/pvsConnectionManager.cpp
+++ b/src/core/pvsConnectionManager.cpp
@@ -260,6 +260,25 @@ void PVSConnectionManager::onCommand(PVSMsg command)
     		else tmp->processesVectorAdd(message);
     	}
     }
+    else if (ident == "MCASTFTANNOUNCE")
+    {
+    	_pvsServer.sendToAll(command);
+    }
+    else if (ident == "MCASTFTRETRY")
+    {
+        QStringList fields = message.split(':');
+        if (!fields.size() == 2)
+        {
+            qDebug() << "Malformed MCASTFTRETRY message:" << message;
+            return;
+        }
+
+        PVSClient* client = getClientFromUsername(fields[0]);
+        if (client)
+        {
+            client->sendMessage(command);
+        }
+    }
 }
 void PVSConnectionManager::onChat(PVSMsg chatMsg)
 {