diff options
| author | lcc | 2010-04-10 23:52:10 +0200 |
|---|---|---|
| committer | lcc | 2010-04-10 23:52:10 +0200 |
| commit | 7ecd9b3f1ac4556125a35ab384224b2ca0401a11 (patch) | |
| tree | 63151eb7e3693485af9db8947f2004f586062ca5 /OpenSim/Region/ClientStack | |
| parent | Adding ColdStart event (diff) | |
| parent | guarantee that a script engine's GetScriptErrors() will not be called (diff) | |
| download | opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.zip opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.gz opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.bz2 opensim-SC_OLD-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
resolved
Conflicts:
OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index ebcdd62..b0e3655 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -5200,7 +5200,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 5200 | args.Channel = ch; | 5200 | args.Channel = ch; |
| 5201 | args.From = String.Empty; | 5201 | args.From = String.Empty; |
| 5202 | args.Message = Utils.BytesToString(msg); | 5202 | args.Message = Utils.BytesToString(msg); |
| 5203 | args.Type = ChatTypeEnum.Shout; | 5203 | args.Type = ChatTypeEnum.Region; //Behaviour in SL is that the response can be heard from any distance |
| 5204 | args.Position = new Vector3(); | 5204 | args.Position = new Vector3(); |
| 5205 | args.Scene = Scene; | 5205 | args.Scene = Scene; |
| 5206 | args.Sender = this; | 5206 | args.Sender = this; |