1 files changed, 95 insertions, 42 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3eaef61..286076da 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -43,9 +43,14 @@
     ; Sets the method that OpenSim will use to fire asynchronous
     ; events. Valid values are UnsafeQueueUserWorkItem,
     ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread.
+    ;
     ; SmartThreadPool is reported to work well on Mono/Linux, but
     ; UnsafeQueueUserWorkItem has been benchmarked with better
     ; performance on .NET/Windows
+    ;
+    ; UnsafeQueueUserWorkItem refers to the fact that the code creating the event could elevate its security 
+    ; privileges.  However, as calling code is trusted anyway this is safe (if you set
+    ;  TrustedBinaries = true in the [XEngine] section then you already have to trust that incoming code for other reasons).
     async_call_method = SmartThreadPool
 
     ; Max threads to allocate on the FireAndForget thread pool
@@ -81,6 +86,13 @@
     ;; from the selected region_info_source.
     allow_regionless = false
 
+        ;; Allow child agents to see into the region even if their root counterpart isn't allowed in here
+        see_into_region = true
+
+    ; Maximum number of position, rotation and scale changes for each prim that the simulator will store for later undos
+    ; Increasing this number will increase memory usage.
+    MaxPrimUndos = 20
+
     ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonPhysicalPrimMax!).
     NonPhysicalPrimMax = 256
 
@@ -368,6 +380,19 @@
     AllowRegionRestartFromClient = true
 
 
+[UserProfiles]
+  ;# {ProfileURL} {} {Set url to UserProfilesService} {}
+  ;; Set the value of the url to your UserProfilesService
+  ;; If un-set / "" the module is disabled
+  ;; If the ProfileURL is not set, then very BASIC
+  ;; profile support will be configured. If the ProfileURL is set to a 
+  ;; valid URL, then full profile support will be configured. The URL 
+  ;; points to your grid's Robust user profiles service
+  ;; 
+  ; ProfileURL = http://127.0.0.1:9000
+
+
+
 [SMTP]
     enabled = false
 
@@ -536,7 +561,6 @@
     ;; in OpenSim.ini
     ;;
     Cap_AttachmentResources = ""
-    Cap_AvatarPickerSearch = ""
     Cap_ChatSessionRequest = ""
     Cap_CopyInventoryFromNotecard = "localhost"
     Cap_DispatchRegionInfo = ""
@@ -600,6 +624,10 @@
     Cap_WebFetchInventoryDescendents = ""
     Cap_FetchInventoryDescendents2 = "localhost"
     Cap_FetchInventory2 = "localhost"
+
+        ; Capability for searching for people
+        Cap_AvatarPickerSearch = "localhost"
+
     
 
 [Chat]
@@ -671,12 +699,22 @@
     ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others).
     ResendAppearanceUpdates = true
 
+    ; Turning this on responds to CachedTexture packets to possibly avoid rebaking the avatar 
+    ; on every login
+    ReuseTextures = false
+
 
 [Attachments]
     ; Controls whether avatar attachments are enabled.
     ; Defaults to true - only set to false for debugging purposes
     Enabled = true
 
+    ; Controls the number of milliseconds that are slept per 100 prims rezzed in attachments
+    ; Experimental setting to control CPU spiking when avatars with many attachments login
+    ; or when multiple avatars with medium level attachments login simultaneously.
+    ; If 0 then no throttling is performed.
+    ThrottlePer100PrimsRezzed = 0;
+
 
 [Mesh]
     ; enable / disable Collada mesh support
@@ -891,71 +929,82 @@
     ; ## Joint support
     ; ##
 
