diff options
| author | Justin Clark-Casey (justincc) | 2014-03-11 00:16:31 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-11 00:16:31 +0000 |
| commit | 932c9e757b1e4ba519ba9d486e9773290c5b3719 (patch) | |
| tree | 755cb9976d4d7b8bdc6b196cbc612a635201323a /OpenSim | |
| parent | Send group notices through the same messaging module mechanism used to send g... (diff) | |
| parent | fix missing quote for xBakes connector in Robust example ini files (diff) | |
| download | opensim-SC_OLD-932c9e757b1e4ba519ba9d486e9773290c5b3719.zip opensim-SC_OLD-932c9e757b1e4ba519ba9d486e9773290c5b3719.tar.gz opensim-SC_OLD-932c9e757b1e4ba519ba9d486e9773290c5b3719.tar.bz2 opensim-SC_OLD-932c9e757b1e4ba519ba9d486e9773290c5b3719.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 73174b4..4cd683c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2946,7 +2946,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2946 | } | 2946 | } |
| 2947 | else | 2947 | else |
| 2948 | { | 2948 | { |
| 2949 | return new LSL_Vector((float)Constants.RegionSize, (float)Constants.RegionSize, Constants.RegionHeight); | 2949 | Scene scene = m_ScriptEngine.World; |
| 2950 | GridRegion region = scene.GridService.GetRegionByUUID(UUID.Zero, World.RegionInfo.RegionID); | ||
| 2951 | return new LSL_Vector((float)region.RegionSizeX, (float)region.RegionSizeX, Constants.RegionHeight); | ||
| 2950 | } | 2952 | } |
| 2951 | } | 2953 | } |
| 2952 | 2954 | ||