diff options
author | Melanie Thielker | 2009-03-22 11:57:00 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-03-22 11:57:00 +0000 |
commit | b83ad8a97b8d508e696f8cc11cf0c178c26b3e99 (patch) | |
tree | 34a6646342700355118cd945d9618ee8bf73ee7c /OpenSim/Region/ScriptEngine | |
parent | Explicit tests for local regions. (diff) | |
download | opensim-SC-b83ad8a97b8d508e696f8cc11cf0c178c26b3e99.zip opensim-SC-b83ad8a97b8d508e696f8cc11cf0c178c26b3e99.tar.gz opensim-SC-b83ad8a97b8d508e696f8cc11cf0c178c26b3e99.tar.bz2 opensim-SC-b83ad8a97b8d508e696f8cc11cf0c178c26b3e99.tar.xz |
Thank you, dslake, for a patch that fixes XEngine linemap handling.
Fixes Mantis #3321
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 40a6dd1..b725f58 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -504,6 +504,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
504 | CultureInfo USCulture = new CultureInfo("en-US"); | 504 | CultureInfo USCulture = new CultureInfo("en-US"); |
505 | Thread.CurrentThread.CurrentCulture = USCulture; | 505 | Thread.CurrentThread.CurrentCulture = USCulture; |
506 | 506 | ||
507 | Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap; | ||
508 | |||
507 | try | 509 | try |
508 | { | 510 | { |
509 | lock (m_AddingAssemblies) | 511 | lock (m_AddingAssemblies) |
@@ -515,6 +517,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
515 | } else { | 517 | } else { |
516 | m_AddingAssemblies[assembly]++; | 518 | m_AddingAssemblies[assembly]++; |
517 | } | 519 | } |
520 | linemap = m_Compiler.LineMap(); | ||
518 | } | 521 | } |
519 | 522 | ||
520 | string[] warnings = m_Compiler.GetWarnings(); | 523 | string[] warnings = m_Compiler.GetWarnings(); |
@@ -649,7 +652,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
649 | part.ParentGroup.RootPart.Name, item.Name); | 652 | part.ParentGroup.RootPart.Name, item.Name); |
650 | 653 | ||
651 | instance.AppDomain = appDomain; | 654 | instance.AppDomain = appDomain; |
652 | instance.LineMap = m_Compiler.LineMap(); | 655 | instance.LineMap = linemap; |
653 | 656 | ||
654 | m_Scripts[itemID] = instance; | 657 | m_Scripts[itemID] = instance; |
655 | } | 658 | } |