Various script engine speed ups, and Oh Silly Threat clean ups.

Don't bother doing useless threat level, sleep, and bogus stat
collections, it only slows things down.

https://sledjhamr.org/mantisbt/view.php?id=15 for an analysis of the
bogus stat collection.

1 files changed, 164 insertions, 120 deletions

diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 59373b3..3793e67 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -27,7 +27,7 @@
   ;   in your simulator.  It is safer to explicitly allow certain types of user to run
   ;   higher threat level OSSL functions, as detailed later on.
   ; This setting defines the highest level allowed to execute
-  OSFunctionThreatLevel = VeryLow
+  OSFunctionThreatLevel = Moderate
 
   ; The threat level can be replaced by more detailed rules by lines of the form
   ; Allow_FunctionName = parameters
@@ -56,10 +56,8 @@
   ;    appropriate line below to allow parcel ownership and groups to do restricted
   ;    OSSL functions. It might be better to check the list below and edit the ones
   ;    to enable individually.
-  osslParcelO = ""
-  osslParcelOG = ""
-  ; osslParcelO = "PARCEL_OWNER,"
-  ; osslParcelOG = "PARCEL_GROUP_MEMBER,PARCEL_OWNER,"
+  osslParcelO = "PARCEL_OWNER,"
+  osslParcelOG = "PARCEL_GROUP_MEMBER,PARCEL_OWNER,"
 
   ; NPC macros
   ; These can be mis-used so limit use to those you can trust.
@@ -69,123 +67,181 @@
   ; Creators__FunctionName = comma separated list of UUIDs
   ; this will enable the function for users that are the script creators and owners of the prim
 
-
 ; *************************************************
 
-  ; ThreatLevel  None
-  Allow_osGetAgents =               ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetAvatarList =           ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  ;Allow_osGetGender =               true
-  ;Allow_osGetHealth =               true
-  ;Allow_osGetHealRate =             true
-  Allow_osGetNPCList =              ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  ;Allow_osGetRezzingObject =        true
-  ;Allow_osGetSunParam =             true
-  Allow_osNpcGetOwner =             ${OSSL|osslNPC}
-  Allow_osSetSunParam =             ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osTeleportOwner =           ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  ;Allow_osWindActiveModelPluginName = true
+; ThreatLevel  None
+; Commented functions are out of Threat level control (for reference only)
+;  Allow_osCheckODE =                true
+;  Allow_osClearInertia =            true
+;  Allow_osCollisionSound =          true
+;  Allow_osDie =                     true
+;  Allow_osDrawEllipse =             true
+;  Allow_osDrawFilledEllipse =       true
+;  Allow_osDrawFilledPolygon =       true
+;  Allow_osDrawFilledRectangle =     true
+;  Allow_osDrawImage =               true
+;  Allow_osDrawLine =                true
+;  Allow_osDrawPolygon =             true
+;  Allow_osDrawRectangle =           true
+;  Allow_osDrawResetTransform =      true
+;  Allow_osDrawRotationTransform =   true
+;  Allow_osDrawScaleTransform =      true
+;  Allow_osDrawText =                true
+;  Allow_osDrawTranslationTransform = true
+;  Allow_osFormatString =            true
+;  Allow_osGetCurrentSunHour =       true
+;  Allow_osGetAgents =               true
+;  Allow_osGetAvatarList =           true
+;  Allow_osGetDrawStringSize =       true
+;  Allow_osGetGender =               true
+;  Allow_osGetGridCustom =           true
+;  Allow_osGetGridHomeURI =          true
+;  Allow_osGetGridLoginURI =         true
+;  Allow_osGetGridName =             true
+;  Allow_osGetGridNick =             true
+;  Allow_osGetHealth =               true
+;  Allow_osGetHealRate =             true
+;  Allow_osGetInertiaData =          true
+;  Allow_osGetInventoryDesc =        true
+;  Allow_osGetLinkNumber =           true
+;  Allow_osGetMapTexture =           true
+  ; The notecard functions can cause a lot of load on the region if over used.
+  ; So can any LSL loop.  Pffft
+;  Allow_osGetNotecard =             true
+;  Allow_osGetNotecardLine =         true
+;  Allow_osGetNumberOfNotecardLines = true
+;  Allow_osGetNPCList =              true
+;  Allow_osGetParcerlDwell =         true
+;  Allow_osGetPhysicsEngineName =    true
+;  Allow_osGetPhysicsEngineType =    true
+;  Allow_osGetRegionMapTexture =     true
+;  Allow_osGetRegionSize =           true
+;  Allow_osGetRegionStats =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+;  Allow_osGetRezzingObject =        true
+;  Allow_osGetScriptEngineName =     true
+;  Allow_osGetSimulatorMemory =      ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+;  Allow_osGetSimulatorMemoryKB =    ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+;  Allow_osGetSimulatorVersion =     true
+;  Allow_osGetSunParam =             true
+;  Allow_osGetTerrainHeight =        true
+;  Allow_osGetWindParam =            true
+;  Allow_osIsNpc =                   true
+;  Allow_osIsUUID =                  true
+;  Allow_osKey2Name =                true
+;  Allow_osList2Double =             true
+;  Allow_osListenRegex =             true
+;  Allow_osLoadedCreationDate =      true
+;  Allow_osLoadedCreationID =        true
+;  Allow_osLoadedCreationTime =      true
+;  Allow_osMatchString =             true
+;  Allow_osMakeNotecard =            true
+;  Allow_osMax =                     true
+;  Allow_osMin =                     true
+;  Allow_osMessageObject =           true
+;  Allow_osMovePen =                 true
+;  Allow_osNpcCreate =               true
+;  Allow_osNpcGetOwner =             true
+;  Allow_osNpcGetPos =               true
+;  Allow_osNpcGetRot =               true
+;  Allow_osNpcLoadAppearance =       true
+;  Allow_osNpcMoveTo =               true
+;  Allow_osNpcMoveToTarget =         true
+;  Allow_osNpcPlayAnimation =        true
+;  Allow_osNpcRemove =               true
+;  Allow_osNpcSaveAppearance =       true
+;  Allow_osNpcSay =                  true
+;  Allow_osNpcSayTo =                true
+;  Allow_osNpcSetProfileAbout =      true
+;  Allow_osNpcSetProfileImage =      true
+;  Allow_osNpcSetRot =               true
+;  Allow_osNpcShout =                true
+;  Allow_osNpcSit =                  true
+;  Allow_osNpcStand =                true
+;  Allow_osNpcStopAnimation =        true
+;  Allow_osNpcStopMoveToTarget =     true
+;  Allow_osNpcTouch =                true
+;  Allow_osNpcWhisper =              true
+;  Allow_osOwnerSaveAppearance =     true
+;  Allow_osRegexIsMatch =            true
+;  Allow_osReplaceString =           true
+;  Allow_osSetDynamicTextureData =   true
+;  Allow_osSetDynamicTextureDataFace = true
+;  Allow_osSetDynamicTextureDataBlend = true
+;  Allow_osSetDynamicTextureDataBlendFace = true
+;  Allow_osSetDynamicTextureURL =    true
+;  Allow_osSetDynamicTextureURLBlend = true
+;  Allow_osSetDynamicTextureURLBlendFace = true
+;  Allow_osSetFontName =             true
+;  Allow_osSetFontSize =             true
+;  Allow_osSetInertia =              true
+;  Allow_osSetInertiaAsBox =         true
+;  Allow_osSetInertiaAsSphere =      true
+;  Allow_osSetInertiaAsCylinder =    true
+;  Allow_osSetOwnerSpeed =           ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+;  Allow_osSetPenCap =               true
+;  Allow_osSetPenColor =             true
+;  Allow_osSetPenSize =              true
+;  Allow_osSetPrimitiveParams =      true
+;  Allow_osSetProjectionParams =     ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+;  Allow_osSunGetParam =             true
+;  Allow_osVolumeDetect =            true
+;  Allow_osTeleportObject =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+;  Allow_osTeleportOwner =           true
+;  Allow_osWindActiveModelPluginName = true
+;  Allow_osUnixTimeToTimestamp =     true
 
   ; ThreatLevel  Nuisance
   Allow_osSetEstateSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRegionSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetSunParam =             ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetWindParam =            ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSunSetParam =             ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
 
   ; ThreatLevel  VeryLow
