OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.8.0.3
Justin Clark-Casey (justincc) 2014-03-11 00:16:31 +00:00
parent 77e7bbcbf7 4f67286044
commit 932c9e757b
7 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -2946,7 +2946,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
else 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);
} }
} }

9
bin/Robust.HG.ini.example
View File

@ -59,6 +59,8 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
; OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector" ; OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
;; Uncomment this if you want Groups V2 to work ;; Uncomment this if you want Groups V2 to work
; GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector" ; GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
;; Uncomment to provide bakes caching
;BakedTextureService = "8003/OpenSim.Server.Handlers.dll:XBakesConnector"
;; Additions for Hypergrid ;; 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;" ;; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
;; Realm = UserProfiles ;; Realm = UserProfiles
UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService 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"

4
bin/Robust.ini.example
View File

@ -51,7 +51,7 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
;; Uncomment this if you want Groups V2 to work ;; Uncomment this if you want Groups V2 to work
;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector" ;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
;; Uncomment to provide bakes caching ;; 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... ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector" ; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector"
@ -454,6 +454,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
[BakedTextureService] [BakedTextureService]
LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes" 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" BaseDirectory = "/data/bakes"

3
bin/config-include/Grid.ini
View File

@ -64,6 +64,3 @@
[MapImageService] [MapImageService]
LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
; in minutes
RefreshTime = 60

3
bin/config-include/GridHypergrid.ini
View File

@ -96,6 +96,3 @@
[MapImageService] [MapImageService]
LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
; in minutes
RefreshTime = 60

3
bin/config-include/Standalone.ini
View File

@ -119,9 +119,6 @@
[MapImageService] [MapImageService]
LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
; in minutes
RefreshTime = 60
;; This should always be the very last thing on this file ;; This should always be the very last thing on this file
[Includes] [Includes]
Include-Common = "config-include/StandaloneCommon.ini" Include-Common = "config-include/StandaloneCommon.ini"

2
bin/config-include/StandaloneHypergrid.ini
View File

@ -133,8 +133,6 @@
[MapImageService] [MapImageService]
LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
; in minutes
RefreshTime = 60
[GatekeeperService] [GatekeeperService]
LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"