aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
-rw-r--r--bin/Robust.HG.ini.example9
-rw-r--r--bin/Robust.ini.example4
-rw-r--r--bin/config-include/Grid.ini3
-rw-r--r--bin/config-include/GridHypergrid.ini3
-rw-r--r--bin/config-include/Standalone.ini3
-rw-r--r--bin/config-include/StandaloneHypergrid.ini2
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
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
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
59; OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector" 59; OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
60;; Uncomment this if you want Groups V2 to work 60;; Uncomment this if you want Groups V2 to work
61; GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector" 61; GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
62;; Uncomment to provide bakes caching
63;BakedTextureService = "8003/OpenSim.Server.Handlers.dll:XBakesConnector"
62 64
63;; Additions for Hypergrid 65;; Additions for Hypergrid
64 66
@@ -632,5 +634,10 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
632 ;; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" 634 ;; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
633 ;; Realm = UserProfiles 635 ;; Realm = UserProfiles
634 UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService 636 UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
635 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 637 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService
638
639[BakedTextureService]
640 LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
641 ;; This directory must exist and be writable for the user ROBUST runs as
642 BaseDirectory = "/data/bakes"
636 643
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
51;; Uncomment this if you want Groups V2 to work 51;; Uncomment this if you want Groups V2 to work
52;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector" 52;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
53;; Uncomment to provide bakes caching 53;; Uncomment to provide bakes caching
54;BakedTextureService = "8003/OpenSim.Server.Handlers.dll:XBakesConnector 54;BakedTextureService = "8003/OpenSim.Server.Handlers.dll:XBakesConnector"
55 55
56;; Uncomment for UserProfiles see [UserProfilesService] to configure... 56;; Uncomment for UserProfiles see [UserProfilesService] to configure...
57; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector" 57; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector"
@@ -454,6 +454,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
454 454
455[BakedTextureService] 455[BakedTextureService]
456 LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes" 456 LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
457 ;; This directiry must exist and be writable for the user ROBUST runs as 457 ;; This directory must exist and be writable for the user ROBUST runs as
458 BaseDirectory = "/data/bakes" 458 BaseDirectory = "/data/bakes"
459 459
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 @@
64 64
65[MapImageService] 65[MapImageService]
66 LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" 66 LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
67
68 ; in minutes
69 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 @@
96 96
97[MapImageService] 97[MapImageService]
98 LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" 98 LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
99
100 ; in minutes
101 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 @@
119[MapImageService] 119[MapImageService]
120 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 120 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
121 121
122 ; in minutes
123 RefreshTime = 60
124
125;; This should always be the very last thing on this file 122;; This should always be the very last thing on this file
126[Includes] 123[Includes]
127 Include-Common = "config-include/StandaloneCommon.ini" 124 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 @@
133 133
134[MapImageService] 134[MapImageService]
135 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 135 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
136 ; in minutes
137 RefreshTime = 60
138 136
139[GatekeeperService] 137[GatekeeperService]
140 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 138 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"