diff options
Diffstat (limited to 'bin/config-include')
-rw-r--r-- | bin/config-include/FlotsamCache.ini.example | 4 | ||||
-rw-r--r-- | bin/config-include/Grid.ini | 3 | ||||
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 4 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 15 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 12 |
5 files changed, 30 insertions, 8 deletions
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example index cd39f8c..b9c6d84 100644 --- a/bin/config-include/FlotsamCache.ini.example +++ b/bin/config-include/FlotsamCache.ini.example | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | ; How often {in hours} should the disk be checked for expired filed | 37 | ; How often {in hours} should the disk be checked for expired filed |
38 | ; Specify 0 to disable expiration checking | 38 | ; Specify 0 to disable expiration checking |
39 | FileCleanupTimer = .166 ;roughly every 10 minutes | 39 | FileCleanupTimer = 1.0 ;every hour |
40 | 40 | ||
41 | ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how | 41 | ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how |
42 | ; long (in miliseconds) to block a request thread while trying to complete | 42 | ; long (in miliseconds) to block a request thread while trying to complete |
@@ -60,4 +60,4 @@ | |||
60 | ; cache, and request all assets that are found that are not already cached (this | 60 | ; cache, and request all assets that are found that are not already cached (this |
61 | ; will cause those assets to be cached) | 61 | ; will cause those assets to be cached) |
62 | ; | 62 | ; |
63 | ; DeepScanBeforePurge = false | 63 | DeepScanBeforePurge = true |
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 95d6264..cb3a5c8 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
@@ -29,9 +29,6 @@ | |||
29 | SimulationServiceInConnector = true | 29 | SimulationServiceInConnector = true |
30 | LibraryModule = true | 30 | LibraryModule = true |
31 | 31 | ||
32 | [Profile] | ||
33 | Module = "BasicProfileModule" | ||
34 | |||
35 | [SimulationDataStore] | 32 | [SimulationDataStore] |
36 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 33 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
37 | 34 | ||
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index fa6f525..8d7f6fc 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -137,6 +137,10 @@ | |||
137 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 137 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |
138 | ; OutboundPermission = False | 138 | ; OutboundPermission = False |
139 | 139 | ||
140 | [HGFriendsModule] | ||
141 | ; User level required to be able to send friendship invitations to foreign users | ||
142 | ;LevelHGFriends = 0; | ||
143 | |||
140 | [UserAgentService] | 144 | [UserAgentService] |
141 | ; | 145 | ; |
142 | ; === HG ONLY === | 146 | ; === HG ONLY === |
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index d307387..ba72fe7 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -25,9 +25,6 @@ | |||
25 | GridInfoServiceInConnector = true | 25 | GridInfoServiceInConnector = true |
26 | MapImageServiceInConnector = true | 26 | MapImageServiceInConnector = true |
27 | 27 | ||
28 | [Profile] | ||
29 | Module = "BasicProfileModule" | ||
30 | |||
31 | [SimulationDataStore] | 28 | [SimulationDataStore] |
32 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 29 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
33 | 30 | ||
@@ -95,6 +92,18 @@ | |||
95 | 92 | ||
96 | WelcomeMessage = "Welcome, Avatar!" | 93 | WelcomeMessage = "Welcome, Avatar!" |
97 | 94 | ||
95 | ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time" | ||
96 | ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time | ||
97 | ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not. | ||
98 | ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids. | ||
99 | ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST. | ||
100 | ;; Options are | ||
101 | ;; "none" no DST | ||
102 | ;; "local" use the server's only timezone to calculate DST. This is previous OpenSimulator behaviour. | ||
103 | ;; "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings. | ||
104 | ;; 'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows | ||
105 | DSTZone = "America/Los_Angeles;Pacific Standard Time" | ||
106 | |||
98 | [MapImageService] | 107 | [MapImageService] |
99 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" | 108 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" |
100 | ; in minutes | 109 | ; in minutes |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 8d9842c..e4bc548 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -61,6 +61,10 @@ | |||
61 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 61 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |
62 | ; OutboundPermission = False | 62 | ; OutboundPermission = False |
63 | 63 | ||
64 | [HGFriendsModule] | ||
65 | ; User level required to be able to send friendship invitations to foreign users | ||
66 | ;LevelHGFriends = 0; | ||
67 | |||
64 | [GridService] | 68 | [GridService] |
65 | ;; For in-memory region storage (default) | 69 | ;; For in-memory region storage (default) |
66 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 70 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
@@ -231,6 +235,14 @@ | |||
231 | ; currently unused | 235 | ; currently unused |
232 | ;password = http://127.0.0.1/password | 236 | ;password = http://127.0.0.1/password |
233 | 237 | ||
238 | ; HG address of the gatekeeper, if you have one | ||
239 | ; this is the entry point for all the regions of the world | ||
240 | ; gatekeeper = http://127.0.0.1:9000/ | ||
241 | |||
242 | ; HG user domain, if you have one | ||
243 | ; this is the entry point for all user-related HG services | ||
244 | ; uas = http://127.0.0.1:9000/ | ||
245 | |||
234 | [MapImageService] | 246 | [MapImageService] |
235 | ; Set this if you want to change the default | 247 | ; Set this if you want to change the default |
236 | ; TilesStoragePath = "maptiles" | 248 | ; TilesStoragePath = "maptiles" |