diff options
author | Jeff Ames | 2007-11-08 03:11:10 +0000 |
---|---|---|
committer | Jeff Ames | 2007-11-08 03:11:10 +0000 |
commit | 0b4e15bc3586422d273bd8845962a2db681230e2 (patch) | |
tree | f3394ee384d7b20fc8c1f0eee4ebda3c10203a1a /OpenSim/Region/Environment/Modules | |
parent | * Added Rotational Velocity reporting for Client Interpolation to Terse Updates (diff) | |
download | opensim-SC_OLD-0b4e15bc3586422d273bd8845962a2db681230e2.zip opensim-SC_OLD-0b4e15bc3586422d273bd8845962a2db681230e2.tar.gz opensim-SC_OLD-0b4e15bc3586422d273bd8845962a2db681230e2.tar.bz2 opensim-SC_OLD-0b4e15bc3586422d273bd8845962a2db681230e2.tar.xz |
converted hard-coded chat type values to ChatTypeEnum
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/WorldCommModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs index 7a631d7..a31b484 100644 --- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs +++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Environment.Modules | |||
113 | private void DeliverClientMessage(Object sender, ChatFromViewerArgs e) | 113 | private void DeliverClientMessage(Object sender, ChatFromViewerArgs e) |
114 | { | 114 | { |
115 | DeliverMessage(e.Sender.AgentId.ToString(), | 115 | DeliverMessage(e.Sender.AgentId.ToString(), |
116 | (int) e.Type, e.Channel, | 116 | e.Type, e.Channel, |
117 | e.Sender.FirstName + " " + e.Sender.LastName, | 117 | e.Sender.FirstName + " " + e.Sender.LastName, |
118 | e.Message); | 118 | e.Message); |
119 | } | 119 | } |
@@ -140,8 +140,8 @@ namespace OpenSim.Region.Environment.Modules | |||
140 | // and if so if this message fits the filter. If it does, then | 140 | // and if so if this message fits the filter. If it does, then |
141 | // enqueue the message for delivery to the objects listen event handler. | 141 | // enqueue the message for delivery to the objects listen event handler. |
142 | // Objects that do an llSay have their messages delivered here, and for | 142 | // Objects that do an llSay have their messages delivered here, and for |
143 | // nearby avatards, the SimChat function is used. | 143 | // nearby avatars, the SimChat function is used. |
144 | public void DeliverMessage(string sourceItemID, int type, int channel, string name, string msg) | 144 | public void DeliverMessage(string sourceItemID, ChatTypeEnum type, int channel, string name, string msg) |
145 | { | 145 | { |
146 | SceneObjectPart source = null; | 146 | SceneObjectPart source = null; |
147 | ScenePresence avatar = null; | 147 | ScenePresence avatar = null; |
@@ -177,7 +177,7 @@ namespace OpenSim.Region.Environment.Modules | |||
177 | 177 | ||
178 | switch (type) | 178 | switch (type) |
179 | { | 179 | { |
180 | case 0: // Whisper | 180 | case ChatTypeEnum.Whisper: |
181 | 181 | ||
182 | if ((dis < 10) && (dis > -10)) | 182 | if ((dis < 10) && (dis > -10)) |
183 | { | 183 | { |
@@ -191,7 +191,7 @@ namespace OpenSim.Region.Environment.Modules | |||
191 | } | 191 | } |
192 | break; | 192 | break; |
193 | 193 | ||
194 | case 1: // Say | 194 | case ChatTypeEnum.Say: |
195 | 195 | ||
196 | if ((dis < 30) && (dis > -30)) | 196 | if ((dis < 30) && (dis > -30)) |
197 | { | 197 | { |
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Environment.Modules | |||
205 | } | 205 | } |
206 | break; | 206 | break; |
207 | 207 | ||
208 | case 2: // Shout | 208 | case ChatTypeEnum.Shout: |
209 | if ((dis < 100) && (dis > -100)) | 209 | if ((dis < 100) && (dis > -100)) |
210 | { | 210 | { |
211 | ListenerInfo isListener = m_listenerManager.IsListenerMatch( | 211 | ListenerInfo isListener = m_listenerManager.IsListenerMatch( |
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Environment.Modules | |||
218 | } | 218 | } |
219 | break; | 219 | break; |
220 | 220 | ||
221 | case 0xff: // Broadcast | 221 | case ChatTypeEnum.Broadcast: |
222 | ListenerInfo isListen = | 222 | ListenerInfo isListen = |
223 | m_listenerManager.IsListenerMatch(sourceItemID, eb, channel, name, msg); | 223 | m_listenerManager.IsListenerMatch(sourceItemID, eb, channel, name, msg); |
224 | if (isListen != null) | 224 | if (isListen != null) |