diff options
| author | Justin Clark-Casey (justincc) | 2010-08-25 23:05:54 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-25 23:05:54 +0100 |
| commit | 24d06b12c2c361305dfcfd78497abb4bec3e3a38 (patch) | |
| tree | 92188f37315346d8285b5abf931f8eb893ae1cde /OpenSim | |
| parent | refactor: Push item retrieval and fixing part of Scene.RezObject() down into ... (diff) | |
| download | opensim-SC-24d06b12c2c361305dfcfd78497abb4bec3e3a38.zip opensim-SC-24d06b12c2c361305dfcfd78497abb4bec3e3a38.tar.gz opensim-SC-24d06b12c2c361305dfcfd78497abb4bec3e3a38.tar.bz2 opensim-SC-24d06b12c2c361305dfcfd78497abb4bec3e3a38.tar.xz | |
If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID
Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 117f869..952d280 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -335,7 +335,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 335 | public override UUID UUID | 335 | public override UUID UUID |
| 336 | { | 336 | { |
| 337 | get { return m_rootPart.UUID; } | 337 | get { return m_rootPart.UUID; } |
| 338 | set { m_rootPart.UUID = value; } | 338 | set |
| 339 | { | ||
| 340 | m_rootPart.UUID = value; | ||
| 341 | |||
| 342 | lock (m_parts) | ||
| 343 | { | ||
| 344 | m_parts.Remove(m_rootPart.UUID); | ||
| 345 | m_parts.Add(m_rootPart.UUID, m_rootPart); | ||
| 346 | } | ||
| 347 | } | ||
| 339 | } | 348 | } |
| 340 | 349 | ||
| 341 | public UUID OwnerID | 350 | public UUID OwnerID |