diff options
author | Justin Clarke Casey | 2008-01-16 20:27:12 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-01-16 20:27:12 +0000 |
commit | b33da2538ed728bdc97cca20ada36913097160b0 (patch) | |
tree | 0464763a340891a49134d7bd66468302bc38dcad /OpenSim/Region/Environment/Scenes/InnerScene.cs | |
parent | * Fixed a packet counting issue that I introduced (diff) | |
download | opensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.zip opensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.tar.gz opensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.tar.bz2 opensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.tar.xz |
* Fix mantis 345 - it is now possible to duplicate prims directly in the region again without breakage
* This includes their inventories
* Also, this revision properly synchronizes prim inventory crud.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 0116428..9aa3f20 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -928,17 +928,22 @@ namespace OpenSim.Region.Environment.Scenes | |||
928 | { | 928 | { |
929 | SceneObjectGroup copy = originPrim.Copy(AgentID, GroupID); | 929 | SceneObjectGroup copy = originPrim.Copy(AgentID, GroupID); |
930 | copy.AbsolutePosition = copy.AbsolutePosition + offset; | 930 | copy.AbsolutePosition = copy.AbsolutePosition + offset; |
931 | copy.ResetIDs(); | ||
932 | |||
931 | lock (Entities) | 933 | lock (Entities) |
932 | { | 934 | { |
933 | Entities.Add(copy.UUID, copy); | 935 | Entities.Add(copy.UUID, copy); |
934 | } | 936 | } |
937 | |||
935 | m_numPrim++; | 938 | m_numPrim++; |
939 | |||
940 | copy.StartScripts(); | ||
936 | copy.ScheduleGroupForFullUpdate(); | 941 | copy.ScheduleGroupForFullUpdate(); |
937 | } | 942 | } |
938 | } | 943 | } |
939 | else | 944 | else |
940 | { | 945 | { |
941 | MainLog.Instance.Warn("client", "Attempted to duplicate nonexistant prim"); | 946 | MainLog.Instance.Warn("SCENE", "Attempted to duplicate nonexistant prim id {0}", GroupID); |
942 | } | 947 | } |
943 | } | 948 | } |
944 | 949 | ||