diff options
| author | Melanie | 2010-01-03 21:43:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-03 21:43:39 +0000 |
| commit | 61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11 (patch) | |
| tree | 7780b88dc26de91fe0b95a0a234a7f995adf5d22 /OpenSim/Region/ScriptEngine/XEngine | |
| parent | Add virtual method StateChange to ScriptBaseClass (diff) | |
| parent | Cause llSetText to send prim updates. (diff) | |
| download | opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.zip opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.gz opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.bz2 opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index c831c69..d65107e 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -659,7 +659,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 659 | 659 | ||
| 660 | Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap; | 660 | Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap; |
| 661 | 661 | ||
| 662 | lock(m_ScriptErrors) | 662 | lock (m_ScriptErrors) |
| 663 | { | 663 | { |
| 664 | try | 664 | try |
| 665 | { | 665 | { |