From 7a5070518833a29252fc638f9dd216040bcfad7a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 27 Sep 2012 16:43:18 -0700 Subject: Removed the bits about the TOSModule. That module doesn't go into core. WARNING: migration on GridUser withdrawn too, but left the migration number there. --- bin/OpenSim.ini.example | 29 ----------------------------- bin/OpenSimDefaults.ini | 4 ---- 2 files changed, 33 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 6dbb611..b21a214 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -947,35 +947,6 @@ ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island ; InitialTerrain = "pinhead-island" -[TOSModule] - ;; Terms of Service module. It requires an external web script. Unless you - ;; have that in place, don't enable this module. - - ;# {Enabled} {} {Enable TOS facilities} {true false} false - ; Enabled = false - - ;; Should local users be shown the TOS on first login? - ;# {ShowToLocalUsers} {} {Show TOS to local users} {true false} false - ; ShowToLocalUsers = false - ;; Should foreign users be shown the TOS on first HG login? - ;# {ShowToForeignUsers} {} {Show TOS to foreign users} {true false} true - ; ShowToForeignUsers = true - - ;; Tell the users what this is about - ; Message = "Please read and agree to the Terms of Service" - - ;; How much time do the users have to accept the TOS before they get kicked out? - ;; (in minutes) - ; Timeout = 5 - - ;; This page should have Accept/Decline links somewhere - ;; that affect the GridUsers table. If you don't have such - ;; script in place, don't use the TOSModule. The TOSModule appends this URL - ;; with a query ?user={userid}&sid={sessionid} - ;# {TOS_URL} {} {The URL for the TOS page} {} - TOS_URL = "http://mygrid.com/tos" - - [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 744187b..315ffbe 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1624,10 +1624,6 @@ [Terrain] InitialTerrain = "pinhead-island" -[TOSModule] - ;; Enable TOS facilities - Enabled = false - ;; ;; If you are using a simian grid frontend you can enable ;; this module to upload tile images for the mapping fn -- cgit v1.1 From d26fbf727a8c2ea319bd8a4ec7c9cd6ab7148ed2 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 28 Sep 2012 02:19:15 +0100 Subject: Comment out unused RestPlugins text in OpenSimDefaults.ini --- bin/OpenSimDefaults.ini | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 9c32abd..bd83bee 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1037,30 +1037,31 @@ ;default_appearance = default_appearance.xml -[RestPlugins] - ; Change this to true to enable REST Plugins. This must be true if you wish to use - ; REST Region or REST Asset and Inventory Plugins - enabled = false - god_key = SECRET - prefix = /admin - - -[RestRegionPlugin] - ; Change this to true to enable the REST Region Plugin - enabled = false - - -[RestHandler] - ; Change this to true to enable the REST Asset and Inventory Plugin - enabled = false - authenticate = true - secured = true - extended-escape = true - realm = OpenSim REST - dump-asset = false - path-fill = true - dump-line-size = 32 - flush-on-error = true +; RestPlugins are not currently operational. +;[RestPlugins] +; ; Change this to true to enable REST Plugins. This must be true if you wish to use +; ; REST Region or REST Asset and Inventory Plugins +; enabled = false +; god_key = SECRET +; prefix = /admin + + +;[RestRegionPlugin] +; ; Change this to true to enable the REST Region Plugin +; enabled = false + + +;[RestHandler] +; ; Change this to true to enable the REST Asset and Inventory Plugin +; enabled = false +; authenticate = true +; secured = true +; extended-escape = true +; realm = OpenSim REST +; dump-asset = false +; path-fill = true +; dump-line-size = 32 +; flush-on-error = true ; IRC bridge is experimental, so if it breaks... keep both parts... yada yada -- cgit v1.1 From 735d89e3692bb7c620b9e3c248a1dbd5924b8b3f Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Tue, 25 Sep 2012 15:01:18 -0700 Subject: BulletSim: btGhostObjects working to make 'volume detect' work. Rearrangement and cleanup of shape collection code. Much more readable. Enabling and use of collision filters and masks. Addition of ID to body creation BulletSimAPI calls so always set in shape for collision reporting. Change default of ShouldSplitSimulationIslands and ShouldRandomizeSolverOrder from 'false' to 'true'. When 'false', this suppresses NO_CONTACT_RESPONSE which makes volume detect fail. --- bin/OpenSimDefaults.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index bd83bee..6e6a089 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -936,10 +936,10 @@ MaxPersistantManifoldPoolSize = 0 ShouldDisableContactPoolDynamicAllocation = False ShouldForceUpdateAllAabbs = False - ShouldRandomizeSolverOrder = False - ShouldSplitSimulationIslands = False + ShouldRandomizeSolverOrder = True + ShouldSplitSimulationIslands = True ShouldEnableFrictionCaching = False - NumberOfSolverIterations = 0; + NumberOfSolverIterations = 0 ; Linkset constraint parameters LinkConstraintUseFrameOffset = False -- cgit v1.1 From 7f96bb601aeac97723d2b0a542d0ed5cded1b4fd Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Fri, 28 Sep 2012 12:51:47 -0700 Subject: BulletSim: update SOs and DLLs --- bin/lib32/BulletSim.dll | Bin 569856 -> 582144 bytes bin/lib32/libBulletSim.so | Bin 2510105 -> 2692621 bytes bin/lib64/BulletSim.dll | Bin 731136 -> 747008 bytes bin/lib64/libBulletSim.so | Bin 2750288 -> 2950520 bytes 4 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 3b35a98..da6e31c 100755 Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index 65eba37..9503cdb 100755 Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index f01655b..1782c8e 100755 Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index 5302e29..06e6ce2 100755 Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ -- cgit v1.1