Merge branch 'switch' into Domme.

1 files changed, 121 insertions, 110 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index fbf2c8b..9c15284 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1,28 +1,29 @@
+; This file contains defaults for various settings in OpenSimulator.  These can be overriden
+; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
+
+
 ;; This is the main configuration file for OpenSimulator.
 ;; If it's named OpenSim.ini then it will be loaded by OpenSimulator.
-;; If it's named OpenSim.ini.example then you will need to copy it to
+;; If it's named OpenSim.ini.example then you will need to copy it to 
 ;; OpenSim.ini first (if that file does not already exist)
 ;;
-;; Once you have copied OpenSim.ini.example to OpenSim.ini you will at least
-;; need to set the constants in the [Const] section and pick an architecture
-;; in the [Architecture] section at the end of this file. The architecture
-;; will require a suitable .ini file in the config-include directory, either
-;; StandaloneCommon.ini or GridCommon.ini which you can copy and modify from the
-;; available .example files.
+;; If you are copying, then once you have copied OpenSim.ini.example to 
+;; OpenSim.ini you will need to pick an architecture in the [Architecture] 
+;; section at the end of this file.
 ;;
-;; The settings in this file are in the form "<key> = <value>".  For example,
+;; The settings in this file are in the form "<key> = <value>".  For example, 
 ;; save_crashes = false in the [Startup] section below.
 ;;
-;; All settings are initially commented out and the default value used, as
-;; found in OpenSimDefaults.ini.  To change a setting, first uncomment it by
+;; All settings are initially commented out and the default value used, as 
+;; found in OpenSimDefaults.ini.  To change a setting, first uncomment it by 
 ;; deleting the initial semicolon (;) and then change the value.  This will
 ;; override the value in OpenSimDefaults.ini
-;;
+;; 
 ;; If you want to find out what configuration OpenSimulator has finished with
 ;; once all the configuration files are loaded then type "config show" on the
 ;; region console command line.
 ;;
-;;
+;; 
 ;; NOTES FOR DEVELOPERS REGARDING THE FORMAT OF THIS FILE
 ;;
 ;; All leading white space is ignored, but preserved.
@@ -41,31 +42,13 @@
 ;;    satisfied.
 ;;
 ;; ;  denotes a commented out option.
-;;    Any options added to OpenSim.ini.example should be initially commented
+;;    Any options added to OpenSim.ini.example should be initially commented 
 ;;    out.
 
 
-[Const]
-    ; For a grid these will usually be the externally accessible IP/DNS
-    ; name and use default public port 8002 and default private port 8003
-    ; For a standalone this will usually be the externally accessible IP/DNS
-    ; name and use default public port 9000. The private port is not used
-    ; in the configuration for a standalone.
-
-    ;# {BaseHostname} {} {BaseHostname} {"example.com" "127.0.0.1"} "127.0.0.1"
-    BaseHostname = "127.0.0.1"
-
-    ;# {BaseURL} {} {BaseURL} {"http://${Const|BaseHostname}} "http://${Const|BaseHostname}"
-    BaseURL = http://${Const|BaseHostname}
-
-    ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
-    PublicPort = "8002"
-
-    ;# {PrivatePort} {} {PrivatePort} {8003} "8003"
-    ; port to access private grid services.
-    ; grids that run all their regions should deny access to this port
-    ; from outside their networks, using firewalls
-    PrivatePort = "8003"
+[Includes]
+    ; Define your server specific constants in this file.
+    Include-Common = ../../config/config.ini
 
 
 [Startup]
@@ -90,6 +73,10 @@
     ;; How many lines of command history should we keep? (default is 100)
     ; ConsoleHistoryFileLines = 100
 
+    ;# {ConsoleHistoryTimeStamp} {} {Time stamp commands in history file} {} false
+    ;; Time stamp commands in history file (default false)
+    ; ConsoleHistoryTimeStamp = false
+    
     ;# {save_crashes} {} {Save crashes to disk?} {true false} false
     ;; Set this to true if you want to log crashes to disk
     ;; this can be useful when submitting bug reports.
