2 files changed, 59 insertions, 43 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d6de777..b78e3b7 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -418,8 +418,8 @@
     ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
     ; SMTP_SERVER_PASSWORD = ""
 
-[Network]
 
+[Network]
     ;# {ConsoleUser} {} {User name for console account} {}
     ;; Configure the remote console user here. This will not actually be used
     ;; unless you use -console=rest at startup.
@@ -456,6 +456,7 @@
     ;; web server
     ; user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+
 [XMLRPC]
     ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
     ;; If enabled and set to XmlRpcRouterModule, this will post an event, 
@@ -470,9 +471,6 @@
     ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
     ;XmlRpcPort = 20800
 
-
-;;    {option} {depends on} {question to ask} {choices} default value
-
     ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} {} http://example.com
     ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
     ;; will use this address to register xmlrpc channels on the external
@@ -508,7 +506,7 @@
     ; These are enabled by default to localhost. Change if you see fit.
     Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
-        Cap_AvatarPickerSearch = "localhost"
+    Cap_AvatarPickerSearch = "localhost"
 
     ; This is disabled by default. Change if you see fit. Note that
     ; serving this cap from the simulators may lead to poor performace.
@@ -516,7 +514,6 @@
 
 
 [SimulatorFeatures]
-
     ;# {MapImageServerURI} {} {URL for the map server} {}
     ; Experimental new information sent in SimulatorFeatures cap for Kokua
     ; viewers 
@@ -554,7 +551,7 @@
     ;; Module to handle offline messaging. The core module requires an external
     ;; web service to do this. See OpenSim wiki.
     ; OfflineMessageModule = OfflineMessageModule
-        ;; Or, alternatively, use this one, which works for both standalones and grids
+    ;; Or, alternatively, use this one, which works for both standalones and grids
     ; OfflineMessageModule = "Offline Message Module V2"
 
     ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule Offline Message Module V2:Offline Message Module V2} {URL of offline messaging service} {}
@@ -562,8 +559,8 @@
     ; OfflineMessageURL = http://yourserver/Offline.php or http://yourrobustserver:8003
 
     ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Data.MySQL.dll}
-        ;; For standalones, this is the storage dll.
-        ; StorageProvider = OpenSim.Data.MySQL.dll
+    ;; For standalones, this is the storage dll.
+    ; StorageProvider = OpenSim.Data.MySQL.dll
 
     ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule
     ;; Mute list handler (not yet implemented). MUST BE SET to allow offline
@@ -960,38 +957,38 @@
     ;; http://code.google.com/p/flotsam/
     ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
     ; Module = Default
-        ;; or... use Groups Module V2, which works for standalones and robust grids
-        ; Module = "Groups Module V2"
+    ;; or... use Groups Module V2, which works for standalones and robust grids
+    ; Module = "Groups Module V2"
 
     ;# {StorageProvider} {Module:Groups Module V2} {The DLL that provides the storage for V2} {OpenSim.Data.MySQL.dll} 
     ; StorageProvider = OpenSim.Data.MySQL.dll
 
     ;# {ServicesConnectorModule} {Module:GroupsModule Module:Groups Module V2} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector "Groups Local Service Connector" "Groups Remote Service Connector" "Groups HG Service Connector"} XmlRpcGroupsServicesConnector
     ;; Service connectors to the Groups Service as used in the GroupsModule.  Select one as follows:
-        ;; -- for Flotsam Groups use XmlRpcGroupsServicesConnector
-        ;; -- for Simian Groups use SimianGroupsServicesConnector
-        ;; -- for V2 Groups, standalone, non-HG use "Groups Local Service Connector"
-        ;; -- for V2 Groups, grided sim, non-HG use "Groups Remote Service Connector"
-        ;; -- for V2 Groups, HG, both standalone and grided sim, use "Groups HG Service Connector"
-        ;; Note that the quotes "" around the words are important!
+    ;; -- for Flotsam Groups use XmlRpcGroupsServicesConnector
+    ;; -- for Simian Groups use SimianGroupsServicesConnector
+    ;; -- for V2 Groups, standalone, non-HG use "Groups Local Service Connector"
+    ;; -- for V2 Groups, grided sim, non-HG use "Groups Remote Service Connector"
+    ;; -- for V2 Groups, HG, both standalone and grided sim, use "Groups HG Service Connector"
+    ;; Note that the quotes "" around the words are important!
     ; ServicesConnectorModule = XmlRpcGroupsServicesConnector
 
     ;# {LocalService} {ServicesConnectorModule:Groups HG Service Connector} {Is the group service in this process or elsewhere?} {local remote} local
-        ;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote
+    ;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote
     ; LocalService = local
 
     ;# {GroupsServerURI} {Module:GroupsModule (ServicesConnectorModule:Groups Remote Service Connector or (ServicesConnectorModule:Groups HG Service Connector and LocalService:remote))} {Groups Server URI} {}
     ;; URI for the groups services of this grid
     ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
     ;; or http://mygridserver.com:82/Grid/ for SimianGrid
-        ;; or http:://mygridserver.com:8003 for robust, V2
-        ;; Leave it commented for standalones, V2
+    ;; or http:://mygridserver.com:8003 for robust, V2
+    ;; Leave it commented for standalones, V2
     ; GroupsServerURI = ""
 
     ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {} 
-        ;; Used for V2 in HG only. For example
-        ;; http://mygridserver.com:9000 or http://mygridserver.com:8002
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ;; Used for V2 in HG only. For example
+    ;; http://mygridserver.com:9000 or http://mygridserver.com:8002
+    ;; If you have this set under [Startup], no need to set it here, leave it commented
     ; HomeURI = "" 
 
     ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true
