bad merge?

2026-08-06 01:06:30 +08:00 · 2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -203,8 +203,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
        {
            m_scene.ForEachRootClient(delegate(IClientAPI client)
            {
-                client.SendBlueBoxMessage(fromAvatarID, fromAvatarName,
-                        message);
+                client.SendAgentAlertMessage(
+                        message, false);
            });
        }

@@ -260,4 +260,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
            return result;
        }
    }
-}
+}