diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 8216222..9730b02 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
43 | { | 43 | { |
44 | public class ChatModule : IRegionModule, ISimChat | 44 | public class ChatModule : IRegionModule, ISimChat |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | private static readonly ILog m_log = |
47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private const int DEBUG_CHANNEL = 2147483647; | 49 | private const int DEBUG_CHANNEL = 2147483647; |
@@ -115,7 +115,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
115 | 115 | ||
116 | // Filled in since it's easier than rewriting right now. | 116 | // Filled in since it's easier than rewriting right now. |
117 | LLVector3 fromPos = e.Position; | 117 | LLVector3 fromPos = e.Position; |
118 | LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, | 118 | LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, |
119 | scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); | 119 | scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); |
120 | 120 | ||
121 | string fromName = e.From; | 121 | string fromName = e.From; |
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
130 | if (avatar != null) | 130 | if (avatar != null) |
131 | { | 131 | { |
132 | fromPos = avatar.AbsolutePosition; | 132 | fromPos = avatar.AbsolutePosition; |
133 | regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, | 133 | regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, |
134 | scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); | 134 | scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); |
135 | fromName = avatar.Firstname + " " + avatar.Lastname; | 135 | fromName = avatar.Firstname + " " + avatar.Lastname; |
136 | fromAgentID = e.Sender.AgentId; | 136 | fromAgentID = e.Sender.AgentId; |
@@ -151,13 +151,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
151 | if (e.Channel == DEBUG_CHANNEL) | 151 | if (e.Channel == DEBUG_CHANNEL) |
152 | { | 152 | { |
153 | TrySendChatMessage(presence, fromPos, regionPos, | 153 | TrySendChatMessage(presence, fromPos, regionPos, |
154 | fromAgentID, fromName, e.Type, | 154 | fromAgentID, fromName, e.Type, |
155 | message, ChatSourceType.Object); | 155 | message, ChatSourceType.Object); |
156 | } | 156 | } |
157 | else | 157 | else |
158 | { | 158 | { |
159 | TrySendChatMessage(presence, fromPos, regionPos, | 159 | TrySendChatMessage(presence, fromPos, regionPos, |
160 | fromAgentID, fromName, e.Type, | 160 | fromAgentID, fromName, e.Type, |
161 | message, ChatSourceType.Agent); | 161 | message, ChatSourceType.Agent); |
162 | } | 162 | } |
163 | }); | 163 | }); |
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
180 | } | 180 | } |
181 | 181 | ||
182 | private void TrySendChatMessage(ScenePresence presence, LLVector3 fromPos, LLVector3 regionPos, | 182 | private void TrySendChatMessage(ScenePresence presence, LLVector3 fromPos, LLVector3 regionPos, |
183 | LLUUID fromAgentID, string fromName, ChatTypeEnum type, | 183 | LLUUID fromAgentID, string fromName, ChatTypeEnum type, |
184 | string message, ChatSourceType src) | 184 | string message, ChatSourceType src) |
185 | { | 185 | { |
186 | if (!presence.IsChildAgent) | 186 | if (!presence.IsChildAgent) |
@@ -188,7 +188,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
188 | LLVector3 fromRegionPos = fromPos + regionPos; | 188 | LLVector3 fromRegionPos = fromPos + regionPos; |
189 | LLVector3 toRegionPos = presence.AbsolutePosition + regionPos; | 189 | LLVector3 toRegionPos = presence.AbsolutePosition + regionPos; |
190 | int dis = Math.Abs((int) Util.GetDistanceTo(toRegionPos, fromRegionPos)); | 190 | int dis = Math.Abs((int) Util.GetDistanceTo(toRegionPos, fromRegionPos)); |
191 | 191 | ||
192 | if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance || | 192 | if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance || |
193 | type == ChatTypeEnum.Say && dis > m_saydistance || | 193 | type == ChatTypeEnum.Say && dis > m_saydistance || |
194 | type == ChatTypeEnum.Shout && dis > m_shoutdistance) | 194 | type == ChatTypeEnum.Shout && dis > m_shoutdistance) |
@@ -197,7 +197,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
197 | } | 197 | } |
198 | 198 | ||
199 | // TODO: should change so the message is sent through the avatar rather than direct to the ClientView | 199 | // TODO: should change so the message is sent through the avatar rather than direct to the ClientView |
200 | presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, | 200 | presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, |
201 | fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully); | 201 | fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully); |
202 | } | 202 | } |
203 | } | 203 | } |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs index 03f9a88..283551b 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
43 | { | 43 | { |
44 | public class IRCBridgeModule : IRegionModule, ISimChat | 44 | public class IRCBridgeModule : IRegionModule, ISimChat |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | private static readonly ILog m_log = |
47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private const int DEBUG_CHANNEL = 2147483647; | 49 | private const int DEBUG_CHANNEL = 2147483647; |
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
94 | m_irc_connector.Name = "IRCConnectorThread"; | 94 | m_irc_connector.Name = "IRCConnectorThread"; |
95 | m_irc_connector.IsBackground = true; | 95 | m_irc_connector.IsBackground = true; |
96 | } | 96 | } |
97 | m_log.InfoFormat("[IRC] initialized for {0}, nick: {1} ", scene.RegionInfo.RegionName, | 97 | m_log.InfoFormat("[IRC] initialized for {0}, nick: {1} ", scene.RegionInfo.RegionName, |
98 | m_defaultzone); | 98 | m_defaultzone); |
99 | } | 99 | } |
100 | } | 100 | } |
@@ -222,7 +222,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
222 | if ((m_irc.Enabled) && (m_irc.Connected)) | 222 | if ((m_irc.Enabled) && (m_irc.Connected)) |
223 | { | 223 | { |
224 | m_log.DebugFormat("[IRC] {0} logging on", clientName); | 224 | m_log.DebugFormat("[IRC] {0} logging on", clientName); |
225 | m_irc.PrivMsg(m_irc.Nick, "Sim", | 225 | m_irc.PrivMsg(m_irc.Nick, "Sim", |
226 | String.Format("notices {0} logging on", clientName)); | 226 | String.Format("notices {0} logging on", clientName)); |
227 | } | 227 | } |
228 | m_last_new_user = clientName; | 228 | m_last_new_user = clientName; |
@@ -288,7 +288,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
288 | m_log.InfoFormat("[IRC]: {0} logging out", clientName); | 288 | m_log.InfoFormat("[IRC]: {0} logging out", clientName); |
289 | } | 289 | } |
290 | 290 | ||
291 | if (m_last_new_user == clientName) | 291 | if (m_last_new_user == clientName) |
292 | m_last_new_user = null; | 292 | m_last_new_user = null; |
293 | } | 293 | } |
294 | } | 294 | } |
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
588 | if (!avatar.IsChildAgent) | 588 | if (!avatar.IsChildAgent) |
589 | { | 589 | { |
590 | avatar.ControllingClient.SendChatMessage( | 590 | avatar.ControllingClient.SendChatMessage( |
591 | Helpers.StringToField(data["msg"]), | 591 | Helpers.StringToField(data["msg"]), |
592 | 1, // 255, | 592 | 1, // 255, |
593 | pos, data["nick"], | 593 | pos, data["nick"], |
594 | LLUUID.Zero,(byte)ChatSourceType.Agent,(byte)ChatAudibleLevel.Fully); | 594 | LLUUID.Zero,(byte)ChatSourceType.Agent,(byte)ChatAudibleLevel.Fully); |
@@ -634,9 +634,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
634 | if (!avatar.IsChildAgent) | 634 | if (!avatar.IsChildAgent) |
635 | { | 635 | { |
636 | avatar.ControllingClient.SendChatMessage( | 636 | avatar.ControllingClient.SendChatMessage( |
637 | Helpers.StringToField(String.Format(format, args)), | 637 | Helpers.StringToField(String.Format(format, args)), |
638 | 1, //255, | 638 | 1, //255, |
639 | pos, sender, LLUUID.Zero, | 639 | pos, sender, LLUUID.Zero, |
640 | (byte)ChatSourceType.Object, | 640 | (byte)ChatSourceType.Object, |
641 | (byte)ChatAudibleLevel.Fully); | 641 | (byte)ChatAudibleLevel.Fully); |
642 | } | 642 | } |