@@ -999,8 +996,8 @@
 
     ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule "Groups Messaging Module V2"} GroupsMessagingModule
     ; MessagingModule = GroupsMessagingModule
-        ;; or use V2 for Groups V2
-        ; MessagingModule = "Groups Messaging Module V2"
+    ;; or use V2 for Groups V2
+    ; MessagingModule = "Groups Messaging Module V2"
 
     ;# {NoticesEnabled} {Module:GroupsModule Module:Groups Module V2} {Enable group notices?} {true false} true
     ;; Enable Group Notices
@@ -1020,6 +1017,7 @@
     ; XmlRpcServiceReadKey    = 1234
     ; XmlRpcServiceWriteKey   = 1234
 
+
 [InterestManagement]
      ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
      ;; This section controls how state updates are prioritized for each client
@@ -1038,16 +1036,19 @@
     ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
     ; Enabled = false
 
+
 [Terrain]
     ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
     ; InitialTerrain = "pinhead-island"
 
+
 [UserProfiles]
   ;# {ProfileURL} {} {Set url to UserProfilesService} {}
   ;; Set the value of the url to your UserProfilesService
   ;; If un-set / "" the module is disabled
   ;; ProfileServiceURL = http://127.0.0.1:8002
 
+
 [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
     ;; Uncomment one of the following includes as required.  For instance, to create a standalone OpenSim,
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8da4daf..c090306 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -399,7 +399,6 @@
   ; ProfileURL = http://127.0.0.1:9000
 
 
-
 [SMTP]
     enabled = false
 
@@ -461,6 +460,7 @@
     ; many simultaneous requests, default is 30 and is currently applied only to assets
     ;MaxRequestConcurrency = 30
 
+
 [ClientStack.LindenUDP]
     ; Set this to true to process incoming packets asynchronously. Networking is
     ; already separated from packet handling with a queue, so this will only
@@ -560,6 +560,7 @@
     ;
     ;PausedAckTimeout = 300
 
+
 [ClientStack.LindenCaps]
     ;; Long list of capabilities taken from 
     ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
@@ -632,8 +633,8 @@
     Cap_FetchInventoryDescendents2 = "localhost"
     Cap_FetchInventory2 = "localhost"
 
-        ; Capability for searching for people
-        Cap_AvatarPickerSearch = "localhost"
+    ; Capability for searching for people
+    Cap_AvatarPickerSearch = "localhost"
 
     
 [Chat]
@@ -964,6 +965,7 @@
     ; Default is false.
     ;force_simple_prim_meshing = true
 
+
 [BulletSim]
     ; All the BulletSim parameters can be displayed with the console command
     ;   "physics get all" and all are defined in the source file
@@ -1279,6 +1281,7 @@
     ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
     max_external_urls_per_simulator = 100
 
+
 [DataSnapshot]
     ; The following set of configs pertains to search.
     ; Set index_sims to true to enable search engines to index your searchable data
@@ -1683,31 +1686,36 @@
      RootReprioritizationDistance = 10.0
      ChildReprioritizationDistance = 20.0
 
+
 [Monitoring]
     ; Enable region monitoring
     ; If true, this will print out an error if more than a minute has passed since the last simulator frame
     ; Also is another source of region statistics provided via the regionstats URL
     Enabled = true
 
-; View region statistics via a web page
-; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
-; Use a web browser and type in the "Login URI" + "/SStats/"
-; For example- http://127.0.0.1:9000/SStats/
+
 [WebStats]
-; enabled=false
+    ; View region statistics via a web page
+    ; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
+    ; Use a web browser and type in the "Login URI" + "/SStats/"
+    ; For example- http://127.0.0.1:9000/SStats/
+    ; enabled=false
 
 
 [MediaOnAPrim]
     ; Enable media on a prim facilities
     Enabled = true;
 
+
 [NPC]
     ;; Enable Non Player Character (NPC) facilities
     Enabled = false
 
+
 [Terrain]
     InitialTerrain = "pinhead-island"
 
+
 ;; 
 ;; If you are using a simian grid frontend you can enable
 ;; this module to upload tile images for the mapping fn
@@ -1717,15 +1725,17 @@
     MaptileURL = "http://www.mygrid.com/Grid/"
     RefreshTime = 3600
 
+
 ;;
 ;; JsonStore module provides structured store for scripts 
 ;; 
 [JsonStore]
-Enabled = False
+    Enabled = False
+
+    ;; Enable direct access to the SOP dynamic attributes
+    EnableObjectStore = False
+    MaxStringSpace = 0
 
-;; Enable direct access to the SOP dynamic attributes
-EnableObjectStore = False
-MaxStringSpace = 0
 
 ;;
 ;; These are defaults that are overwritten below in [Architecture].
@@ -1740,24 +1750,29 @@ MaxStringSpace = 0
     ; asset store each time the region starts
     AssetLoaderEnabled = true
 
+
 [GridService]
     ;; default standalone, overridable in StandaloneCommon.ini
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
         
+
 [AutoBackupModule]
-        ;; default is module is disabled at the top level
-        AutoBackupModuleEnabled = false
+    ;; default is module is disabled at the top level
+    AutoBackupModuleEnabled = false
+
 
 [Sounds]
-        ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
-        Module = OpenSim.Region.CoreModules.dll:SoundModule
+    ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
+    Module = OpenSim.Region.CoreModules.dll:SoundModule
+
+    ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
+    MaxDistance = 100.0
 
-        ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
-        MaxDistance = 100.0
 
 [ServiceThrottle]
     ;; Default time interval (in ms) for the throttle service thread to wake up
     Interval = 5000
 
+
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"