aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2007-07-14 22:44:41 +0000
committerAdam Frisby2007-07-14 22:44:41 +0000
commite9bcc7a3fd315e52e97a760dc1e8d346bab71361 (patch)
treebb171a680521be9f117c6abe5424a407edbaf346 /OpenSim
parent* Excelsior! (diff)
downloadopensim-SC-e9bcc7a3fd315e52e97a760dc1e8d346bab71361.zip
opensim-SC-e9bcc7a3fd315e52e97a760dc1e8d346bab71361.tar.gz
opensim-SC-e9bcc7a3fd315e52e97a760dc1e8d346bab71361.tar.bz2
opensim-SC-e9bcc7a3fd315e52e97a760dc1e8d346bab71361.tar.xz
* Fixed an issue which caused regions to crash when duplicating primitives.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 68d214b..b488447 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -105,6 +105,7 @@ namespace OpenSim.Region.Environment.Scenes
105 m_eventManager.OnBackup += new EventManager.OnBackupDelegate(ProcessBackup); 105 m_eventManager.OnBackup += new EventManager.OnBackupDelegate(ProcessBackup);
106 m_eventManager.OnParcelPrimCountUpdate += new EventManager.OnParcelPrimCountUpdateDelegate(ProcessParcelPrimCountUpdate); 106 m_eventManager.OnParcelPrimCountUpdate += new EventManager.OnParcelPrimCountUpdateDelegate(ProcessParcelPrimCountUpdate);
107 } 107 }
108
108 public void unregisterEvents() 109 public void unregisterEvents()
109 { 110 {
110 m_eventManager.OnBackup -= new EventManager.OnBackupDelegate(ProcessBackup); 111 m_eventManager.OnBackup -= new EventManager.OnBackupDelegate(ProcessBackup);
@@ -162,6 +163,7 @@ namespace OpenSim.Region.Environment.Scenes
162 SceneObject dupe = new SceneObject(); 163 SceneObject dupe = new SceneObject();
163 164
164 dupe.m_world = this.m_world; 165 dupe.m_world = this.m_world;
166 dupe.m_eventManager = this.m_eventManager;
165 dupe.m_regionHandle = this.m_regionHandle; 167 dupe.m_regionHandle = this.m_regionHandle;
166 Primitive newRoot = this.rootPrimitive.Copy(dupe, dupe); 168 Primitive newRoot = this.rootPrimitive.Copy(dupe, dupe);
167 dupe.rootPrimitive = newRoot; 169 dupe.rootPrimitive = newRoot;