aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorDiva Canto2010-11-25 11:14:16 -0800
committerDiva Canto2010-11-25 11:14:16 -0800
commitae4b02e1152b775dc1cdccd1abfbff44ab1a8949 (patch)
treed0b89d3bf8f3256a3043c2d21bd7a22cb23891c0 /bin/config-include
parentAttempt at fixing failing test. (diff)
downloadopensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.zip
opensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.tar.gz
opensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.tar.bz2
opensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.tar.xz
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/StandaloneCommon.ini.example16
-rw-r--r--bin/config-include/StandaloneHypergrid.ini8
2 files changed, 19 insertions, 5 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 1fcf043..d002d49 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -25,6 +25,13 @@
25 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 25 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
26 AssetLoaderArgs = "assets/AssetSets.xml" 26 AssetLoaderArgs = "assets/AssetSets.xml"
27 27
28[HGInventoryService]
29 ProfileServerURI = "http://127.0.0.1:9000/profiles"
30
31[HGAssetService]
32 ProfileServerURI = "http://127.0.0.1:9000/profiles"
33
34
28[Modules] 35[Modules]
29 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 36 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
30 ;; Copy the config .example file into your own .ini file and change configs there 37 ;; Copy the config .example file into your own .ini file and change configs there
@@ -68,11 +75,12 @@
68 75
69[LoginService] 76[LoginService]
70 WelcomeMessage = "Welcome, Avatar!" 77 WelcomeMessage = "Welcome, Avatar!"
71
72 HomeURI = "http://127.0.0.1:9000"
73 GatekeeperURI = "http://127.0.0.1:9000" 78 GatekeeperURI = "http://127.0.0.1:9000"
74 InventoryServerURI = "http://127.0.0.1:9000" 79
75 AssetServerURI = "http://127.0.0.1:9000" 80 SRV_HomeURI = "http://127.0.0.1:9000"
81 SRV_InventoryServerURI = "http://127.0.0.1:9000"
82 SRV_AssetServerURI = "http://127.0.0.1:9000"
83 SRV_ProfileServerURI = "http://127.0.0.1:9000"
76 84
77[GatekeeperService] 85[GatekeeperService]
78 ExternalName = "http://127.0.0.1:9000" 86 ExternalName = "http://127.0.0.1:9000"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index f164d33..68aa739 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -128,8 +128,14 @@
128;; This greatly restricts the inventory operations while in other grids 128;; This greatly restricts the inventory operations while in other grids
129[HGInventoryService] 129[HGInventoryService]
130 ; For the InventoryServiceInConnector 130 ; For the InventoryServiceInConnector
131 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" 131 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
132 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
132 133
134;; The interface that local users get when they are in other grids
135;; This restricts/filters the asset operations from the outside
136[HGAssetService]
137 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
138 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
133 139
134;; This should always be the very last thing on this file 140;; This should always be the very last thing on this file
135[Includes] 141[Includes]