@@ -241,7 +228,7 @@
     ;; Default is Meshmerizer
     ; meshing = Meshmerizer
     ; meshing = ZeroMesher
-        ;; select ubODEMeshmerizer only with ubOde physics engine
+    ;; select ubODEMeshmerizer only with ubOde physics engine
     ; meshing = ubODEMeshmerizer
 
     ;; Choose one of the physics engines below
@@ -256,17 +243,21 @@
     ; physics = BulletSim
     ; physics = basicphysics
     ; physics = POS
-        ;; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also
-        ; physics = ubODE
+    ;; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also
+    ; physics = ubODE
 
     ; ubODE and  OpenDynamicsEngine does allocate a lot of memory on stack. On linux you may need to increase its limit
     ; script opensim-ode-sh starts opensim setting that limit. You may need to increase it even more on large regions
     ; edit the line ulimit -s 262144, and change this last value
 
     ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine
-    ;; Default script engine to use. Currently, we only have XEngine
+    ;; Default script engine to use (Xengine if all commented)
     ; DefaultScriptEngine = "XEngine"
-
+    ;; ***DANGER***DANGER***
+    ;; experimental engine
+    ;; see section [YEngine] below
+    ; DefaultScriptEngine = "YEngine"
+    
     ;# {HttpProxy} {} {Proxy URL for llHTTPRequest and dynamic texture loading} {} http://proxy.com:8080
     ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if
     ;; required
@@ -300,6 +291,17 @@
     ; TelehubAllowLandmark = false
 
 
+    ;; SSL certificate validation options
+    ;; you can allow selfsigned certificates or no official CA with next option set to true
+    ;# {NoVerifyCertChain} {} {do not verify SSL Cert Chain} {true false} true
+    ; NoVerifyCertChain = true
+
+    ;; you can also bypass the hostname or domain verification
+    ;# {NoVerifyCertHostname} {} {do not verify SSL Cert name versus peer name} {true false} true
+    ; NoVerifyCertHostname = true
+    ;; having both options true does provide encryption but with low security
+    ;; set both true if you don't care to use SSL, they are needed to contact regions or grids that do use it.
+    
 [AccessControl]
     ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
     ;; Bar (|) separated list of viewers which may gain access to the regions.
@@ -319,7 +321,7 @@
     ;; - "Imprudence" has no access
     ;; - "Imprudence 1.3" has no access
     ;; - "Imprudence 1.3.1" has access
-        ;;
+    ;;
     ; DeniedClients = ""
 
 
@@ -401,10 +403,17 @@
     ;; If set to true, then all permissions checks are carried out
     ; serverside_object_permissions = true
 
-    ;# {allow_grid_gods} {} {Allow grid gods?} {true false} false
+        ; if next 2 are false, several admin powers are only active if god powers requested on viewer
+        ; this reduces mistakes
+        ; set both to true to enable previous behaviour
+    automatic_gods = false
+    implicit_gods = false
+        
+        ;# {allow_grid_gods} {} {Allow grid gods?} {true false} false
     ;; This allows users with a UserLevel of 200 or more to assume god
     ;; powers in the regions in this simulator.
-    ; allow_grid_gods = false
+        ;; if you don't trust grid admins, what are you doing there?
+    allow_grid_gods = true
 
     ;; This allows some control over permissions
     ;; please note that this still doesn't duplicate SL, and is not intended to
@@ -458,7 +467,6 @@
     ;; Password for the default estate owner
     ; DefaultEstateOwnerPassword = password
 
-
 [SMTP]
     ;; The SMTP server enabled the email module to send email to external
     ;; destinations.
@@ -491,7 +499,6 @@
     ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
     ; SMTP_SERVER_PASSWORD = ""
 
-
 [Network]
     ;# {ConsoleUser} {} {User name for console account} {}
     ;; Configure the remote console user here. This will not actually be used
@@ -508,10 +515,39 @@
     ;; the region ports use UDP.
     ; http_listener_port = 9000
 
