Revert "Patch llCastRay fully-simplified to V2." for further review.

This reverts commit c96ee68953.

bin/OpenSimDefaults.ini

@@ -1397,6 +1397,11 @@
     ; 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
@@ -1489,14 +1494,6 @@
     ; Worst case is twisted tube, 0.5+sqrt(1.25)
     PrimBoundingBoxSafetyCoefficientZ = 1.618034
 
-    ; Use new version 2 of llCastRay as default if true
-    ; This gives better accuracy and speed on some servers, but may be slower on other servers
-    UseLlCastRayV2 = false
-
-    ; Irregular bit flag to use after RC_DATA_FLAGS in calls to llCastRay to use version 2
-    ; Bit flags RC_GET_NORMAL = 1, RC_GET_ROOT_KEY = 2 and RC_GET_LINK_NUM = 4 are already in regular use
-    RC_USE_V2 = 512
-
     ; Accepted calculation precision error in calculations in llCastRay
     FloatToleranceInLlCastRay = 0.000001
 
@@ -1521,6 +1518,9 @@
     ; Detect attachments in llCastRay if true
     DoAttachmentsInLlCastRay = false
 
+    ; Use legacy version 1 of llCastRay if true
+    UseLlCastRayV1 = true
+
 [DataSnapshot]
     ; The following set of configs pertains to search.
     ; Set index_sims to true to enable search engines to index your searchable data