diff options
author | Melanie Thielker | 2008-07-14 01:32:16 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-14 01:32:16 +0000 |
commit | eaf9383b599041c86877cb11a698ae7ad4be8d46 (patch) | |
tree | df5561fae3aeff44c19e5a625ad818f8ee08606b /OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |
parent | Patch #9148 (diff) | |
download | opensim-SC_OLD-eaf9383b599041c86877cb11a698ae7ad4be8d46.zip opensim-SC_OLD-eaf9383b599041c86877cb11a698ae7ad4be8d46.tar.gz opensim-SC_OLD-eaf9383b599041c86877cb11a698ae7ad4be8d46.tar.bz2 opensim-SC_OLD-eaf9383b599041c86877cb11a698ae7ad4be8d46.tar.xz |
Patch #9149
Make all of the toggles go live. Utilizes the new database table for almost everything. Remove lots of now unneeded settings from the EstateSettings class
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | 76 |
1 files changed, 28 insertions, 48 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 15141e5..55896d4 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |||
@@ -106,35 +106,16 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
106 | switch (corner) | 106 | switch (corner) |
107 | { | 107 | { |
108 | case 0: | 108 | case 0: |
109 | m_scene.RegionInfo.EstateSettings.terrainBase0 = texture; | 109 | m_scene.RegionInfo.RegionSettings.TerrainTexture1 = texture; |
110 | break; | 110 | break; |
111 | case 1: | 111 | case 1: |
112 | m_scene.RegionInfo.EstateSettings.terrainBase1 = texture; | 112 | m_scene.RegionInfo.RegionSettings.TerrainTexture2 = texture; |
113 | break; | 113 | break; |
114 | case 2: | 114 | case 2: |
115 | m_scene.RegionInfo.EstateSettings.terrainBase2 = texture; | 115 | m_scene.RegionInfo.RegionSettings.TerrainTexture3 = texture; |
116 | break; | 116 | break; |
117 | case 3: | 117 | case 3: |
118 | m_scene.RegionInfo.EstateSettings.terrainBase3 = texture; | 118 | m_scene.RegionInfo.RegionSettings.TerrainTexture4 = texture; |
119 | break; | ||
120 | } | ||
121 | } | ||
122 | |||
123 | public void setEstateTerrainDetailTexture(IClientAPI client, int corner, LLUUID textureUUID) | ||
124 | { | ||
125 | switch (corner) | ||
126 | { | ||
127 | case 0: | ||
128 | m_scene.RegionInfo.EstateSettings.terrainDetail0 = textureUUID; | ||
129 | break; | ||
130 | case 1: | ||
131 | m_scene.RegionInfo.EstateSettings.terrainDetail1 = textureUUID; | ||
132 | break; | ||
133 | case 2: | ||
134 | m_scene.RegionInfo.EstateSettings.terrainDetail2 = textureUUID; | ||
135 | break; | ||
136 | case 3: | ||
137 | m_scene.RegionInfo.EstateSettings.terrainDetail3 = textureUUID; | ||
138 | break; | 119 | break; |
139 | } | 120 | } |
140 | } | 121 | } |
@@ -144,20 +125,20 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
144 | switch (corner) | 125 | switch (corner) |
145 | { | 126 | { |
146 | case 0: | 127 | case 0: |
147 | m_scene.RegionInfo.EstateSettings.terrainStartHeight0 = lowValue; | 128 | m_scene.RegionInfo.RegionSettings.Elevation1SW = lowValue; |
148 | m_scene.RegionInfo.EstateSettings.terrainHeightRange0 = highValue; | 129 | m_scene.RegionInfo.RegionSettings.Elevation2SW = highValue; |
149 | break; | 130 | break; |
150 | case 1: | 131 | case 1: |
151 | m_scene.RegionInfo.EstateSettings.terrainStartHeight1 = lowValue; | 132 | m_scene.RegionInfo.RegionSettings.Elevation1NW = lowValue; |
152 | m_scene.RegionInfo.EstateSettings.terrainHeightRange1 = highValue; | 133 | m_scene.RegionInfo.RegionSettings.Elevation2NW = highValue; |
153 | break; | 134 | break; |
154 | case 2: | 135 | case 2: |
155 | m_scene.RegionInfo.EstateSettings.terrainStartHeight2 = lowValue; | 136 | m_scene.RegionInfo.RegionSettings.Elevation1SE = lowValue; |
156 | m_scene.RegionInfo.EstateSettings.terrainHeightRange2 = highValue; | 137 | m_scene.RegionInfo.RegionSettings.Elevation2SE = highValue; |
157 | break; | 138 | break; |
158 | case 3: | 139 | case 3: |
159 | m_scene.RegionInfo.EstateSettings.terrainStartHeight3 = lowValue; | 140 | m_scene.RegionInfo.RegionSettings.Elevation1NE = lowValue; |
160 | m_scene.RegionInfo.EstateSettings.terrainHeightRange3 = highValue; | 141 | m_scene.RegionInfo.RegionSettings.Elevation2NE = highValue; |
161 | break; | 142 | break; |
162 | } | 143 | } |
163 | } | 144 | } |
@@ -532,14 +513,14 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
532 | args.isEstateManager = estatemanager; | 513 | args.isEstateManager = estatemanager; |
533 | 514 | ||
534 | args.billableFactor = m_scene.RegionInfo.EstateSettings.billableFactor; | 515 | args.billableFactor = m_scene.RegionInfo.EstateSettings.billableFactor; |
535 | args.terrainHeightRange0 = m_scene.RegionInfo.EstateSettings.terrainHeightRange0; | 516 | args.terrainStartHeight0 = (float)m_scene.RegionInfo.RegionSettings.Elevation1SW; |
536 | args.terrainHeightRange1 = m_scene.RegionInfo.EstateSettings.terrainHeightRange1; | 517 | args.terrainHeightRange0 = (float)m_scene.RegionInfo.RegionSettings.Elevation2SW; |
537 | args.terrainHeightRange2 = m_scene.RegionInfo.EstateSettings.terrainHeightRange2; | 518 | args.terrainStartHeight1 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NW; |
538 | args.terrainHeightRange3 = m_scene.RegionInfo.EstateSettings.terrainHeightRange3; | 519 | args.terrainHeightRange1 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NW; |
539 | args.terrainStartHeight0 = m_scene.RegionInfo.EstateSettings.terrainStartHeight0; | 520 | args.terrainStartHeight2 = (float)m_scene.RegionInfo.RegionSettings.Elevation1SE; |
540 | args.terrainStartHeight1 = m_scene.RegionInfo.EstateSettings.terrainStartHeight1; | 521 | args.terrainHeightRange2 = (float)m_scene.RegionInfo.RegionSettings.Elevation2SE; |
541 | args.terrainStartHeight2 = m_scene.RegionInfo.EstateSettings.terrainStartHeight2; | 522 | args.terrainStartHeight3 = (float)m_scene.RegionInfo.RegionSettings.Elevation1NE; |
542 | args.terrainStartHeight3 = m_scene.RegionInfo.EstateSettings.terrainStartHeight3; | 523 | args.terrainHeightRange3 = (float)m_scene.RegionInfo.RegionSettings.Elevation2NE; |
543 | byte mature = 13; | 524 | byte mature = 13; |
544 | if(m_scene.RegionInfo.RegionSettings.Maturity == 1) | 525 | if(m_scene.RegionInfo.RegionSettings.Maturity == 1) |
545 | mature = 21; | 526 | mature = 21; |
@@ -549,14 +530,14 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
549 | args.regionFlags = GetRegionFlags(); | 530 | args.regionFlags = GetRegionFlags(); |
550 | args.regionName = m_scene.RegionInfo.RegionName; | 531 | args.regionName = m_scene.RegionInfo.RegionName; |
551 | args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 532 | args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
552 | args.terrainBase0 = m_scene.RegionInfo.EstateSettings.terrainBase0; | 533 | args.terrainBase0 = m_scene.RegionInfo.RegionSettings.TerrainTexture1; |
553 | args.terrainBase1 = m_scene.RegionInfo.EstateSettings.terrainBase1; | 534 | args.terrainBase1 = m_scene.RegionInfo.RegionSettings.TerrainTexture2; |
554 | args.terrainBase2 = m_scene.RegionInfo.EstateSettings.terrainBase2; | 535 | args.terrainBase2 = m_scene.RegionInfo.RegionSettings.TerrainTexture3; |
555 | args.terrainBase3 = m_scene.RegionInfo.EstateSettings.terrainBase3; | 536 | args.terrainBase3 = m_scene.RegionInfo.RegionSettings.TerrainTexture4; |
556 | args.terrainDetail0 = m_scene.RegionInfo.EstateSettings.terrainDetail0; | 537 | args.terrainDetail0 = m_scene.RegionInfo.RegionSettings.TerrainTexture1; |
557 | args.terrainDetail1 = m_scene.RegionInfo.EstateSettings.terrainDetail1; | 538 | args.terrainDetail1 = m_scene.RegionInfo.RegionSettings.TerrainTexture2; |
558 | args.terrainDetail2 = m_scene.RegionInfo.EstateSettings.terrainDetail2; | 539 | args.terrainDetail2 = m_scene.RegionInfo.RegionSettings.TerrainTexture3; |
559 | args.terrainDetail3 = m_scene.RegionInfo.EstateSettings.terrainDetail3; | 540 | args.terrainDetail3 = m_scene.RegionInfo.RegionSettings.TerrainTexture4; |
560 | 541 | ||
561 | remoteClient.SendRegionHandshake(m_scene.RegionInfo,args); | 542 | remoteClient.SendRegionHandshake(m_scene.RegionInfo,args); |
562 | } | 543 | } |
@@ -617,7 +598,6 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
617 | client.OnDetailedEstateDataRequest += sendDetailedEstateData; | 598 | client.OnDetailedEstateDataRequest += sendDetailedEstateData; |
618 | client.OnSetEstateFlagsRequest += estateSetRegionInfoHandler; | 599 | client.OnSetEstateFlagsRequest += estateSetRegionInfoHandler; |
619 | client.OnSetEstateTerrainBaseTexture += setEstateTerrainBaseTexture; | 600 | client.OnSetEstateTerrainBaseTexture += setEstateTerrainBaseTexture; |
620 | client.OnSetEstateTerrainDetailTexture += setEstateTerrainDetailTexture; | ||
621 | client.OnSetEstateTerrainTextureHeights += setEstateTerrainTextureHeights; | 601 | client.OnSetEstateTerrainTextureHeights += setEstateTerrainTextureHeights; |
622 | client.OnCommitEstateTerrainTextureRequest += handleCommitEstateTerrainTextureRequest; | 602 | client.OnCommitEstateTerrainTextureRequest += handleCommitEstateTerrainTextureRequest; |
623 | client.OnSetRegionTerrainSettings += setRegionTerrainSettings; | 603 | client.OnSetRegionTerrainSettings += setRegionTerrainSettings; |