From 67b0fcf806b0f246fd4386410d445b9ac3e29aea Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 13:07:13 -0800 Subject: * Added OpenSim.Server.HG.ini as an add-on to OpenSim.Server.ini * Cleaned up standalone configs --- bin/OpenSim.Server.HG.ini | 44 +++++++++++++++++++++++++ bin/config-include/StandaloneCommon.ini.example | 14 +++++++- bin/config-include/StandaloneHypergrid.ini | 9 ----- 3 files changed, 57 insertions(+), 10 deletions(-) create mode 100644 bin/OpenSim.Server.HG.ini diff --git a/bin/OpenSim.Server.HG.ini b/bin/OpenSim.Server.HG.ini new file mode 100644 index 0000000..2ec4957 --- /dev/null +++ b/bin/OpenSim.Server.HG.ini @@ -0,0 +1,44 @@ +;; Extra configurations for enabling HG1.5 + +;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService +;; OpenSim.Server.Handlers.dll:UserAgentService +;; OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector + +ServiceConnectors = "8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector" + +[LoginService] + UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" + ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) + ; CHANGE THIS + HomeURI = "http://127.0.0.1:8002" + GatekeeperURI = "http://127.0.0.1:8002" + InventoryServerURI = "http://127.0.0.1:8002" + AssetServerURI = "http://127.0.0.1:8002" + +[GatekeeperService] + LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" + ;; for the service + UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" + UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" + AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" + SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" + ; how does the outside world reach me? This acts as public key too. + ; CHANGE THIS + ExternalName = "http://127.0.0.1:8002" + +[UserAgentService] + LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" + ;; for the service + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" + +;; The interface that local users get when they are in other grids. +;; This restricts the inventory operations while in other grids. +;; Still not completely safe, especially if users perform inventory operations +;; while in those grids. The more the user accesses his/her inventory, the more +;; those simulators will know about the user's inventory. +[HGInventoryService] + ; For the InventoryServiceInConnector + LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 0d54b4d..b4db6dc 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -47,4 +47,16 @@ [LibraryModule] ; Set this if you want to change the name of the OpenSim Library - ;LibraryName = "My World's Library" \ No newline at end of file + ;LibraryName = "My World's Library" + +[LoginService] + DefaultRegion = "OpenSim Test" + WelcomeMessage = "Welcome, Avatar!" + + HomeURI = "http://127.0.0.1:9000" + GatekeeperURI = "http://127.0.0.1:9000" + InventoryServerURI = "http://127.0.0.1:9000" + AssetServerURI = "http://127.0.0.1:9000" + +[GatekeeperService] + ExternalName = "http://127.0.0.1:9000" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 63ea832..06f1898 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -86,14 +86,6 @@ GridService = "OpenSim.Services.GridService.dll:GridService" AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" - DefaultRegion = "OpenSim Test" - WelcomeMessage = "Welcome, Avatar!" - - HomeURI = "http://127.0.0.1:9000" - GatekeeperURI = "http://127.0.0.1:9000" - InventoryServerURI = "http://127.0.0.1:9000" - AssetServerURI = "http://127.0.0.1:9000" - [GatekeeperService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" ;; for the service @@ -103,7 +95,6 @@ GridService = "OpenSim.Services.GridService.dll:GridService" AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" ; how does the outside world reach me? This acts as public key too. - ExternalName = "http://127.0.0.1:9000" [UserAgentService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" -- cgit v1.1