-  Allow_osEjectFromGroup =          ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osForceBreakAllLinks =      ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osForceBreakLink =          ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetWindParam =            true
-  Allow_osInviteToGroup =           ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osReplaceString =           true
-  Allow_osSetDynamicTextureData =       ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureDataFace =   ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureDataBlend =  ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureDataBlendFace = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetParcelMediaURL =       ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetParcelSIPAddress =     ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osEjectFromGroup =          ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceBreakAllLinks =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceBreakLink =          ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceCreateLink =         ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetLinkPrimitiveParams =  ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetPrimitiveParams =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osInviteToGroup =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetParcelMediaURL =       ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetParcelSIPAddress =     ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetPrimFloatOnWater =     true
-  Allow_osSetWindParam =            ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osTerrainFlush =            ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osUnixTimeToTimestamp =     true
 
   ; ThreatLevel  Low
-  Allow_osAvatarName2Key =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osFormatString =            true
-  Allow_osKey2Name =                ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osListenRegex =             true
-  Allow_osLoadedCreationDate =      ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osLoadedCreationID =        ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osLoadedCreationTime =      ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osMessageObject =           ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osRegexIsMatch =            true
-  Allow_osGetAvatarHomeURI =        ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcSetProfileAbout =      ${OSSL|osslNPC}
-  Allow_osNpcSetProfileImage =      ${OSSL|osslNPC}
-  Allow_osDie =                     ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osAvatarName2Key =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetAvatarHomeURI =        ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
 
   ; ThreatLevel  Moderate
   Allow_osDetectedCountry =         ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osDropAttachment =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osDropAttachmentAt =        ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osDropAttachment =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osDropAttachmentAt =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetAgentCountry =         ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetGridCustom =           ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetGridGatekeeperURI =    ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetGridHomeURI =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetGridLoginURI =         ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetGridName =             true
