aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
diff options
context:
space:
mode:
authorMelanie2009-12-23 21:22:19 +0000
committerMelanie2009-12-23 21:22:19 +0000
commit6eecbc95e41aa75259e3b27426878c2c191832d8 (patch)
treebca7dda2195a83462d9fa04a3442b4e993334b44 /OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-6eecbc95e41aa75259e3b27426878c2c191832d8.zip
opensim-SC-6eecbc95e41aa75259e3b27426878c2c191832d8.tar.gz
opensim-SC-6eecbc95e41aa75259e3b27426878c2c191832d8.tar.bz2
opensim-SC-6eecbc95e41aa75259e3b27426878c2c191832d8.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
index 6fcb5d0..82020cb 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
@@ -148,7 +148,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
148 ChatEventArgs e = new ChatEventArgs(); 148 ChatEventArgs e = new ChatEventArgs();
149 e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId, m_security); 149 e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId, m_security);
150 e.Text = chat.Message; 150 e.Text = chat.Message;
151 151 e.Channel = chat.Channel;
152
152 _OnChat(this, e); 153 _OnChat(this, e);
153 return; 154 return;
154 } 155 }
@@ -158,7 +159,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
158 ChatEventArgs e = new ChatEventArgs(); 159 ChatEventArgs e = new ChatEventArgs();
159 e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID, m_security); 160 e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID, m_security);
160 e.Text = chat.Message; 161 e.Text = chat.Message;
161 162 e.Channel = chat.Channel;
163
162 _OnChat(this, e); 164 _OnChat(this, e);
163 return; 165 return;
164 } 166 }