+    ; optional main server secure http (ssl)
+    ; to use ssl you need a ssl certificate in PKCS12 format that validates the ExternalHostnames 
+    ; or their domains
+    ; some viewers by default only accept certificates signed by a oficial CA
+    ; to use others like self signed certificates with those viewers,
+    ; their debug option NoVerifySSLCert needs to be set true, You need to inform users about this
+    ; the main unsecure port will still open for some services. this may change in future.
+    
+    ; set http_listener_ssl to enable main server ssl. it will replace unsecure port on most functions
+    ;# {http_listener_ssl}{} {enable main server ssl port)} {} false
+    ;http_listener_ssl = false
+    
+    ; Set port for main SSL connections
+    ;# {http_listener_sslport}{} {main server ssl port)} {} 9001
+    ;http_listener_sslport = 9001 ;
+    
+    ; currently if using ssl, regions ExternalHostName must the the same and equal to http_listener_cn
+    ; this may be removed in future
+    ;# {http_listener_cn}{} {main server ssl externalHostName)} {} ""
+    ;http_listener_cn = "myRegionsExternalHostName"
+
+    ; the path for the certificate path
+    ;# {http_listener_cert_path}{} {main server ssl certificate file path)} {} ""
+    ;http_listener_cert_path = "mycert.p12"
+    
+    ;# {http_listener_cert_pass}{} {main server ssl certificate password)} {} ""
+    ;http_listener_cert_pass = "mycertpass" ; the cert passwork
+    
     ; By default, OpenSimulator does not allow scripts to make HTTP calls to addresses on the simulator's LAN.
     ; See the OutboundDisallowForUserScripts parameter in OpenSimDefaults.ini for more information on this filter.
     ; If you need to allow scripts to make some LAN calls use the OutboundDisallowForUserScriptsExcept parameter below.
     ; We recommend that you do not override OutboundDisallowForUserScripts directly unless you are very sure about what you're doing.
+    ; this HTTP calls can also use ssl see opensimDefaults.ini
     ;
     ; You can whitelist individual endpoints by IP or FQDN, e.g.
     ;
@@ -664,10 +700,10 @@
     ;DisableInterRegionTeleportCancellation = false
 
     ;# {LandingPointBehavior} {} {How to honor landing points and telehubs for gods.} {LandingPointBehavior_OS LandingPointBehavior_SL} LandingPointBehavior_OS
-        ;; This option exists to control the behavior of teleporting gods into places that have landing points
-        ;; and telehubs. Historically, there has been a difference: OpenSim (OS) has honored landing points and telehubs even for
-        ;; avatars with god permissions; SL lets gods land wherever they want.
-        ;LandingPointBehavior = LandingPointBehavior_OS
+    ;; This option exists to control the behavior of teleporting gods into places that have landing points
+    ;; and telehubs. Historically, there has been a difference: OpenSim (OS) has honored landing points and telehubs even for
+    ;; avatars with god permissions; SL lets gods land wherever they want.
+    ;LandingPointBehavior = LandingPointBehavior_OS
 
 [Messaging]
     ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule "Offline Message Module V2" *}
@@ -686,31 +722,16 @@
     ;; For standalones, this is the storage dll.
     ; StorageProvider = OpenSim.Data.MySQL.dll
 
-        ; Mute list handler
-        ; the provided MuteListModule is just a Dummy
-        ; you will need a external module for proper suport.
-        ; if you keep both 2 following settings comment, viewers will use mutes in their caches
-        ; if you uncoment both (url is ignored) the mutes will be deleted at login on this instance regions
-        ; WARNING: viewers mutes cache seems to shared by all grids, including SL
-        ; this may cause some confusion.
-
+    ; Mute list handler
     ;# {MuteListModule} {MuteListModule:MuteListModule} {} {} None
+    ; Disabled by default
     ; MuteListModule = MuteListModule
 
-    ;# {MuteListURL} {MuteListModule:MuteListModule} {} {} http://yourserver/Mute.php
-    ; MuteListURL = http://yourserver/Mute.php
-
     ;; Control whether group invites and notices are stored for offline users.
     ;; Default is true.
     ;; This applies to both core groups module.
     ; ForwardOfflineGroupMessages = true
 
