Merging Opensim upstream before generating patch

1 files changed, 155 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3422996..489ee53 100755
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1397,6 +1397,144 @@
     ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
     max_external_urls_per_simulator = 100
 
+    ; Use size boxes instead of meshed prims, sculpts and mesh when calculating bounding boxes.
+    ; Speeds up calculations but can make them inaccurate, in some cases very inaccurate.
+    UseSimpleBoxesInGetBoundingBox = false
+
+    ; Add a third vector with stats when returning results from llGetBoundingBox.
+    ; Lists objects (groups), prims/meshes/avatars (parts) and vertices rendered.
+    AddStatsInGetBoundingBox = false
+
+    ; Avatar bounding box, lower X value, constant part, when standing
+    LowerAvatarBoundingBoxStandingXconst = -0.275
+
+    ; Avatar bounding box, upper X value, constant part, when standing
+    UpperAvatarBoundingBoxStandingXconst = 0.275
+
+    ; Avatar bounding box, lower Y value, constant part, when standing
+    LowerAvatarBoundingBoxStandingYconst = -0.35
+
+    ; Avatar bounding box, upper Y value, constant part, when standing
+    UpperAvatarBoundingBoxStandingYconst = 0.35
+
+    ; Avatar bounding box, lower Z value, constant part, when standing
+    LowerAvatarBoundingBoxStandingZconst = -0.1
+
+    ; Avatar bounding box, lower Z value, coefficient to multiply with avatar height, when standing
+    LowerAvatarBoundingBoxStandingZcoeff = -0.5
+
+    ; Avatar bounding box, upper Z value, constant part, when standing
+    UpperAvatarBoundingBoxStandingZconst = 0.1
+
+    ; Avatar bounding box, upper Z value, coefficient to multiply with avatar height, when standing
+    UpperAvatarBoundingBoxStandingZcoeff = 0.5
+
+    ; Avatar bounding box, lower X value, constant part, when groundsitting
+    LowerAvatarBoundingBoxGroundsittingXconst = -0.3875
+
+    ; Avatar bounding box, upper X value, constant part, when groundsitting
+    UpperAvatarBoundingBoxGroundsittingXconst = 0.3875
+
+    ; Avatar bounding box, lower Y value, constant part, when groundsitting
+    LowerAvatarBoundingBoxGroundsittingYconst = -0.5
+
+    ; Avatar bounding box, upper Y value, constant part, when groundsitting
+    UpperAvatarBoundingBoxGroundsittingYconst = 0.5
+
+    ; Avatar bounding box, lower Z value, constant part, when groundsitting
+    LowerAvatarBoundingBoxGroundsittingZconst = -0.05
+
+    ; Avatar bounding box, lower Z value, coefficient to multiply with avatar height, when groundsitting
+    LowerAvatarBoundingBoxGroundsittingZcoeff = -0.375
+
+    ; Avatar bounding box, upper Z value, constant part, when groundsitting
+    UpperAvatarBoundingBoxGroundsittingZconst = 0.5
+
+    ; Avatar bounding box, upper Z value, coefficient to multiply with avatar height, when groundsitting
+    UpperAvatarBoundingBoxGroundsittingZcoeff = 0.0
+
+    ; Avatar bounding box, lower X value, constant part, when sitting
+    LowerAvatarBoundingBoxSittingXconst = -0.5875
+
+    ; Avatar bounding box, upper X value, constant part, when sitting
+    UpperAvatarBoundingBoxSittingXconst = 0.1875
+
+    ; Avatar bounding box, lower Y value, constant part, when sitting
+    LowerAvatarBoundingBoxSittingYconst = -0.35
+
+    ; Avatar bounding box, upper Y value, constant part, when sitting
+    UpperAvatarBoundingBoxSittingYconst = 0.35
+
+    ; Avatar bounding box, lower Z value, constant part, when sitting
+    LowerAvatarBoundingBoxSittingZconst = -0.35
+
+    ; Avatar bounding box, lower Z value, coefficient to multiply with avatar height, when sitting
+    LowerAvatarBoundingBoxSittingZcoeff = -0.375
+
+    ; Avatar bounding box, upper Z value, constant part, when sitting
+    UpperAvatarBoundingBoxSittingZconst = -0.25
+
+    ; Avatar bounding box, upper Z value, coefficient to multiply with avatar height, when sitting
+    UpperAvatarBoundingBoxSittingZcoeff = 0.25
+
+    ; Safety coefficient for max bounding box from prim size box X coordinate
+    ; Worst case is twisted and sheared box, 1+sqrt(2)
+    PrimBoundingBoxSafetyCoefficientX = 2.414214
+
+    ; Safety coefficient for max bounding box from prim size box Y coordinate
+    ; Worst case is twisted and sheared box, 1+sqrt(2)
+    PrimBoundingBoxSafetyCoefficientY = 2.414214
+
+    ; Safety coefficient for max bounding box from prim size box Z coordinate
+    ; Worst case is twisted tube, 0.5+sqrt(1.25)
+    PrimBoundingBoxSafetyCoefficientZ = 1.618034
+
+    ; Use llCastRay V3 if true
+    ; Gives better accuracy and can be faster on some servers, but slower on others,
+    ; compared to previous version of llCastRay
+    ; Generates geometry meshes and can therefore use much system resources
+    UseLlCastRayV3 = false
+
+    ; Accepted calculation precision error in calculations in llCastRay V3
+    FloatToleranceInLlCastRay = 0.000001
+
+    ; Accepted distance difference between duplicate hits in llCastRay V3
+    FloatTolerance2InLlCastRay = 0.0001
+
+    ; Detail level when rendering prims in llCastRay V3
+    ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
+    PrimDetailLevelInLlCastRay = 1
+
+    ; Detail level when rendering sculpts in llCastRay V3
+    ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
+    SculptDetailLevelInLlCastRay = 1
+
+    ; Detail level when rendering meshes in llCastRay V3
+    ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
+    MeshDetailLevelInLlCastRay = 3
+
+    ; Detail level when rendering avatar capsules in llCastRay V3
+    ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call
+    AvatarDetailLevelInLlCastRay = 1
+
+    ; Maximum number of returned hits from llCastRay V3
+    MaxHitsInLlCastRay = 16
+
+    ; Maximum number of returned hits per prim from llCastRay V3
+    MaxHitsPerPrimInLlCastRay = 16
+
+    ; Maximum number of returned hits per object from llCastRay V3
+    MaxHitsPerObjectInLlCastRay = 16
+
+    ; Report ray intersections with surfaces on exits from a prim as hits in llCastRay V3 if true
+    DetectExitHitsInLlCastRay = false
+
+    ; Filter on parts instead of groups in llCastRay V3 if true
+    FilterPartsInLlCastRay = false
+
+    ; Detect attachments in llCastRay V3 if true
+    DoAttachmentsInLlCastRay = false
+
 
 [DataSnapshot]
     ; The following set of configs pertains to search.
