From 263db441292956a8210a00c037848165667ab90e Mon Sep 17 00:00:00 2001 From: Magnuz Binder Date: Mon, 20 Apr 2015 21:30:06 +0200 Subject: Implement llGetBoundingBox fully. Signed-off-by: Michael Cerquoni --- bin/OpenSimDefaults.ini | 80 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index af37ccc..295b058 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1397,6 +1397,86 @@ ; 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 + [DataSnapshot] ; The following set of configs pertains to search. -- cgit v1.1 From 0303112dcbdcac67b27cf5f48629fdbde135653f Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 29 Apr 2015 18:42:20 -0700 Subject: Added new [Statistics] config section to go with the previous patch. --- bin/OpenSimDefaults.ini | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 295b058..55ca32f 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1917,6 +1917,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 -- cgit v1.1 From 30f9e5372e7b999ace8334825237a3512c9e40fb Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Sun, 3 May 2015 21:56:41 -0700 Subject: Only send parcel layer data around the point of interest. Can be disabled by setting [LandManagement]LimitParcelLayerUpdateDistance=false New parameters added to OpenSimDefaults for the distance and enablement. --- bin/OpenSimDefaults.ini | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 55ca32f..a5d7f1d 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1940,6 +1940,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 -- cgit v1.1 From 43b8bd0c35c1d7ca0c97a4e64fe255943148d333 Mon Sep 17 00:00:00 2001 From: Magnuz Binder Date: Sun, 3 May 2015 07:50:13 +0200 Subject: Implement llCastRay fully, simplified. --- bin/OpenSimDefaults.ini | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a5d7f1d..d3f183e 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1477,6 +1477,44 @@ ; 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 + + ; Accepted calculation precision error in calculations in llCastRay + FloatToleranceInLlCastRay = 0.000001 + + ; Accepted distance difference between duplicate hits in llCastRay + FloatTolerance2InLlCastRay = 0.0001 + + ; Maximum number of returned hits from llCastRay + MaxHitsInLlCastRay = 16 + + ; Maximum number of returned hits per prim from llCastRay + MaxHitsPerPrimInLlCastRay = 16 + + ; Maximum number of returned hits per object from llCastRay + MaxHitsPerObjectInLlCastRay = 16 + + ; Report ray intersections with surfaces on exits from a prim as hits in llCastRay if true + DetectExitHitsInLlCastRay = false + + ; Filter on parts instead of groups in llCastRay if true + FilterPartsInLlCastRay = false + + ; 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. -- cgit v1.1 From df12fbb0d235d154ee4d310cd028292f39ac4e0e Mon Sep 17 00:00:00 2001 From: dahlia Date: Mon, 4 May 2015 00:32:22 -0700 Subject: add new config parameters for llCastRay to OpenSimDefaults.ini --- bin/OpenSimDefaults.ini | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d3f183e..275c207 100644 --- a/bin/OpenSimDefaults.ini +++ b/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 -- cgit v1.1 From c96ee68953eb31fc2ad6d1df9b7a4bb19c584e17 Mon Sep 17 00:00:00 2001 From: Magnuz Binder Date: Mon, 4 May 2015 10:51:04 +0200 Subject: Patch llCastRay fully-simplified to V2. Signed-off-by: Michael Cerquoni --- bin/OpenSimDefaults.ini | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 275c207..4e1b7ca 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -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,6 +1489,14 @@ ; 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 @@ -1518,9 +1521,6 @@ ; 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 -- cgit v1.1 From 44b8b9fef625f6f562a7d8cb0531bd518f11d037 Mon Sep 17 00:00:00 2001 From: Michael Cerquoni Date: Mon, 4 May 2015 16:23:16 -0400 Subject: Revert "Patch llCastRay fully-simplified to V2." for further review. This reverts commit c96ee68953eb31fc2ad6d1df9b7a4bb19c584e17. --- bin/OpenSimDefaults.ini | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 4e1b7ca..275c207 100644 --- a/bin/OpenSimDefaults.ini +++ b/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 -- cgit v1.1 From d348f871612c5f241f33885604391d1f30a416bc Mon Sep 17 00:00:00 2001 From: Magnuz Binder Date: Sun, 10 May 2015 20:01:50 +0200 Subject: Patch llCastRay fully simplified to V3. --- bin/OpenSimDefaults.ini | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) (limited to 'bin/OpenSimDefaults.ini') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 275c207..2c17022 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -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,52 @@ ; Worst case is twisted tube, 0.5+sqrt(1.25) PrimBoundingBoxSafetyCoefficientZ = 1.618034 - ; Accepted calculation precision error in calculations in llCastRay + ; 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 + ; Accepted distance difference between duplicate hits in llCastRay V3 FloatTolerance2InLlCastRay = 0.0001 - ; Maximum number of returned hits from llCastRay + ; 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 + ; 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 [DataSnapshot] ; The following set of configs pertains to search. @@ -1547,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). -- cgit v1.1