1 files changed, 54 insertions, 18 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 275c207..8cde201 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -296,7 +296,7 @@
     ; Simulator Stats URI
     ; Enable JSON simulator data by setting a URI name (case sensitive)
     ; Returns regular sim stats (SimFPS, ...)
-    ; Stats_URI = "jsonSimStats"
+    Stats_URI = "jsonSimStats"
 
     ; Simulator StatsManager URI
     ; Enable fetch of StatsManager registered stats. Fetch is query which can optionally
@@ -1397,11 +1397,6 @@
     ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
     max_external_urls_per_simulator = 100
 
-    ; Use version 1 of llCastRay as default if true. If set to false, the new
-    ; version of llCastRay will be used.  This gives better accuracy but 
-    ; uses more CPU and may may be slow on some servers 
-    UseLlCastRayV1 = true
-
     ; 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
@@ -1494,32 +1489,72 @@
     ; Worst case is twisted tube, 0.5+sqrt(1.25)
     PrimBoundingBoxSafetyCoefficientZ = 1.618034
 
-    ; Accepted calculation precision error in calculations in llCastRay
-    FloatToleranceInLlCastRay = 0.000001
+    ; 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.00001
+
+    ; Accepted distance difference between duplicate hits in llCastRay V3
+    FloatTolerance2InLlCastRay = 0.001
+
+    ; 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
 
-    ; Accepted distance difference between duplicate hits in llCastRay
-    FloatTolerance2InLlCastRay = 0.0001
+    ; 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
 
-    ; Maximum number of returned hits from llCastRay
+    ; 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
+    ; Maximum number of returned hits per prim from llCastRay V3
     MaxHitsPerPrimInLlCastRay = 16
 
-    ; Maximum number of returned hits per object from llCastRay
+    ; 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 if true
+    ; 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 if true
+    ; Filter on parts instead of groups in llCastRay V3 if true
     FilterPartsInLlCastRay = false
 
-    ; Detect attachments in llCastRay if true
+    ; Detect attachments in llCastRay V3 if true
     DoAttachmentsInLlCastRay = false
 
-    ; Use legacy version 1 of llCastRay if true
-    UseLlCastRayV1 = true
+    ; Throttle period length in ms before which all old llCastRay use is discarded in llCastRay V3
+    ; The sum of AvailableTimeInMsPerRegionInLlCastRay and all AvailableTimeInMsPerAvatarInLlCastRay should not exceed this
+    ThrottleTimeInMsInLlCastRay = 200
+
+    ; Available time in ms for llCastRay per throttle period and 65536 m2 land area in llCastRay V3
+    AvailableTimeInMsPerRegionInLlCastRay = 40
+
+    ; Available time in ms for llCastRay per throttle period and avatar when script in attachment or vehicle in llCastRay V3
+    AvailableTimeInMsPerAvatarInLlCastRay = 10
+
+    ; Required available time in ms left to perform a new llCastRay in llCastRay V3
+    RequiredAvailableTimeInMsInLlCastRay = 2
+
+    ; Maximum available time in ms possible in llCastRay V3, not to get too high values with varregions
+    MaximumAvailableTimeInMsInLlCastRay = 40
+
+    ; Use cached meshes in llCastRay V3 if true
+    ; Improves performance but uses more memory
+    UseMeshCacheInLlCastRay = true
+
 
 [DataSnapshot]
     ; The following set of configs pertains to search.
@@ -1547,6 +1582,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).