diff options
| author | Melanie Thielker | 2008-07-14 01:39:36 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-07-14 01:39:36 +0000 |
| commit | 07bd749ac56dc498610fc88e61cc7ab04047620e (patch) | |
| tree | 7e1e8f017f1abe0f3dcc21c29bbae7bafb4b456f /OpenSim/Region/ScriptEngine | |
| parent | Patch #9149 (diff) | |
| download | opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.zip opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.gz opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.bz2 opensim-SC_OLD-07bd749ac56dc498610fc88e61cc7ab04047620e.tar.xz | |
Patch #9150
Patch 7 of the region patches. Finish off the region parts of the estate dialog. Full user functionality. Terrain textures, heights, water, avatar counts, prim bonus, debug settings and region toggles can now be set from the dialog on a per-region basis. Estate stuff defaults to sane values where there are no defaults, to estate_settings.xml otherwise. Sun still b0rked :(
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 0d3049d..4106fbb 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
| @@ -3274,7 +3274,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
| 3274 | 3274 | ||
| 3275 | // sunPosition estate setting is set in OpenSim.Region.Environment.Modules.SunModule | 3275 | // sunPosition estate setting is set in OpenSim.Region.Environment.Modules.SunModule |
| 3276 | // have to convert from LLVector3 (float) to LSL_Types.Vector3 (double) | 3276 | // have to convert from LLVector3 (float) to LSL_Types.Vector3 (double) |
| 3277 | SunFloatVector3 = World.RegionInfo.EstateSettings.sunPosition; | 3277 | SunFloatVector3 = World.RegionInfo.RegionSettings.SunVector; |
| 3278 | SunDoubleVector3.x = (double)SunFloatVector3.X; | 3278 | SunDoubleVector3.x = (double)SunFloatVector3.X; |
| 3279 | SunDoubleVector3.y = (double)SunFloatVector3.Y; | 3279 | SunDoubleVector3.y = (double)SunFloatVector3.Y; |
| 3280 | SunDoubleVector3.z = (double)SunFloatVector3.Z; | 3280 | SunDoubleVector3.z = (double)SunFloatVector3.Z; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 30a64c7..06a6086 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3214,7 +3214,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3214 | 3214 | ||
| 3215 | // sunPosition estate setting is set in OpenSim.Region.Environment.Modules.SunModule | 3215 | // sunPosition estate setting is set in OpenSim.Region.Environment.Modules.SunModule |
| 3216 | // have to convert from LLVector3 (float) to LSL_Types.Vector3 (double) | 3216 | // have to convert from LLVector3 (float) to LSL_Types.Vector3 (double) |
| 3217 | SunFloatVector3 = World.RegionInfo.EstateSettings.sunPosition; | 3217 | SunFloatVector3 = World.RegionInfo.RegionSettings.SunVector; |
| 3218 | SunDoubleVector3.x = (double)SunFloatVector3.X; | 3218 | SunDoubleVector3.x = (double)SunFloatVector3.X; |
| 3219 | SunDoubleVector3.y = (double)SunFloatVector3.Y; | 3219 | SunDoubleVector3.y = (double)SunFloatVector3.Y; |
| 3220 | SunDoubleVector3.z = (double)SunFloatVector3.Z; | 3220 | SunDoubleVector3.z = (double)SunFloatVector3.Z; |