diff options
| author | UbitUmarov | 2016-12-04 23:39:15 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-04 23:39:15 +0000 |
| commit | 1680425f4d3ddd1c59d99daee23180d985f24d86 (patch) | |
| tree | 56c22c5773ec4663840b1dee0002c9f8dc9d5133 /OpenSim/Region/OptionalModules/Scripting | |
| parent | update httpserver (diff) | |
| parent | HG: fix the never ending avatar confirmation when 2 users from same grid made... (diff) | |
| download | opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.zip opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.gz opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.bz2 opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs index e7d461f..7a0370a 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | |||
| @@ -783,7 +783,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
| 783 | group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint; | 783 | group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint; |
| 784 | } | 784 | } |
| 785 | 785 | ||
| 786 | group.FromPartID = host.RootPart.UUID; | 786 | group.RezzerID = host.RootPart.UUID; |
| 787 | m_scene.AddNewSceneObject(group, true, curpos, rot, vel); | 787 | m_scene.AddNewSceneObject(group, true, curpos, rot, vel); |
| 788 | 788 | ||
| 789 | UUID storeID = group.UUID; | 789 | UUID storeID = group.UUID; |