-
-[BulletSim]
-    ;# {AvatarToAvatarCollisionsByDefault} {[Startup]physics:BulletSim} {Should avatars collide with each other?} {true false} true
-    AvatarToAvatarCollisionsByDefault = true
-
-
 [ODEPhysicsSettings]
     ;# {mesh_sculpted_prim} {[Startup]physics:OpenDynamicsEngine} {Mesh sculpties so they collide as they look?} {true false} true
     ;; Do we want to mesh sculpted prim to collide like they look?
@@ -719,6 +740,10 @@
     ;; then you might want to try setting this to false.
     ; mesh_sculpted_prim = true
 
+[BulletSim]
+    ;# {AvatarToAvatarCollisionsByDefault} {[Startup]physics:BulletSim} {Should avatars collide with each other?} {true false} true
+    AvatarToAvatarCollisionsByDefault = true
+
 [RemoteAdmin]
     ;; This is the remote admin module, which uses XMLRPC requests to
     ;; manage regions from a web interface.
@@ -884,6 +909,13 @@
     ;; Money Unit fee to create groups.  Default is 0.
     ; PriceGroupCreate = 0
 
+[YEngine]
+    ;; implements non preemptive microthreading, so fixing problems like llSleep or long events handlers
+    ;; but those will suffer from timeslicing, so will be slower.
+    ;; warning: scripts state is lost on TP or cross to Xengine regions (cars stop, etc)
+        ;; ignore its extensions (subset of original XMRengine), those are still undefined.
+    ; Enabled = false
+
 
 [XEngine]
     ;# {Enabled} {} {Enable the XEngine scripting engine?} {true false} true
@@ -899,8 +931,8 @@
     ;; Time a thread must be idle (in seconds) before it dies
     ; IdleTimeout = 60
 
-        ;; llSetTimerEvent minimum value. Default 0.5s, 0.05s whould be more resonable
-        ; MinTimerInterval = 0.5
+    ;; llSetTimerEvent minimum value. Default 0.5s, 0.05s whould be more resonable
+    ; MinTimerInterval = 0.5
 
     ;# {Priority} {Enabled:true} {Priority for script engine threads?} {Lowest BelowNormal Normal AboveNormal Highest} BelowNormal
     ;; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal",
@@ -927,7 +959,7 @@
     ;; at this time some mono versions seem to have problems with the true option
     ;; so default is now false until a fix is found, to simply life of less technical skilled users.
     ;; this should only be a issue if regions stay alive for a long time with lots of scripts added or edited.
-    ; AppDomainLoading = false
+    AppDomainLoading = false
 
     ;; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op)
     ;; co-op will be more stable but this option is currently experimental.
@@ -1004,30 +1036,6 @@
     Include-osslEnable = "config-include/osslEnable.ini"
 
 
-[MRM]
-    ;; Enables the Mini Region Modules Script Engine.
-    ; Enabled = false
-
-    ;; Runs MRM in a Security Sandbox
-    ;; WARNING: DISABLING IS A SECURITY RISK.
-    ; Sandboxed = true
-
-    ;; The level sandbox to use, adjust at your OWN RISK.
-    ;; Valid values are:
-    ;; *  FullTrust
-    ;; *  SkipVerification
-    ;; *  Execution
-    ;; *  Nothing
-    ;; *  LocalIntranet
-    ;; *  Internet
-    ;; *  Everything
-    ; SandboxLevel = "Internet"
-
-    ;; Only allow Region Owners to run MRMs
-    ;; May represent a security risk if you disable this.
-    ; OwnerOnly = true
-
-
 [FreeSwitchVoice]
     ;; In order for this to work you need a functioning FreeSWITCH PBX set up.
     ;; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
@@ -1113,7 +1121,7 @@
     ; Applies Flotsam Group only. V2 has this always on, no other option
     ; MessageOnlineUsersOnly = false
 
