diff options
| author | Melanie Thielker | 2008-09-22 11:18:49 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-09-22 11:18:49 +0000 |
| commit | b8a39a4dde7d70bd641cd78b4840e4bc39a79b51 (patch) | |
| tree | 8f9581312e4fa75bb0c036df978a6263bc96d0c4 /OpenSim | |
| parent | Disabled use of ODE internal geometry to see if it affects the "waves finger"... (diff) | |
| download | opensim-SC-b8a39a4dde7d70bd641cd78b4840e4bc39a79b51.zip opensim-SC-b8a39a4dde7d70bd641cd78b4840e4bc39a79b51.tar.gz opensim-SC-b8a39a4dde7d70bd641cd78b4840e4bc39a79b51.tar.bz2 opensim-SC-b8a39a4dde7d70bd641cd78b4840e4bc39a79b51.tar.xz | |
Remove the script engine identifier tag, so the compiler just sees
the language specifier. Makes language specifiers work again with
script engine specifiers.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 04fe4cd..c72be7c 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | |||
| @@ -204,6 +204,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
| 204 | if (firstline.Length > 2 && firstline.Substring(0, 2) == "//" && colon != -1) | 204 | if (firstline.Length > 2 && firstline.Substring(0, 2) == "//" && colon != -1) |
| 205 | { | 205 | { |
| 206 | engine = firstline.Substring(2, colon-2); | 206 | engine = firstline.Substring(2, colon-2); |
| 207 | script = "//" + script.Substring(script.IndexOf(':')+1); | ||
| 207 | } | 208 | } |
| 208 | } | 209 | } |
| 209 | 210 | ||
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 934a1b9..9219c13 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -351,6 +351,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 351 | if (firstline.Length > 2 && firstline.Substring(0, 2) == "//" && colon != -1) | 351 | if (firstline.Length > 2 && firstline.Substring(0, 2) == "//" && colon != -1) |
| 352 | { | 352 | { |
| 353 | engine = firstline.Substring(2, colon-2); | 353 | engine = firstline.Substring(2, colon-2); |
| 354 | script = "//" + script.Substring(script.IndexOf(':')+1); | ||
| 354 | } | 355 | } |
| 355 | } | 356 | } |
| 356 | 357 | ||