diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index fbfb400..9446844 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -3298,8 +3298,11 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
3298 | result.Add(src.Substring(start,length).Trim()); | 3298 | result.Add(src.Substring(start,length).Trim()); |
3299 | start += length+1; | 3299 | start += length+1; |
3300 | length = 0; | 3300 | length = 0; |
3301 | } else | 3301 | } |
3302 | else | ||
3303 | { | ||
3302 | length++; | 3304 | length++; |
3305 | } | ||
3303 | break; | 3306 | break; |
3304 | default : | 3307 | default : |
3305 | length++; | 3308 | length++; |
@@ -5301,7 +5304,8 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5301 | { | 5304 | { |
5302 | // not present at all | 5305 | // not present at all |
5303 | active[j] = false; | 5306 | active[j] = false; |
5304 | } else | 5307 | } |
5308 | else | ||
5305 | { | 5309 | { |
5306 | // present and correct | 5310 | // present and correct |
5307 | if (offset[j] < offset[best]) | 5311 | if (offset[j] < offset[best]) |
@@ -5329,10 +5333,11 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5329 | 5333 | ||
5330 | tokens.Add(src.Substring(beginning,offset[best]-beginning)); | 5334 | tokens.Add(src.Substring(beginning,offset[best]-beginning)); |
5331 | 5335 | ||
5332 | if (best<seplen) | 5336 | if (best < seplen) |
5333 | { | 5337 | { |
5334 | beginning = offset[best]+((string)separray[best]).Length; | 5338 | beginning = offset[best]+((string)separray[best]).Length; |
5335 | } else | 5339 | } |
5340 | else | ||
5336 | { | 5341 | { |
5337 | beginning = offset[best]+((string)spcarray[best-seplen]).Length; | 5342 | beginning = offset[best]+((string)spcarray[best-seplen]).Length; |
5338 | tokens.Add(spcarray[best-seplen]); | 5343 | tokens.Add(spcarray[best-seplen]); |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index a328a58..bfa9951 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -80,11 +80,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
80 | TaskInventoryItem taskInventoryItem = new TaskInventoryItem(); | 80 | TaskInventoryItem taskInventoryItem = new TaskInventoryItem(); |
81 | if(m_host.TaskInventory.TryGetValue(itemID,out taskInventoryItem)) | 81 | if(m_host.TaskInventory.TryGetValue(itemID,out taskInventoryItem)) |
82 | assetID = taskInventoryItem.AssetID; | 82 | assetID = taskInventoryItem.AssetID; |
83 | 83 | ||
84 | 84 | ||
85 | try | 85 | try |
86 | { | 86 | { |
87 | // Xantor 20080525 see if we already compiled this script this session, stop incessant recompiling on | 87 | // Xantor 20080525 see if we already compiled this script this session, stop incessant recompiling on |
88 | // scriptreset, spawning of objects with embedded scripts etc. | 88 | // scriptreset, spawning of objects with embedded scripts etc. |
89 | 89 | ||
90 | if (scriptList.TryGetValue(assetID, out CompiledScriptFile)) | 90 | if (scriptList.TryGetValue(assetID, out CompiledScriptFile)) |