From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * This is the fabled LibOMV update with all of the libOMV types from JHurliman * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke. --- .../Environment/Modules/Avatar/Chat/ChatModule.cs | 26 +++++++++++----------- .../Modules/Avatar/Chat/IRCBridgeModule.cs | 10 ++++----- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/Avatar/Chat') diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 1493e32..e1599a8 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs @@ -32,7 +32,7 @@ using System.Net.Sockets; using System.Reflection; using System.Text.RegularExpressions; using System.Threading; -using libsecondlife; +using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; @@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat // chat works by redistributing every incoming chat // message to each avatar in the scene - LLVector3 pos = new LLVector3(128, 128, 30); + Vector3 pos = new Vector3(128, 128, 30); ((Scene)c.Scene).ForEachScenePresence(delegate(ScenePresence presence) { if (presence.IsChildAgent) return; @@ -129,12 +129,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (null == c.SenderObject) client.SendChatMessage(c.Message, (byte)c.Type, - pos, c.From, LLUUID.Zero, + pos, c.From, UUID.Zero, (byte)ChatSourceType.Agent, (byte)ChatAudibleLevel.Fully); else client.SendChatMessage(c.Message, (byte)c.Type, - pos, c.From, LLUUID.Zero, + pos, c.From, UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); }); @@ -153,13 +153,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat scene = m_scenes[0]; // Filled in since it's easier than rewriting right now. - LLVector3 fromPos = e.Position; - LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, + Vector3 fromPos = e.Position; + Vector3 regionPos = new Vector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); string fromName = e.From; string message = e.Message; - LLUUID fromID = e.SenderUUID; + UUID fromID = e.SenderUUID; if(message.Length >= 1000) // libomv limit message = message.Substring(0, 1000); @@ -172,7 +172,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat if (avatar != null) { fromPos = avatar.AbsolutePosition; - regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, + regionPos = new Vector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); fromName = avatar.Firstname + " " + avatar.Lastname; fromID = e.Sender.AgentId; @@ -217,16 +217,16 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat } } - private void TrySendChatMessage(ScenePresence presence, LLVector3 fromPos, LLVector3 regionPos, - LLUUID fromAgentID, string fromName, ChatTypeEnum type, + private void TrySendChatMessage(ScenePresence presence, Vector3 fromPos, Vector3 regionPos, + UUID fromAgentID, string fromName, ChatTypeEnum type, string message, ChatSourceType src) { // don't send stuff to child agents if (presence.IsChildAgent) return; - LLVector3 fromRegionPos = fromPos + regionPos; - LLVector3 toRegionPos = presence.AbsolutePosition + - new LLVector3(presence.Scene.RegionInfo.RegionLocX * Constants.RegionSize, + Vector3 fromRegionPos = fromPos + regionPos; + Vector3 toRegionPos = presence.AbsolutePosition + + new Vector3(presence.Scene.RegionInfo.RegionLocX * Constants.RegionSize, presence.Scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); int dis = Math.Abs((int) Util.GetDistanceTo(toRegionPos, fromRegionPos)); diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs index 9df05e0..8fe5080 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs @@ -32,7 +32,7 @@ using System.Net.Sockets; using System.Reflection; using System.Text.RegularExpressions; using System.Threading; -using libsecondlife; +using OpenMetaverse; using log4net; using Nini.Config; using OpenSim.Framework; @@ -617,7 +617,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat public void ListenerRun() { string inputLine; - LLVector3 pos = new LLVector3(128, 128, 20); + Vector3 pos = new Vector3(128, 128, 20); while (m_enabled) { try @@ -638,7 +638,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat c.Position = pos; c.From = data["nick"]; c.Sender = null; - c.SenderUUID = LLUUID.Zero; + c.SenderUUID = UUID.Zero; // is message "\001ACTION foo // bar\001"? -> "/me foo bar" @@ -684,9 +684,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat c.Message = String.Format(format, args); c.Type = ChatTypeEnum.Say; c.Channel = 0; - c.Position = new LLVector3(128, 128, 20); + c.Position = new Vector3(128, 128, 20); c.Sender = null; - c.SenderUUID = LLUUID.Zero; + c.SenderUUID = UUID.Zero; foreach (Scene m_scene in m_scenes) { -- cgit v1.1