diff options
| author | Melanie | 2013-09-16 22:32:53 +0100 |
|---|---|---|
| committer | Melanie | 2013-09-16 22:32:53 +0100 |
| commit | 72206a0e294865bf0c93ea16910276a188d51ce6 (patch) | |
| tree | f7769826d78863b2e0e416fe529f0c55065e0acd /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mono 2.0 fix - call ToArray() explicitly (diff) | |
| download | opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.zip opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.gz opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.bz2 opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
| -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 2fb073d..2427cbe 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -231,6 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 231 | ItemID = ScriptTask.ItemID; | 231 | ItemID = ScriptTask.ItemID; |
| 232 | AssetID = ScriptTask.AssetID; | 232 | AssetID = ScriptTask.AssetID; |
| 233 | } | 233 | } |
| 234 | LocalID = part.LocalId; | ||
| 234 | 235 | ||
| 235 | PrimName = part.ParentGroup.Name; | 236 | PrimName = part.ParentGroup.Name; |
| 236 | StartParam = startParam; | 237 | StartParam = startParam; |