@@ -1424,6 +1562,7 @@
     ; data service
     ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
 
+
 [Economy]
     ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
     ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
@@ -1837,6 +1976,10 @@
     ; For example- http://127.0.0.1:9000/SStats/
     ; enabled=false
 
+[Statistics]
+        ; NumberOfFrames is used in a moving average calculation, where NumberOfFrames is the number of frames 
+        ; to include in the averaging calculations
+        NumberOfFrames=10
 
 [MediaOnAPrim]
     ; Enable media on a prim facilities
@@ -1856,6 +1999,18 @@
     ;     the avatar outward.
     SendTerrainUpdatesByViewDistance = True
 
+[LandManagement]
+    ; When editing terrain or objects, parcel layer info is updated in the viewer.
+    ;   This can be expensive for large regions. If this variable is 'true', only the
+    ;   parcel layer data around the area of interest is sent. The parcel layer info
+    ;   is sent for 'ParcelLayerViewDistance' around the interest point.
+    ; If 'ParcelLayerViewDistance' is >= 128, the operation for legacy sized regions
+    ;   will be what it has always been (send the whole region's parcel layer info).
+    ; Other parcel updates (login, changing parcel ownership, ...) will still send
+    ;   whole region.
+    LimitParcelLayerUpdateDistance = true
+    ParcelLayerViewDistance = 128
+
 ;; 
 ;; If you are using a simian grid frontend you can enable
 ;; this module to upload tile images for the mapping fn