diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/ScriptEngine/XEngine/Api/Runtime | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs b/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs index f4211c8..80d9e2a 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs | |||
| @@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.ScriptBase | |||
| 44 | /// <summary> | 44 | /// <summary> |
| 45 | /// Used for script sleeps when we are using co-operative script termination. | 45 | /// Used for script sleeps when we are using co-operative script termination. |
| 46 | /// </summary> | 46 | /// </summary> |
| 47 | /// <remarks>null if co-operative script termination is not active</remarks> | 47 | /// <remarks>null if co-operative script termination is not active</remarks> |
| 48 | WaitHandle m_coopSleepHandle; | 48 | WaitHandle m_coopSleepHandle; |
| 49 | 49 | ||
| 50 | public XEngineScriptBase(WaitHandle coopSleepHandle) : base() | 50 | public XEngineScriptBase(WaitHandle coopSleepHandle) : base() |