-    ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true.
-    ; (see NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
-    ; default is false
+    ; If you would like physics joints to be enabled through a special naming
+    ;   convention in the client, set this to true.
+    ;   (See NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
+    ; Default is false
     ;use_NINJA_physics_joints = true
 
     ; ##
     ; ## additional meshing options
     ; ##
 
-    ; physical collision mesh proxies are normally created for complex prim shapes, and collisions for simple boxes and
-    ; spheres are computed algorithmically. If you would rather have mesh proxies for simple prims, you can set this to
-    ; true. Note that this will increase memory usage and region startup time. Default is false.
+    ; Physical collision mesh proxies are normally created for complex prim shapes,
+    ;   and collisions for simple boxes and spheres are computed algorithmically.
+    ;   If you would rather have mesh proxies for simple prims, you can set this to
+    ;   true. Note that this will increase memory usage and region startup time.
+    ; Default is false.
     ;force_simple_prim_meshing = true
 
 [BulletSim]
-    ; World parameters
-
-    ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
-    ; bulletxna is a managed C# dll.  They have comparible functionality..   the c++ is much faster.
+    ; All the BulletSim parameters can be displayed with the console command
+    ;   "physics get all" and all are defined in the source file
+    ;    OpenSim/Regions/Physics/BulletSPlugin/BSParam.cs.
 
+    ; There are two bullet physics libraries, bulletunmanaged is the default and is a
+    ;   native c++ dll bulletxna is a managed C# dll.  They have comparible functionality
+    ;   but the c++ one is much faster.
     BulletEngine = "bulletunmanaged"
     ; BulletEngine = "bulletxna"
 
-    ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain.  If you're using the bulletxna engine, 
-    ;  you will want to switch to the heightfield option
-    TerrainImplementation = 1
-    ; TerrainImplementation = 0
-
-    Gravity = -9.80665
-
-    TerrainFriction = 0.30
-    TerrainHitFraction = 0.8
-    TerrainRestitution = 0
-    TerrainCollisionMargin = 0.04
-
-    AvatarFriction = 0.2
-    AvatarStandingFriction = 0.95
-    AvatarRestitution = 0.0
-    AvatarDensity = 3.5
-    AvatarCapsuleWidth = 0.6
-    AvatarCapsuleDepth = 0.45
-    AvatarCapsuleHeight = 1.5
-    AvatarContactProcessingThreshold = 0.1
+    ; BulletSim can run on its own thread independent of the simulator's heartbeat
+    ;   thread. Enabling this will nto let the physics engine slow down avatar movement, etc.
+    UseSeparatePhysicsThread = false
 
-    MaxObjectMass = 10000.01
-
-    CollisionMargin = 0.04
-
-    ; Linkset implmentation
+    ; Terrain implementation can use either Bullet's heightField or BulletSim can build
+    ;   a mesh. 0=heightField, 1=mesh
+    TerrainImplementation = 1
+    ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield
+    ;   resolution). '2' gives 512x512. Etc. Cannot be larger than '4'. Higher
+    ;   magnification uses lots of memory.
+    TerrainMeshMagnification = 2
+
+    ; Avatar physics height adjustments.
+    ;   http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height
+    AvatarHeightLowFudge = -0.2     ; Adjustment at low end of height range
+    AvatarHeightMidFudge = 0.1      ; Adjustment at mid point of avatar height range
+    AvatarHeightHighFudge = 0.1     ; Adjustment at high end of height range
+
+    ; Default linkset implmentation
+    ; 'Constraint' uses physics constraints to hold linkset together. 'Compound'
+    ;    builds a compound shape from the children shapes to create a single physical
+    ;    shape. 'Compound' uses a lot less CPU time.
     LinkImplementation = 1      ; 0=constraint, 1=compound
 
-    ; Whether to mesh sculpties
+        ; If 'true', offset a linkset's origin based on mass of linkset parts.
+        LinksetOffsetCenterOfMass = false
+
+    ; If 'true', turn scuplties into meshes
     MeshSculptedPrim = true
 
     ; If 'true', force simple prims (box and sphere) to be meshed
+    ; If 'false', the Bullet native special case shape is used for square rectangles
+    ;   and even dimensioned spheres.
     ForceSimplePrimMeshing = false
 
-    ; Bullet step parameters
-    MaxSubSteps = 10
-    FixedTimeStep = .01667
+    ; If 'true', when creating meshes, remove all triangles that have two equal vertexes.
+    ;   Happens often in sculpties. If turned off, there will be some doorways
+    ;   that cannot be walked through.
+    ShouldRemoveZeroWidthTriangles = true
+
+    ; If 'true', use convex hull definition in mesh asset if present.
+    ShouldUseAssetHulls = true
 
+    ; If there are thousands of physical objects, these maximums should be increased.
     MaxCollisionsPerFrame = 2048
     MaxUpdatesPerFrame = 8192
 
-    ; Detailed physics debug logging
+    ; Detailed physics debug logging. Very verbose.
     PhysicsLoggingEnabled = False
     PhysicsLoggingDir = "."
     VehicleLoggingEnabled = False
@@ -1570,7 +1619,7 @@
 
     ; Experimental option to only message cached online users rather than all users
     ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
-    ; This currently only applies to the Flotsam XmlRpc backend
+        ; (Flotsam groups only; in V2 this is always on)
     MessageOnlineUsersOnly = false
 
     ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
@@ -1688,5 +1737,9 @@ MaxStringSpace = 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"