merge issue

2 files changed, 9 insertions, 0 deletions

diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 4f8e986..9b087c9 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -861,6 +861,10 @@ namespace OpenSim.Tests.Common
         {
         }
 
+        public void SendAlertMessage(string message, string info)
+        {
+        }
+
         public void SendSystemAlertMessage(string message)
         {
         }
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
index 417efce..bc30945 100644
--- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
+++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs
@@ -152,6 +152,11 @@ namespace OpenSim.Tests.Common
             AddEvent(toAgent, "ChatterBoxSessionAgentListUpdates", sessionID, fromAgent, canVoiceChat, isModerator, textMute, isEnterorLeave);
         }
 
+        public void ChatterBoxForceClose (UUID toAgent, UUID sessionID, string reason)
+        {
+            AddEvent(toAgent, "ForceCloseChatterBoxSession", sessionID, reason);
+        }
+
         public void ParcelProperties (OpenMetaverse.Messages.Linden.ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID)
         {
             AddEvent(avatarID, "ParcelProperties", parcelPropertiesMessage);