diff options
author | Justin Clarke Casey | 2008-07-21 21:10:15 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-21 21:10:15 +0000 |
commit | 714e1f678676e314e060db5e2cfb27de51bb1392 (patch) | |
tree | 04aa2c5631d7b5748cc61ad2d91040c6b2b4cd39 /OpenSim/Region/Environment/Scenes | |
parent | Mantis#1544. Thank you kindly, Jonc, for a patch that: (diff) | |
download | opensim-SC-714e1f678676e314e060db5e2cfb27de51bb1392.zip opensim-SC-714e1f678676e314e060db5e2cfb27de51bb1392.tar.gz opensim-SC-714e1f678676e314e060db5e2cfb27de51bb1392.tar.bz2 opensim-SC-714e1f678676e314e060db5e2cfb27de51bb1392.tar.xz |
* Give new uuids to all the objects loaded in from an archive.
* This should allow multiple copies of an archive to be loaded into different regions on the same region server
* This shouldn't affect existing operations.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 5ab7731..0cf2016 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -2047,7 +2047,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
2047 | /// <param name="vel"></param> | 2047 | /// <param name="vel"></param> |
2048 | /// <param name="param"></param> | 2048 | /// <param name="param"></param> |
2049 | /// <returns></returns> | 2049 | /// <returns></returns> |
2050 | public virtual SceneObjectGroup RezObject(SceneObjectPart sourcePart, TaskInventoryItem item, LLVector3 pos, LLQuaternion rot, LLVector3 vel, int param) | 2050 | public virtual SceneObjectGroup RezObject( |
2051 | SceneObjectPart sourcePart, TaskInventoryItem item, | ||
2052 | LLVector3 pos, LLQuaternion rot, LLVector3 vel, int param) | ||
2051 | { | 2053 | { |
2052 | // Rez object | 2054 | // Rez object |
2053 | if (item != null) | 2055 | if (item != null) |