-    ;; This makes the Group module very chatty on the console.
+    ;; This makes the Groups module very chatty on the console.
     ; DebugEnabled = false
 
     ; This makes the Group Messaging module very chatty on the console.
@@ -1126,15 +1134,18 @@
 
 
 [InterestManagement]
-     ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
      ;; This section controls how state updates are prioritized for each client
-     ;; Valid values are BestAvatarResponsiveness, Time, Distance,
-     ;; SimpleAngularDistance, FrontBack
+     
+     ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness SimpleAngularDistance} BestAvatarResponsiveness
+     ;; Valid values are BestAvatarResponsiveness and SimpleAngularDistance
+     ;; SimpleAngularDistance does use more cpu
      ; UpdatePrioritizationScheme = BestAvatarResponsiveness
 
-        ; TEST OPTION KEEP AS FALSE
-        ; if true, don't send object updates if outside view range
-        ; ObjectsCullingByDistance = false
+    ;; ObjectsCullingByDistance, if true, don't send object updates if outside view range
+    ;; currently viewers are also told to delete objects that leave view range
+    ;; only avater position is considered, free camera may not see objects
+    ;; does increase cpu load
+    ; ObjectsCullingByDistance = false
 
 [MediaOnAPrim]
     ;# {Enabled} {} {Enable Media-on-a-Prim (MOAP)} {true false} true
@@ -1146,22 +1157,22 @@
     ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
     ; Enabled = false
 
-        ;; several options to control NPCs creation
+    ;; several options to control NPCs creation
 
     ;# {AllowNotOwned} {} {allow NPCs to be created not Owned} {true false} true
-        ;; allow NPCs to be created not Owned {true false} default: true
+    ;; allow NPCs to be created not Owned {true false} default: true
     ; AllowNotOwned = true
 
     ;# {AllowSenseAsAvatar} {} {allow NPCs to set to be sensed as Avatars} {true false} true
-        ;; allow NPCs to set to be sensed as Avatars {true false} default: true
+    ;; allow NPCs to set to be sensed as Avatars {true false} default: true
     ; AllowSenseAsAvatar = true
 
     ;# {AllowCloneOtherAvatars} {} {allow NPCs to created cloning any avatar in region} {true false} true
-        ;; allow NPCs to created cloning any avatar in region {true false} default: true
+    ;; allow NPCs to created cloning any avatar in region {true false} default: true
     ; AllowCloneOtherAvatars = true
 
     ;# {NoNPCGroup} {} {if true NPCs will have no group title, if false display "- NPC -"} {true false} true
-        ;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true
+    ;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true
     ; NoNPCGroup = true
 
 
@@ -1170,8 +1181,8 @@
     ; InitialTerrain = "pinhead-island"
 
 [LandManagement]
-        ;; set this to false to not display parcel ban lines
-        ;ShowParcelBansLines = true
+    ;; set this to false to not display parcel ban lines
+    ;ShowParcelBansLines = true
 
 [UserProfiles]
   ;# {ProfileServiceURL} {} {Set url to UserProfilesService} {}
@@ -1195,9 +1206,9 @@
 ;; Uncomment and customize appropriately if you want this behavior.
 ;;
 ;[GodNames]
-;       Enabled = false
-;       FullNames = "Test User, Foo Bar"
-;       Surnames = "Kryztlsk"
+;    Enabled = false
+;    FullNames = "Test User, Foo Bar"
+;    Surnames = "Kryztlsk"
 
 [Architecture]
     ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
@@ -1211,7 +1222,7 @@
     ;; "config-include/StandaloneCommon.ini.example" to "config-include/StandaloneCommon.ini" before
     ;; editing it to set the database and backend services that OpenSim will use.
     ;;
-    ; Include-Architecture = "config-include/Standalone.ini"
+    Include-Architecture = "config-include/Standalone.ini"
     ; Include-Architecture = "config-include/StandaloneHypergrid.ini"
     ; Include-Architecture = "config-include/Grid.ini"
     ; Include-Architecture = "config-include/GridHypergrid.ini"