diff options
author | Diva Canto | 2015-05-25 15:19:27 -0700 |
---|---|---|
committer | Diva Canto | 2015-05-25 15:19:27 -0700 |
commit | 22ee1c30e3de30537e236259a3ebdb6927d00a04 (patch) | |
tree | 32346c0c0d098053005645f6ff84cb7da89e2f16 /bin/OpenSimDefaults.ini | |
parent | Minor change of statement order in unit test (diff) | |
parent | Fix mesh cache race condition in llCastRay V3. (diff) | |
download | opensim-SC_OLD-22ee1c30e3de30537e236259a3ebdb6927d00a04.zip opensim-SC_OLD-22ee1c30e3de30537e236259a3ebdb6927d00a04.tar.gz opensim-SC_OLD-22ee1c30e3de30537e236259a3ebdb6927d00a04.tar.bz2 opensim-SC_OLD-22ee1c30e3de30537e236259a3ebdb6927d00a04.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r-- | bin/OpenSimDefaults.ini | 72 |
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 @@ | |||
296 | ; Simulator Stats URI | 296 | ; Simulator Stats URI |
297 | ; Enable JSON simulator data by setting a URI name (case sensitive) | 297 | ; Enable JSON simulator data by setting a URI name (case sensitive) |
298 | ; Returns regular sim stats (SimFPS, ...) | 298 | ; Returns regular sim stats (SimFPS, ...) |
299 | ; Stats_URI = "jsonSimStats" | 299 | Stats_URI = "jsonSimStats" |
300 | 300 | ||
301 | ; Simulator StatsManager URI | 301 | ; Simulator StatsManager URI |
302 | ; Enable fetch of StatsManager registered stats. Fetch is query which can optionally | 302 | ; Enable fetch of StatsManager registered stats. Fetch is query which can optionally |
@@ -1397,11 +1397,6 @@ | |||
1397 | ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL()) | 1397 | ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL()) |
1398 | max_external_urls_per_simulator = 100 | 1398 | max_external_urls_per_simulator = 100 |
1399 | 1399 | ||
1400 | ; Use version 1 of llCastRay as default if true. If set to false, the new | ||
1401 | ; version of llCastRay will be used. This gives better accuracy but | ||
1402 | ; uses more CPU and may may be slow on some servers | ||
1403 | UseLlCastRayV1 = true | ||
1404 | |||
1405 | ; Use size boxes instead of meshed prims, sculpts and mesh when calculating bounding boxes. | 1400 | ; Use size boxes instead of meshed prims, sculpts and mesh when calculating bounding boxes. |
1406 | ; Speeds up calculations but can make them inaccurate, in some cases very inaccurate. | 1401 | ; Speeds up calculations but can make them inaccurate, in some cases very inaccurate. |
1407 | UseSimpleBoxesInGetBoundingBox = false | 1402 | UseSimpleBoxesInGetBoundingBox = false |
@@ -1494,32 +1489,72 @@ | |||
1494 | ; Worst case is twisted tube, 0.5+sqrt(1.25) | 1489 | ; Worst case is twisted tube, 0.5+sqrt(1.25) |
1495 | PrimBoundingBoxSafetyCoefficientZ = 1.618034 | 1490 | PrimBoundingBoxSafetyCoefficientZ = 1.618034 |
1496 | 1491 | ||
1497 | ; Accepted calculation precision error in calculations in llCastRay | 1492 | ; Use llCastRay V3 if true |
1498 | FloatToleranceInLlCastRay = 0.000001 | 1493 | ; Gives better accuracy and can be faster on some servers, but slower on others, |
1494 | ; compared to previous version of llCastRay | ||
1495 | ; Generates geometry meshes and can therefore use much system resources | ||
1496 | UseLlCastRayV3 = false | ||
1497 | |||
1498 | ; Accepted calculation precision error in calculations in llCastRay V3 | ||
1499 | FloatToleranceInLlCastRay = 0.00001 | ||
1500 | |||
1501 | ; Accepted distance difference between duplicate hits in llCastRay V3 | ||
1502 | FloatTolerance2InLlCastRay = 0.001 | ||
1503 | |||
1504 | ; Detail level when rendering prims in llCastRay V3 | ||
1505 | ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call | ||
1506 | PrimDetailLevelInLlCastRay = 1 | ||
1499 | 1507 | ||
1500 | ; Accepted distance difference between duplicate hits in llCastRay | 1508 | ; Detail level when rendering sculpts in llCastRay V3 |
1501 | FloatTolerance2InLlCastRay = 0.0001 | 1509 | ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call |
1510 | SculptDetailLevelInLlCastRay = 1 | ||
1502 | 1511 | ||
1503 | ; Maximum number of returned hits from llCastRay | 1512 | ; Detail level when rendering meshes in llCastRay V3 |
1513 | ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call | ||
1514 | MeshDetailLevelInLlCastRay = 3 | ||
1515 | |||
1516 | ; Detail level when rendering avatar capsules in llCastRay V3 | ||
1517 | ; 0 = Low, 1 = Medium, 2 = High, 3 = Highest, higer level gives better accuracy but slower call | ||
1518 | AvatarDetailLevelInLlCastRay = 1 | ||
1519 | |||
1520 | ; Maximum number of returned hits from llCastRay V3 | ||
1504 | MaxHitsInLlCastRay = 16 | 1521 | MaxHitsInLlCastRay = 16 |
1505 | 1522 | ||
1506 | ; Maximum number of returned hits per prim from llCastRay | 1523 | ; Maximum number of returned hits per prim from llCastRay V3 |
1507 | MaxHitsPerPrimInLlCastRay = 16 | 1524 | MaxHitsPerPrimInLlCastRay = 16 |
1508 | 1525 | ||
1509 | ; Maximum number of returned hits per object from llCastRay | 1526 | ; Maximum number of returned hits per object from llCastRay V3 |
1510 | MaxHitsPerObjectInLlCastRay = 16 | 1527 | MaxHitsPerObjectInLlCastRay = 16 |
1511 | 1528 | ||
1512 | ; Report ray intersections with surfaces on exits from a prim as hits in llCastRay if true | 1529 | ; Report ray intersections with surfaces on exits from a prim as hits in llCastRay V3 if true |
1513 | DetectExitHitsInLlCastRay = false | 1530 | DetectExitHitsInLlCastRay = false |
1514 | 1531 | ||
1515 | ; Filter on parts instead of groups in llCastRay if true | 1532 | ; Filter on parts instead of groups in llCastRay V3 if true |
1516 | FilterPartsInLlCastRay = false | 1533 | FilterPartsInLlCastRay = false |
1517 | 1534 | ||
1518 | ; Detect attachments in llCastRay if true | 1535 | ; Detect attachments in llCastRay V3 if true |
1519 | DoAttachmentsInLlCastRay = false | 1536 | DoAttachmentsInLlCastRay = false |
1520 | 1537 | ||
1521 | ; Use legacy version 1 of llCastRay if true | 1538 | ; Throttle period length in ms before which all old llCastRay use is discarded in llCastRay V3 |
1522 | UseLlCastRayV1 = true | 1539 | ; The sum of AvailableTimeInMsPerRegionInLlCastRay and all AvailableTimeInMsPerAvatarInLlCastRay should not exceed this |
1540 | ThrottleTimeInMsInLlCastRay = 200 | ||
1541 | |||
1542 | ; Available time in ms for llCastRay per throttle period and 65536 m2 land area in llCastRay V3 | ||
1543 | AvailableTimeInMsPerRegionInLlCastRay = 40 | ||
1544 | |||
1545 | ; Available time in ms for llCastRay per throttle period and avatar when script in attachment or vehicle in llCastRay V3 | ||
1546 | AvailableTimeInMsPerAvatarInLlCastRay = 10 | ||
1547 | |||
1548 | ; Required available time in ms left to perform a new llCastRay in llCastRay V3 | ||
1549 | RequiredAvailableTimeInMsInLlCastRay = 2 | ||
1550 | |||
1551 | ; Maximum available time in ms possible in llCastRay V3, not to get too high values with varregions | ||
1552 | MaximumAvailableTimeInMsInLlCastRay = 40 | ||
1553 | |||
1554 | ; Use cached meshes in llCastRay V3 if true | ||
1555 | ; Improves performance but uses more memory | ||
1556 | UseMeshCacheInLlCastRay = true | ||
1557 | |||
1523 | 1558 | ||
1524 | [DataSnapshot] | 1559 | [DataSnapshot] |
1525 | ; The following set of configs pertains to search. | 1560 | ; The following set of configs pertains to search. |
@@ -1547,6 +1582,7 @@ | |||
1547 | ; data service | 1582 | ; data service |
1548 | ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py" | 1583 | ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py" |
1549 | 1584 | ||
1585 | |||
1550 | [Economy] | 1586 | [Economy] |
1551 | ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only - | 1587 | ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only - |
1552 | ; The default economy module only implements just enough to allow free actions (transfer of objects, etc). | 1588 | ; The default economy module only implements just enough to allow free actions (transfer of objects, etc). |