From 665f79e15c1de3a98f777004cba278625b8b3181 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Mon, 19 Nov 2012 21:47:49 -0500 Subject: Expose configuration options for the XmlRpcGridRouter Expose configuration options for the XmlRpcGridRouter to allow simulators to register llRemoteData channels with an external routing service --- bin/OpenSimDefaults.ini | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index ed1b969..c81c658 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -429,20 +429,6 @@ ; many simultaneous requests, default is 30 and is currently applied only to assets ;MaxRequestConcurrency = 30 -[XMLRPC] - ; ## - ; ## Scripting XMLRPC mapper - ; ## - - ; If enabled, this will post an event, "xmlrpc_uri(string)" to the - ; script concurrently with the first remote_data event. - ; This will contain the fully qualified URI an external site needs - ; to use to send XMLRPC requests to that script - - ;XmlRpcRouterModule = "XmlRpcRouterModule" - ;XmlRpcPort = 20800 - - [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 -- cgit v1.1 From cbc7e7bf85bfd9e916146b0ae4a605996c24720b Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Wed, 21 Nov 2012 16:31:23 -0800 Subject: BulletSim: Make avatar capsule so it is not circular. Simple attempt to make avatars better shaped. Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth' and 'avatarCapsuleDepth'. More tweeking to avatar height calculation. A little better but short avatar's feet are above the terrain and tall avatar's feet are a little below the ground. --- bin/OpenSimDefaults.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index c81c658..818321e 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -913,7 +913,8 @@ AvatarFriction = 0.2 AvatarRestitution = 0.0 AvatarDensity = 60.0 - AvatarCapsuleRadius = 0.37 + AvatarCapsuleWidth = 0.6 + AvatarCapsuleDepth = 0.45 AvatarCapsuleHeight = 1.5 AvatarContactProcessingThreshold = 0.1 -- cgit v1.1 From f473252fa8022f95f60e219b24ffa342966f8c13 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 23 Nov 2012 03:56:53 +0000 Subject: Add AllowRegionRestartFromClient setting to [EstateManagement] section of OpenSim.ini. Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate. One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules, though these should be fixed as soon as practicable. Default is true, as has been the case historically. --- bin/OpenSimDefaults.ini | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 818321e..19e081f 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -368,6 +368,12 @@ ; alert_uri = "http://myappserver.net/my_handler/" +[EstateManagement] + ; If false, then block any region restart requests from the client even if they are otherwise valid. + ; Default is true + AllowRegionRestartFromClient = true + + [SMTP] enabled = false -- cgit v1.1 From edbdbd44b95b6fb11958eda1cd8e70da799849b5 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 23 Nov 2012 04:09:45 +0000 Subject: Enable further client stack packet pooling by default by setting RecycleBaseUDPPackets = true by default. This reduces base memory churn of every client connection, improving the garbage collection situation. The effect is a significant portion of base load (an avatar standing still on a completely blank island) but will probably still be swallowed up by other memory use on active regions. Tests have shown no noticeable impact on speed of processing incoming packets, though setting remains in case a switch back is needed. --- bin/OpenSimDefaults.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 19e081f..8a451ec 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1592,8 +1592,7 @@ ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets. ; This reduces data churn - ; This setting is currently experimental and defaults to false. - RecycleBaseUDPPackets = false; + RecycleBaseUDPPackets = true [InterestManagement] -- cgit v1.1 From 9b98011714110f70b6ce454594b793cd929fd27b Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Sat, 24 Nov 2012 20:19:14 -0800 Subject: BulletSim: update OpenSimDefaults.ini with current default values for friction and collision margin. Remove some of the BulletSim parameters that are very esoteric and dangerous. Most of the remaining parameters are features one can 'see'. --- bin/OpenSimDefaults.ini | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 8a451ec..e9bdabc 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -221,10 +221,10 @@ ; to false if you have compatibility problems. ;CacheSculptMaps = true - ; Choose one of the physics engines below - ; OpenDynamicsEngine is by some distance the most developed physics engine - ; basicphysics effectively does not model physics at all, making all objects phantom - + ; Choose one of the physics engines below. + ; OpenDynamicsEngine is by some distance the most developed physics engine. + ; BulletSim is a high performance, up-and-coming physics engine. + ; basicphysics effectively does not model physics at all, making all objects phantom. physics = OpenDynamicsEngine ;physics = basicphysics ;physics = POS @@ -908,15 +908,18 @@ [BulletSim] ; World parameters - DefaultFriction = 0.50 + DefaultFriction = 0.20 DefaultDensity = 10.000006836 DefaultRestitution = 0.0 Gravity = -9.80665 - TerrainFriction = 0.50 - TerrainHitFriction = 0.8 + TerrainFriction = 0.30 + TerrainHitFraction = 0.8 TerrainRestitution = 0 + TerrainCollisionMargin = 0.04 + AvatarFriction = 0.2 + AvatarStandingFriction = 0.99 AvatarRestitution = 0.0 AvatarDensity = 60.0 AvatarCapsuleWidth = 0.6 @@ -930,27 +933,15 @@ LinearDamping = 0.0 AngularDamping = 0.0 DeactivationTime = 0.2 - LinearSleepingThreshold = 0.8 - AngularSleepingThreshold = 1.0 - CcdMotionThreshold = 0.0 - CcdSweptSphereRadius = 0.0 - ContactProcessingThreshold = 0.1 - ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc) - MaxPersistantManifoldPoolSize = 0 - ShouldDisableContactPoolDynamicAllocation = False - ShouldForceUpdateAllAabbs = False - ShouldRandomizeSolverOrder = True - ShouldSplitSimulationIslands = True - ShouldEnableFrictionCaching = False - NumberOfSolverIterations = 0 + CollisionMargin = 0.04 ; Linkset constraint parameters + LinkImplementation = 1 ; 0=constraint, 1=compound LinkConstraintUseFrameOffset = False LinkConstraintEnableTransMotor = True LinkConstraintTransMotorMaxVel = 5.0 LinkConstraintTransMotorMaxForce = 0.1 - ; Whether to mesh sculpties MeshSculptedPrim = true -- cgit v1.1