aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bin/Ionic.Zip.dllbin0 -> 462336 bytes
-rw-r--r--bin/OpenSim.Framework.Serialization.Tests.dll.config33
-rw-r--r--bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config33
-rw-r--r--bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config33
-rw-r--r--bin/OpenSim.Region.OptionalModules.Tests.dll.config33
-rw-r--r--bin/OpenSim.Tests.Torture.dll.config33
-rwxr-xr-xbin/OpenSim.ini.example24
-rw-r--r--bin/OpenSimDefaults.ini70
-rwxr-xr-xbin/PrimMesher.dllbin37376 -> 46592 bytes
-rw-r--r--bin/Robust.HG.ini.example27
-rw-r--r--bin/Robust.ini.example29
-rw-r--r--bin/config-include/FlotsamCache.ini.example4
-rw-r--r--bin/config-include/Grid.ini3
-rw-r--r--bin/config-include/GridCommon.ini.example4
-rw-r--r--bin/config-include/Standalone.ini15
-rw-r--r--bin/config-include/StandaloneCommon.ini.example12
-rw-r--r--bin/pCampBot.exe.config2
17 files changed, 160 insertions, 195 deletions
diff --git a/bin/Ionic.Zip.dll b/bin/Ionic.Zip.dll
new file mode 100644
index 0000000..95fa928
--- /dev/null
+++ b/bin/Ionic.Zip.dll
Binary files differ
diff --git a/bin/OpenSim.Framework.Serialization.Tests.dll.config b/bin/OpenSim.Framework.Serialization.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Framework.Serialization.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config b/bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config b/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Region.OptionalModules.Tests.dll.config b/bin/OpenSim.Region.OptionalModules.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Region.OptionalModules.Tests.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Tests.Torture.dll.config b/bin/OpenSim.Tests.Torture.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Tests.Torture.dll.config
+++ /dev/null
@@ -1,33 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 50366a6..aa29c07 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -241,6 +241,19 @@
241 ;; server to send mail through. 241 ;; server to send mail through.
242 ; emailmodule = DefaultEmailModule 242 ; emailmodule = DefaultEmailModule
243 243
244 ;# {SpawnPointRouting} {} {Set routing method for Telehub Spawnpoints} {closest random sequence} closest
245 ;; SpawnPointRouting adjusts the landing for incoming avatars.
246 ;; "closest" will place the avatar at the SpawnPoint located in the closest
247 ;; available spot to the destination (typically map click/landmark).
248 ;; "random" will place the avatar on a randomly selected spawnpoint;
249 ;; "sequence" will place the avatar on the next sequential SpawnPoint
250 ; SpawnPointRouting = closest
251
252 ;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false
253 ;; TelehubAllowLandmark allows users with landmarks to override telehub routing and land at the landmark coordinates when set to true
254 ;; default is false
255 ; TelehubAllowLandmark = false
256
244[Estates] 257[Estates]
245 ; If these values are commented out then the user will be asked for estate details when required (this is the normal case). 258 ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
246 ; If these values are uncommented then they will be used to create a default estate as necessary. 259 ; If these values are uncommented then they will be used to create a default estate as necessary.
@@ -273,6 +286,12 @@
273 ;# {host_domain_header_from} {[Startup]emailmodule:DefaultEmailModule enabled:true} {From address to use in the sent email header?} {} 127.0.0.1 286 ;# {host_domain_header_from} {[Startup]emailmodule:DefaultEmailModule enabled:true} {From address to use in the sent email header?} {} 127.0.0.1
274 ; host_domain_header_from = "127.0.0.1" 287 ; host_domain_header_from = "127.0.0.1"
275 288
289 ;# {email_pause_time} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Period in seconds to delay after an email is sent.} {} 20
290 ; email_pause_time = 20
291
292 ;# {email_max_size} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Maximum total size of email in bytes.} {} 4096
293 ; email_max_size = 4096
294
276 ;# {SMTP_SERVER_HOSTNAME} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {} 127.0.0.1 295 ;# {SMTP_SERVER_HOSTNAME} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {} 127.0.0.1
277 ; SMTP_SERVER_HOSTNAME = "127.0.0.1" 296 ; SMTP_SERVER_HOSTNAME = "127.0.0.1"
278 297
@@ -285,7 +304,6 @@
285 ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {} 304 ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
286 ; SMTP_SERVER_PASSWORD = "" 305 ; SMTP_SERVER_PASSWORD = ""
287 306
288
289[Network] 307[Network]
290 ;; Configure the remote console user here. This will not actually be used 308 ;; Configure the remote console user here. This will not actually be used
291 ;; unless you use -console=rest at startup. 309 ;; unless you use -console=rest at startup.
@@ -677,7 +695,7 @@
677 ;; Sets the multiplier for the scripting delays 695 ;; Sets the multiplier for the scripting delays
678 ; ScriptDelayFactor = 1.0 696 ; ScriptDelayFactor = 1.0
679 697
680 ;; The factor the 10 m distances llimits are multiplied by 698 ;; The factor the 10 m distances limits are multiplied by
681 ; ScriptDistanceLimitFactor = 1.0 699 ; ScriptDistanceLimitFactor = 1.0
682 700
683 ;; Maximum length of notecard line read 701 ;; Maximum length of notecard line read
@@ -780,7 +798,7 @@
780 ;; groups service if the service is using these keys 798 ;; groups service if the service is using these keys
781 ; XmlRpcServiceReadKey = 1234 799 ; XmlRpcServiceReadKey = 1234
782 ; XmlRpcServiceWriteKey = 1234 800 ; XmlRpcServiceWriteKey = 1234
783 801
784[InterestManagement] 802[InterestManagement]
785 ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness 803 ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
786 ;; This section controls how state updates are prioritized for each client 804 ;; This section controls how state updates are prioritized for each client
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6fb9787..9afac3f 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -337,6 +337,13 @@
337 ; OpenJPEG if false 337 ; OpenJPEG if false
338 ; UseCSJ2K = true 338 ; UseCSJ2K = true
339 339
340
341 ; Use "Trash" folder for items deleted from the scene
342 ; When set to True (the default) items deleted from the scene will be
343 ; stored in the user's trash or lost and found folder. When set to
344 ; False items will be removed from the scene permanently
345 UseTrashOnDelete = True
346
340 ; Persist avatar baked textures 347 ; Persist avatar baked textures
341 ; Persisting baked textures can speed up login and region border 348 ; Persisting baked textures can speed up login and region border
342 ; crossings especially with large numbers of users, though it 349 ; crossings especially with large numbers of users, though it
@@ -527,7 +534,20 @@
527 ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps 534 ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
528 ; will also be affected. 535 ; will also be affected.
529 ; 536 ;
530 ;DisableFacelights = "false(1815) 537 ;DisableFacelights = false
538
539 ; The time to wait before disconecting an unresponsive client.
540 ; The time is in seconds. The default is one minute
541 ;
542 ;AckTimeout = 60
543
544 ; The time to wait before disconecting an unresponsive paused client.
545 ; A client can be paused when the file selection dialog is open during file upload.
546 ; This gives extra time to find files via the dialog but will still disconnect if
547 ; the client crashes or loses its network connection
548 ; The time is in seconds. The default is five minutes.
549 ;
550 ;PausedAckTimeout = 300
531 551
532[ClientStack.LindenCaps] 552[ClientStack.LindenCaps]
533 ;; Long list of capabilities taken from 553 ;; Long list of capabilities taken from
@@ -542,6 +562,7 @@
542 Cap_CopyInventoryFromNotecard = "localhost" 562 Cap_CopyInventoryFromNotecard = "localhost"
543 Cap_DispatchRegionInfo = "" 563 Cap_DispatchRegionInfo = ""
544 Cap_EstateChangeInfo = "" 564 Cap_EstateChangeInfo = ""
565 Cap_EnvironmentSettings = "localhost"
545 Cap_EventQueueGet = "localhost" 566 Cap_EventQueueGet = "localhost"
546 Cap_FetchInventory = "" 567 Cap_FetchInventory = ""
547 Cap_ObjectMedia = "localhost" 568 Cap_ObjectMedia = "localhost"
@@ -594,13 +615,12 @@
594 Cap_ViewerStartAuction = "" 615 Cap_ViewerStartAuction = ""
595 Cap_ViewerStats = "" 616 Cap_ViewerStats = ""
596 617
597 ; The various fetch inventory caps are supported by OpenSim, but may 618 ; Capabilities for fetching inventory over HTTP rather than UDP
598 ; lead to poor sim performance if served by the simulators,
599 ; so they are currently disabled by default.
600 ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above) 619 ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above)
620 ; It appears that Linden Lab viewer 3.3.1 onwards will not work properly if FetchInventoryDescendents2 and FetchInventory2 are not enabled
601 Cap_WebFetchInventoryDescendents = "" 621 Cap_WebFetchInventoryDescendents = ""
602 Cap_FetchInventoryDescendents2 = "" 622 Cap_FetchInventoryDescendents2 = "localhost"
603 Cap_FetchInventory2 = "" 623 Cap_FetchInventory2 = "localhost"
604 624
605 625
606[Chat] 626[Chat]
@@ -668,6 +688,25 @@
668 688
669 689
670[ODEPhysicsSettings] 690[ODEPhysicsSettings]
691 ; ##
692 ; ## Physics stats settings
693 ;
694
695 ; If collect_stats is enabled, then extra stat information is collected which is accessible via the MonitorModule
696 ; (see http://opensimulator.org/wiki/Monitoring_Module for more details).
697 collect_stats = false
698
699 ; ##
700 ; ## Physics logging settings - logfiles are saved to *.DIF files
701 ; ##
702
703 ; default is false
704 ;physics_logging = true
705 ;; every n simulation iterations, the physics snapshot file is updated
706 ;physics_logging_interval = 50
707 ;; append to existing physics logfile, or overwrite existing logfiles?
708 ;physics_logging_append_existing_logfile = true
709
671 ;## 710 ;##
672 ;## World Settings 711 ;## World Settings
673 ;## 712 ;##
@@ -817,17 +856,6 @@
817 mesh_physical_lod = 16 856 mesh_physical_lod = 16
818 857
819 ; ## 858 ; ##
820 ; ## Physics logging settings - logfiles are saved to *.DIF files
821 ; ##
822
823 ; default is false
824 ;physics_logging = true
825 ;; every n simulation iterations, the physics snapshot file is updated
826 ;physics_logging_interval = 50
827 ;; append to existing physics logfile, or overwrite existing logfiles?
828 ;physics_logging_append_existing_logfile = true
829
830 ; ##
831 ; ## Joint support 859 ; ## Joint support
832 ; ## 860 ; ##
833 861
@@ -1129,7 +1157,7 @@
1129 1157
1130 ; Maximum number of llListen events we allow over the entire region. 1158 ; Maximum number of llListen events we allow over the entire region.
1131 ; Set this to 0 to have no limit imposed 1159 ; Set this to 0 to have no limit imposed
1132 max_listeners_per_region = 1000 1160 max_listens_per_region = 1000
1133 1161
1134 ; Maximum number of llListen events we allow per script 1162 ; Maximum number of llListen events we allow per script
1135 ; Set this to 0 to have no limit imposed. 1163 ; Set this to 0 to have no limit imposed.
@@ -1561,6 +1589,12 @@
1561 RefreshTime = 3600 1589 RefreshTime = 3600
1562 1590
1563;; 1591;;
1592;; JsonStore module provides structured store for scripts
1593;;
1594[JsonStore]
1595Enabled = False
1596
1597;;
1564;; These are defaults that are overwritten below in [Architecture]. 1598;; These are defaults that are overwritten below in [Architecture].
1565;; These defaults allow OpenSim to work out of the box with 1599;; These defaults allow OpenSim to work out of the box with
1566;; zero configuration 1600;; zero configuration
diff --git a/bin/PrimMesher.dll b/bin/PrimMesher.dll
index 249e91c..87022b7 100755
--- a/bin/PrimMesher.dll
+++ b/bin/PrimMesher.dll
Binary files differ
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 2fd9f11..00e2fd7 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -275,10 +275,29 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
275 ;AllowedClients = "" 275 ;AllowedClients = ""
276 ;DeniedClients = "" 276 ;DeniedClients = ""
277 277
278 ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
279 ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time
280 ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
281 ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
282 ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
283 ;; Options are
284 ;; "none" no DST
285 ;; "local" use the server's only timezone to calculate DST. This is previous OpenSimulator behaviour.
286 ;; "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
287 ;; 'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
288 DSTZone = "America/Los_Angeles;Pacific Standard Time"
289
278[MapImageService] 290[MapImageService]
279 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 291 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
280 ; Set this if you want to change the default 292 ; Set this if you want to change the default
281 ; TilesStoragePath = "maptiles" 293 ; TilesStoragePath = "maptiles"
294 ;
295 ; If for some reason you have the AddMapTile service outside the firewall (e.g. 8002),
296 ; you may want to set this. Otherwise, don't set it, because it's already protected.
297 ; GridService = "OpenSim.Services.GridService.dll:GridService"
298 ;
299 ; Additionally, if you run this server behind a proxy, set this to true
300 ; HasProxy = false
282 301
283[GridInfoService] 302[GridInfoService]
284 ; These settings are used to return information on a get_grid_info call. 303 ; These settings are used to return information on a get_grid_info call.
@@ -318,6 +337,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
318 337
319 ; password help: optional: page providing password assistance for users of your grid 338 ; password help: optional: page providing password assistance for users of your grid
320 ;password = http://127.0.0.1/password 339 ;password = http://127.0.0.1/password
340
341 ; HG address of the gatekeeper, if you have one
342 ; this is the entry point for all the regions of the world
343 ; gatekeeper = http://127.0.0.1:8002/
344
345 ; HG user domain, if you have one
346 ; this is the entry point for all user-related HG services
347 ; uas = http://127.0.0.1:8002/
321 348
322[GatekeeperService] 349[GatekeeperService]
323 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 350 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 69e94a5..1c04ab5 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -250,10 +250,39 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
250 ;AllowedClients = "" 250 ;AllowedClients = ""
251 ;DeniedClients = "" 251 ;DeniedClients = ""
252 252
253 ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
254 ;; Viewers do not listen to timezone sent by the server. They use Pacific Standard Time instead,
255 ;; but rely on the server to calculate Daylight Saving Time. Sending another DST than US Pacific
256 ;; would result in time inconsistencies between grids (during summer and around DST transition period)
257 ;; default let OpenSim calculate US Pacific DST
258 ;; "none" disable DST (equivallent to "local" with system set to GMT)
259 ;; "local" force legacy behaviour (using local system time to calculate DST)
260 ; DSTZone = "America/Los_Angeles;Pacific Standard Time"
261
262 ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
263 ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time
264 ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
265 ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
266 ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
267 ;; Options are
268 ;; "none" no DST
269 ;; "local" use the server's only timezone to calculate DST. This is previous OpenSimulator behaviour.
270 ;; "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
271 ;; 'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
272 DSTZone = "America/Los_Angeles;Pacific Standard Time"
273
253[MapImageService] 274[MapImageService]
254 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 275 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
255 ; Set this if you want to change the default 276 ; Set this if you want to change the default
256 ; TilesStoragePath = "maptiles" 277 ; TilesStoragePath = "maptiles"
278 ;
279 ; If for some reason you have the AddMapTile service outside the firewall (e.g. 8002),
280 ; you may want to set this. Otherwise, don't set it, because it's already protected.
281 ; GridService = "OpenSim.Services.GridService.dll:GridService"
282 ;
283 ; Additionally, if you run this server behind a proxy, set this to true
284 ; HasProxy = false
285
257 286
258 287
259[GridInfoService] 288[GridInfoService]
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"
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config
index 3f19ee8..9cfb7e9 100644
--- a/bin/pCampBot.exe.config
+++ b/bin/pCampBot.exe.config
@@ -8,7 +8,7 @@
8 <log4net> 8 <log4net>
9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> 9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
10 <layout type="log4net.Layout.PatternLayout"> 10 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date{HH:mm:ss} - %message%newline" /> 11 <conversionPattern value="%date{HH:mm:ss.fff} - %message%newline" />
12 </layout> 12 </layout>
13 </appender> 13 </appender>
14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> 14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
generated by cgit v1.1 at 2024-12-21 15:24:47 +0000