Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

7 files changed, 13 insertions, 15 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
             }
             else
             {
-                return new LSL_Vector((float)Constants.RegionSize, (float)Constants.RegionSize, Constants.RegionHeight);
+                Scene scene = m_ScriptEngine.World;
+                GridRegion region = scene.GridService.GetRegionByUUID(UUID.Zero, World.RegionInfo.RegionID);
+                return new LSL_Vector((float)region.RegionSizeX, (float)region.RegionSizeX, Constants.RegionHeight);
             }
         }
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 965e241..245f363 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -59,6 +59,8 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
 ; OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
 ;; Uncomment this if you want Groups V2 to work
 ; GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
+;; Uncomment to provide bakes caching
+;BakedTextureService = "8003/OpenSim.Server.Handlers.dll:XBakesConnector"
 
 ;; Additions for Hypergrid
 
@@ -632,5 +634,10 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ;; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
     ;; Realm = UserProfiles
     UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
-    AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService
+        
+[BakedTextureService]
+    LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
+    ;; This directory must exist and be writable for the user ROBUST runs as
+    BaseDirectory = "/data/bakes"
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 004a9c9..829e393 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -51,7 +51,7 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
 ;; Uncomment this if you want Groups V2 to work
 ;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
 ;; Uncomment to provide bakes caching
-;BakedTextureService = "8003/OpenSim.Server.Handlers.dll:XBakesConnector
+;BakedTextureService = "8003/OpenSim.Server.Handlers.dll:XBakesConnector"
 
 ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
 ; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector"
@@ -454,6 +454,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
 
 [BakedTextureService]
     LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
-    ;; This directiry must exist and be writable for the user ROBUST runs as
+    ;; This directory must exist and be writable for the user ROBUST runs as
     BaseDirectory = "/data/bakes"
 
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 69a209a..e7141a1 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -64,6 +64,3 @@
 
 [MapImageService]
         LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-
-        ; in minutes
-        RefreshTime = 60
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 2a66b4c..8f17527 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -96,6 +96,3 @@
 
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-
-    ; in minutes
-    RefreshTime = 60
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 424d8c8..ee07e74 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -119,9 +119,6 @@
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
-    ; in minutes
-    RefreshTime = 60
-
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 370ab90..f39cf09 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -133,8 +133,6 @@
    
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-    ; in minutes
-    RefreshTime = 60
 
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"