aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-19 04:05:34 +0000
committerMelanie Thielker2008-07-19 04:05:34 +0000
commitbcf74416a1677584c069e4e0b9acf9015d8c5b6c (patch)
tree8c0b967fafbc21e93974760c0b32a0dd2119b930 /OpenSim/Region/Environment/Modules
parentIntroduce a separate connection string for estates, which defaults to the one gi (diff)
downloadopensim-SC-bcf74416a1677584c069e4e0b9acf9015d8c5b6c.zip
opensim-SC-bcf74416a1677584c069e4e0b9acf9015d8c5b6c.tar.gz
opensim-SC-bcf74416a1677584c069e4e0b9acf9015d8c5b6c.tar.bz2
opensim-SC-bcf74416a1677584c069e4e0b9acf9015d8c5b6c.tar.xz
Fix prim link numbers (Mantis #1781)
Implements additional unlink modes (unlink root prim from link set, some multi-set operations). Linking (single and mutiple) fully implemented. Consistent numbering of links while in world. Link/delink with predictable link numbering. Correct link numbers in LSL. Not all multi-set ops implemented. Link numbers still change when taken and re-rezzed.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index ab0adf2..3996fb3 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -558,10 +558,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
558 args.regionFlags = GetRegionFlags(); 558 args.regionFlags = GetRegionFlags();
559 args.regionName = m_scene.RegionInfo.RegionName; 559 args.regionName = m_scene.RegionInfo.RegionName;
560 args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; 560 args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
561 args.terrainBase0 = m_scene.RegionInfo.RegionSettings.TerrainTexture1; 561 args.terrainBase0 = LLUUID.Zero;
562 args.terrainBase1 = m_scene.RegionInfo.RegionSettings.TerrainTexture2; 562 args.terrainBase1 = LLUUID.Zero;
563 args.terrainBase2 = m_scene.RegionInfo.RegionSettings.TerrainTexture3; 563 args.terrainBase2 = LLUUID.Zero;
564 args.terrainBase3 = m_scene.RegionInfo.RegionSettings.TerrainTexture4; 564 args.terrainBase3 = LLUUID.Zero;
565 args.terrainDetail0 = m_scene.RegionInfo.RegionSettings.TerrainTexture1; 565 args.terrainDetail0 = m_scene.RegionInfo.RegionSettings.TerrainTexture1;
566 args.terrainDetail1 = m_scene.RegionInfo.RegionSettings.TerrainTexture2; 566 args.terrainDetail1 = m_scene.RegionInfo.RegionSettings.TerrainTexture2;
567 args.terrainDetail2 = m_scene.RegionInfo.RegionSettings.TerrainTexture3; 567 args.terrainDetail2 = m_scene.RegionInfo.RegionSettings.TerrainTexture3;