From 1bb98a1eb0f15da904657bc625b27751314af8dc Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sat, 30 May 2009 04:07:58 +0000 Subject: * More Tweaks --- .../Server/IRCClientView.cs | 40 ++++++++++++++++++---- .../InternetRelayClientView/Server/IRCServer.cs | 4 +-- 2 files changed, 36 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server') diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index c3bc5ad..e87749c 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs @@ -200,6 +200,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server { IRC_SendReplyTopic(); IRC_SendNamesReply(); + IRC_SendChannelPrivmsg("System", "Welcome to Zork^H^H^H OpenSimulator."); + IRC_SendChannelPrivmsg("System", "You are in an open field west of a big white house"); + IRC_SendChannelPrivmsg("System", "with a boarded front door."); } } @@ -400,12 +403,16 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server public void Disconnect(string reason) { + IRC_SendChannelPrivmsg("System", "You have been eaten by a grue. (" + reason + ")"); + m_connected = false; m_client.Close(); } public void Disconnect() { + IRC_SendChannelPrivmsg("System", "You have been eaten by a grue."); + m_connected = false; m_client.Close(); } @@ -713,7 +720,33 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server public void Start() { - + Scene.AddNewClient(this); + + // Mimicking LLClientView which gets always set appearance from client. + Scene scene = (Scene)Scene; + AvatarAppearance appearance; + scene.GetAvatarAppearance(this, out appearance); + List visualParams = new List(); + foreach (byte visualParam in appearance.VisualParams) + { + visualParams.Add(visualParam); + } + OnSetAppearance(appearance.Texture.GetBytes(), visualParams); + } + + public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) + { + m_log.Info("[MXP ClientStack] Completing Handshake to Region"); + + if (OnRegionHandShakeReply != null) + { + OnRegionHandShakeReply(this); + } + + if (OnCompleteMovementToRegion != null) + { + OnCompleteMovementToRegion(); + } } public void Stop() @@ -746,11 +779,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server } - public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) - { - - } - public void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible) { IRC_SendChannelPrivmsg(fromName, message); diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs index 23c213f..b8f5afa 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs @@ -21,8 +21,8 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server public event OnNewIRCUserDelegate OnNewIRCClient; - private TcpListener m_listener; - private Scene m_baseScene; + private readonly TcpListener m_listener; + private readonly Scene m_baseScene; private bool m_running = true; public IRCServer(IPAddress listener, int port, Scene baseScene) -- cgit v1.1