-  Allow_osGetGridNick =             true
-  Allow_osGetNumberOfAttachments =  ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetRegionStats =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetSimulatorMemory =      ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetSimulatorMemoryKB =    ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osMessageAttachments =      ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetSpeed =                ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetOwnerSpeed =           ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osRequestURL =              ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osRequestSecureURL =        ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetGridGatekeeperURI =    ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetNumberOfAttachments =  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osMessageAttachments =      true
+  Allow_osRequestURL =              true
+  Allow_osRequestSecureURL =        true
+  Allow_osSetContentType =          true
+  Allow_osSetSpeed =                true
 
   ; ThreatLevel High
-  Allow_osCauseDamage =             ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osCauseHealing =            ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetHealth =               ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetHealRate =             ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osForceAttachToAvatar =     ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osForceAttachToAvatarFromInventory = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osForceCreateLink =         ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osForceDropAttachment =     ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osForceDropAttachmentAt =   ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetLinkPrimitiveParams =  ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetPhysicsEngineType =    true
-  Allow_osGetRegionMapTexture =     ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetScriptEngineName =     true
-  Allow_osGetSimulatorVersion =     true
-  Allow_osMakeNotecard =            ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osMatchString =             true
-  Allow_osNpcCreate =               ${OSSL|osslNPC}
-  Allow_osNpcGetPos =               ${OSSL|osslNPC}
-  Allow_osNpcGetRot =               ${OSSL|osslNPC}
-  Allow_osNpcLoadAppearance =       ${OSSL|osslNPC}
-  Allow_osNpcMoveTo =               ${OSSL|osslNPC}
-  Allow_osNpcMoveToTarget =         ${OSSL|osslNPC}
-  Allow_osNpcPlayAnimation =        ${OSSL|osslNPC}
-  Allow_osNpcRemove =               ${OSSL|osslNPC}
-  Allow_osNpcSaveAppearance =       ${OSSL|osslNPC}
-  Allow_osNpcSay =                  ${OSSL|osslNPC}
-  Allow_osNpcSayTo =                ${OSSL|osslNPC}
-  Allow_osNpcSetRot =               ${OSSL|osslNPC}
-  Allow_osNpcShout =                ${OSSL|osslNPC}
-  Allow_osNpcSit =                  ${OSSL|osslNPC}
-  Allow_osNpcStand =                ${OSSL|osslNPC}
-  Allow_osNpcStopAnimation =        ${OSSL|osslNPC}
-  Allow_osNpcStopMoveToTarget =     ${OSSL|osslNPC}
-  Allow_osNpcTouch =                ${OSSL|osslNPC}
-  Allow_osNpcWhisper =              ${OSSL|osslNPC}
-  Allow_osOwnerSaveAppearance =     ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osCauseDamage =             ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osCauseHealing =            ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetHealth =               ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetHealRate =             ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceAttachToAvatar =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceAttachToAvatarFromInventory = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceDropAttachment =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceDropAttachmentAt =   ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osParcelJoin =              ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osParcelSetDetails =        ESTATE_MANAGER,ESTATE_OWNER
   Allow_osParcelSubdivide =         ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osRegionRestart =           ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegionNotice =            ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetProjectionParams =     ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osRegionRestart =           ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetParcelDetails =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRegionWaterHeight =    ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetStateEvents =          false   ; deprecated
   Allow_osSetTerrainHeight =        ESTATE_MANAGER,ESTATE_OWNER
@@ -198,31 +254,19 @@
   ;   Enabling this can allow forced animations which can trigger traumatic episodes in vulnerable populations.
   ;   Similar things can be said for several of the 'force' functions. Enable with care and control.
   ; Some of these were added as early functionality for NPCs. This has been replaced with the NPC functions.
-  Allow_osAvatarPlayAnimation =     false
-  Allow_osAvatarStopAnimation =     false
+  Allow_osAvatarPlayAnimation =     true
+  Allow_osAvatarStopAnimation =     true
   Allow_osForceAttachToOtherAvatarFromInventory = false
   Allow_osForceDetachFromAvatar =   false
   Allow_osForceOtherSit =           false
-  ; The notecard functions can cause a lot of load on the region if over used
-  Allow_osGetNotecard =             ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetNotecardLine =         ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetNumberOfNotecardLines = ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureURL =    ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureURLBlend = ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureURLBlendFace = ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetRot  =                 false
-  Allow_osSetParcelDetails =        ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetRot  =                 ESTATE_OWNER, ESTATE_MANAGER
 
   ; ThreatLevel  Severe
   Allow_osConsoleCommand =          false
-  Allow_osKickAvatar =              ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osTeleportAgent =           ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osTeleportObject =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGrantScriptPermissions =  false
+  Allow_osKickAvatar =              ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osRevokeScriptPermissions = false
+  Allow_osTeleportAgent =           ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
 
   ; ThreatLevel  Severe with additional internal restrictions
   Allow_osGetAgentIP =              true   ; always restricted to Administrators (true or false to disable)
-  Allow_osSetContentType =          false
-
-
-; Always available
-; see http://opensimulator.org/wiki/Category:OSSL_Functions