Various config file merges and fix ups.

Plus some sorting.

1 files changed, 9 insertions, 76 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6129640..05bc433 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1,76 +1,11 @@
-;; 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
-;; 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.
-;;
-;; 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
-;; 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.
-;;
-;; Double semicolons denote a text comment
-;;
-;; ;# denotes a configuration directive description
-;;    formatted as:
-;;    {option} {depends on} {question to ask} {choices} default value
-;;    Any text comments following the declaration, up to the next blank line.
-;;    will be copied to the generated file (NOTE: generation is not yet
-;;    implemented)
-;;
-;;    A * in the choices list will allow an empty entry.
-;;    An empty question will set the default if the dependencies are
-;;    satisfied.
-;;
-;; ;  denotes a commented out option.
-;;    Any options added to OpenSim.ini.example should be initially commented
-;;    out.
-
-
-[Const]
-    ; this section defines constants for grid services
-    ; to simplify other configuration files default settings
+; 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).
 
-    ;# {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}
+[Includes]
+    ; Define your server specific constants in this file.
+    Include-Common = ../../config/config.ini
 
-    ; If you run a grid, several services should not be availble to world, access to them should be blocked on firewall
-    ; PrivatePort should closed at the firewall.
-
-    ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
-    PublicPort = "8002"
-
-    ; you can also have them on a diferent url / IP
-    ;# {PrivURL} {} {PrivURL} {"http://${Const|BaseURL}} "${Const|BaseURL}"
-    PrivURL = ${Const|BaseURL}
-
-    ;grid default private port 8003, not used in standalone
-    ;# {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"
 
 [Startup]
     ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) "
@@ -753,12 +688,6 @@
     ;; 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?
@@ -767,6 +696,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.