diff options
| author | Justin Clarke Casey | 2008-11-07 18:46:11 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-11-07 18:46:11 +0000 |
| commit | ebd9f22b29bfbe0cfb0689405984f856e0413405 (patch) | |
| tree | afc766dad4e3888fd773ac0e5186a9fdb45fb88f /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |
| parent | * Apply patch in http://opensimulator.org/mantis/view.php?id=2397 (diff) | |
| download | opensim-SC_OLD-ebd9f22b29bfbe0cfb0689405984f856e0413405.zip opensim-SC_OLD-ebd9f22b29bfbe0cfb0689405984f856e0413405.tar.gz opensim-SC_OLD-ebd9f22b29bfbe0cfb0689405984f856e0413405.tar.bz2 opensim-SC_OLD-ebd9f22b29bfbe0cfb0689405984f856e0413405.tar.xz | |
* refactor: allocate local ids to prims only when an object is attached to a scene
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index c59fffc..4e93551 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
| @@ -1953,8 +1953,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1953 | if (rezAsset != null) | 1953 | if (rezAsset != null) |
| 1954 | { | 1954 | { |
| 1955 | string xmlData = Utils.BytesToString(rezAsset.Data); | 1955 | string xmlData = Utils.BytesToString(rezAsset.Data); |
| 1956 | SceneObjectGroup group = new SceneObjectGroup(this, m_regionHandle, xmlData); | 1956 | SceneObjectGroup group = new SceneObjectGroup(xmlData, true); |
| 1957 | if (!ExternalChecks.ExternalChecksCanRezObject(group.Children.Count, remoteClient.AgentId, pos) && !attachment) | 1957 | if (!ExternalChecks.ExternalChecksCanRezObject( |
| 1958 | group.Children.Count, remoteClient.AgentId, pos) | ||
| 1959 | && !attachment) | ||
| 1958 | { | 1960 | { |
| 1959 | return null; | 1961 | return null; |
| 1960 | } | 1962 | } |
| @@ -2091,7 +2093,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 2091 | if (rezAsset != null) | 2093 | if (rezAsset != null) |
| 2092 | { | 2094 | { |
| 2093 | string xmlData = Utils.BytesToString(rezAsset.Data); | 2095 | string xmlData = Utils.BytesToString(rezAsset.Data); |
| 2094 | SceneObjectGroup group = new SceneObjectGroup(this, m_regionHandle, xmlData); | 2096 | SceneObjectGroup group = new SceneObjectGroup(xmlData, true); |
| 2095 | 2097 | ||
| 2096 | if (!ExternalChecks.ExternalChecksCanRezObject(group.Children.Count, ownerID, pos)) | 2098 | if (!ExternalChecks.ExternalChecksCanRezObject(group.Children.Count, ownerID, pos)) |
| 2097 | { | 2099 | { |