diff options
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 891e453..c8ced43 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -307,6 +307,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 307 | null, | 307 | null, |
| 308 | constructorParams, | 308 | constructorParams, |
| 309 | null, | 309 | null, |
| 310 | null, | ||
| 310 | null); | 311 | null); |
| 311 | else | 312 | else |
| 312 | m_Script | 313 | m_Script |