From 9de3fe94105d753db9a12539236b8402f0e97cbd Mon Sep 17 00:00:00 2001 From: Dev Random Date: Fri, 7 Mar 2014 17:13:57 -0500 Subject: [PATCH 1/8] Add Varregion support to osGetRegionSize OSSL function Signed-off-by: Michael Cerquoni --- .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 73174b4330..4cd683c039 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); } } From 12f2648a578afa59b01d3fe1ae54faf90cc62e61 Mon Sep 17 00:00:00 2001 From: Michael Cerquoni Date: Sat, 8 Mar 2014 15:41:26 -0500 Subject: [PATCH 2/8] set RefreshTime = 0 in [MapImageService] in Grid.ini and GridHypergrid.ini to eliminate memory leaking for Warp3D map tiler, these variables should be erased needs more discussion! --- bin/config-include/Grid.ini | 2 +- bin/config-include/GridHypergrid.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 69a209a915..e1b9b897fa 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -66,4 +66,4 @@ LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" ; in minutes - RefreshTime = 60 + RefreshTime = 0 diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 2a66b4c744..21dbeca3f4 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -98,4 +98,4 @@ LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" ; in minutes - RefreshTime = 60 + RefreshTime = 0 From da990d01f258892ccd5702eaac654547badd409a Mon Sep 17 00:00:00 2001 From: Michael Cerquoni Date: Sat, 8 Mar 2014 15:57:19 -0500 Subject: [PATCH 3/8] set RefreshTime = 0 in [MapImageService] in Standalone.ini and StandaloneHypergrid.ini to eliminate memory leaking for Warp3D map tiler, these variables should be erased needs more discussion! --- bin/config-include/Standalone.ini | 2 +- bin/config-include/StandaloneHypergrid.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 424d8c85b9..887257bb6f 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -120,7 +120,7 @@ LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" ; in minutes - RefreshTime = 60 + RefreshTime = 0 ;; This should always be the very last thing on this file [Includes] diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 370ab90fd3..3194b0bd8a 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -134,7 +134,7 @@ [MapImageService] LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" ; in minutes - RefreshTime = 60 + RefreshTime = 0 [GatekeeperService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" From e3c4936deabf76156c789a816ea3779e9b9afdc4 Mon Sep 17 00:00:00 2001 From: Michael Cerquoni Date: Sat, 8 Mar 2014 16:28:45 -0500 Subject: [PATCH 4/8] remove RefreshTime = 0 from [MapImageService] in Standalone.ini, StandaloneHypergrid.ini, Grid.ini, GridHypergrid.ini they were redundant and would not allow variables in OpenSim.ini to be set to anything. --- bin/config-include/Grid.ini | 3 --- bin/config-include/GridHypergrid.ini | 3 --- bin/config-include/Standalone.ini | 3 --- bin/config-include/StandaloneHypergrid.ini | 2 -- 4 files changed, 11 deletions(-) diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index e1b9b897fa..e7141a177f 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 = 0 diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 21dbeca3f4..8f17527940 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 = 0 diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 887257bb6f..ee07e74577 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 = 0 - ;; 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 3194b0bd8a..f39cf097a4 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 = 0 [GatekeeperService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" From a96601478c17bfcdce0d13d7ba9608caa2551e14 Mon Sep 17 00:00:00 2001 From: Michael Cerquoni Date: Sat, 8 Mar 2014 21:48:33 -0500 Subject: [PATCH 5/8] add [BakedTextureService] section to Robust.HG.ini.example file same as Robust.ini.example. --- bin/Robust.HG.ini.example | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 965e2416e8..578dee55de 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -632,5 +632,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 directiry must exist and be writable for the user ROBUST runs as + BaseDirectory = "/data/bakes" From abcb2cdb364bb00d6c0f77c3de23bc7364d063a7 Mon Sep 17 00:00:00 2001 From: Michael Cerquoni Date: Sat, 8 Mar 2014 21:50:41 -0500 Subject: [PATCH 6/8] add XBakes connector to Robust.HG.ini.example --- bin/Robust.HG.ini.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 578dee55de..e3e9da74e0 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 From cfd3e8f0ea2ef90a94eac5065e1a2f17d384b298 Mon Sep 17 00:00:00 2001 From: Michael Cerquoni Date: Sun, 9 Mar 2014 11:46:25 -0400 Subject: [PATCH 7/8] minor spelling mistake fix. --- bin/Robust.HG.ini.example | 2 +- bin/Robust.ini.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index e3e9da74e0..6f0ae14a6e 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -638,6 +638,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset [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/Robust.ini.example b/bin/Robust.ini.example index 004a9c9d31..fb09e99bb6 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -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" From 4f67286044058edbf6660f2be49b0fc5532d3d30 Mon Sep 17 00:00:00 2001 From: Michael Cerquoni Date: Sun, 9 Mar 2014 19:09:10 -0400 Subject: [PATCH 8/8] fix missing quote for xBakes connector in Robust example ini files --- bin/Robust.HG.ini.example | 2 +- bin/Robust.ini.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 6f0ae14a6e..245f363b38 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -60,7 +60,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" ;; Additions for Hypergrid diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index fb09e99bb6..829e3930b5 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"