Fix up the usual script messes.

Don't slow scripts down with bogus monitoring that isn't used anywhere.

Don't make scripts sleep all the time.

Don't bother with useless OhSilly Threat checks, and clean up the
remains.

1 files changed, 49 insertions, 48 deletions

diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 3793e67..f5f9197 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -18,7 +18,7 @@
 
   ; Send function permission error to owner if true, to all if false
   PermissionErrorToOwner = false
-  
+
   ; Function Threat level
   ; Several functions have a predefined threat level, one of:  None, VeryLow, Low, Moderate, High, VeryHigh, Severe.
   ; See http://opensimulator.org/wiki/Threat_level for more information on these levels.
@@ -61,8 +61,8 @@
 
   ; NPC macros
   ; These can be mis-used so limit use to those you can trust.
-  osslNPC = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  
+  osslNPC = ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+
   ; The threat level also can be replaced by lines of the form
   ; Creators__FunctionName = comma separated list of UUIDs
   ; this will enable the function for users that are the script creators and owners of the prim
@@ -110,20 +110,22 @@
 ;  Allow_osGetNotecard =             true
 ;  Allow_osGetNotecardLine =         true
 ;  Allow_osGetNumberOfNotecardLines = true
+;  Allow_osMakeNotecard =            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_osGetRegionStats =          ${OSSL|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_osGetSimulatorMemory =      ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
+;  Allow_osGetSimulatorMemoryKB =    ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
 ;  Allow_osGetSimulatorVersion =     true
 ;  Allow_osGetSunParam =             true
 ;  Allow_osGetTerrainHeight =        true
+;  Allow_osTerrainGetHeight =        true       ; Deprecated
 ;  Allow_osGetWindParam =            true
 ;  Allow_osIsNpc =                   true
 ;  Allow_osIsUUID =                  true
@@ -134,7 +136,6 @@
 ;  Allow_osLoadedCreationID =        true
 ;  Allow_osLoadedCreationTime =      true
 ;  Allow_osMatchString =             true
-;  Allow_osMakeNotecard =            true
 ;  Allow_osMax =                     true
 ;  Allow_osMin =                     true
 ;  Allow_osMessageObject =           true
@@ -164,12 +165,12 @@
 ;  Allow_osOwnerSaveAppearance =     true
 ;  Allow_osRegexIsMatch =            true
 ;  Allow_osReplaceString =           true
-;  Allow_osSetDynamicTextureData =   true
-;  Allow_osSetDynamicTextureDataFace = true
-;  Allow_osSetDynamicTextureDataBlend = true
+;  Allow_osSetDynamicTextureData =       true
+;  Allow_osSetDynamicTextureDataFace =   true
+;  Allow_osSetDynamicTextureDataBlend =  true
 ;  Allow_osSetDynamicTextureDataBlendFace = true
-;  Allow_osSetDynamicTextureURL =    true
-;  Allow_osSetDynamicTextureURLBlend = true
+;  Allow_osSetDynamicTextureURL =        true
+;  Allow_osSetDynamicTextureURLBlend =   true
 ;  Allow_osSetDynamicTextureURLBlendFace = true
 ;  Allow_osSetFontName =             true
 ;  Allow_osSetFontSize =             true
@@ -177,15 +178,15 @@
 ;  Allow_osSetInertiaAsBox =         true
 ;  Allow_osSetInertiaAsSphere =      true
 ;  Allow_osSetInertiaAsCylinder =    true
-;  Allow_osSetOwnerSpeed =           ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+;  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_osSetProjectionParams =     ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+;  Allow_osSetSpeed =                true
 ;  Allow_osSunGetParam =             true
 ;  Allow_osVolumeDetect =            true
-;  Allow_osTeleportObject =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+;  Allow_osTeleportObject =          ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
 ;  Allow_osTeleportOwner =           true
 ;  Allow_osWindActiveModelPluginName = true
 ;  Allow_osUnixTimeToTimestamp =     true
@@ -193,55 +194,55 @@
   ; 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
+  Allow_osSetSunParam =             ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetWindParam =            ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSunSetParam =             ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
 
   ; ThreatLevel  VeryLow
-  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_osEjectFromGroup =          ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceBreakAllLinks =      ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceBreakLink =          ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceCreateLink =         ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetLinkPrimitiveParams =  ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetPrimitiveParams =      ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osInviteToGroup =           ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetParcelMediaURL =       ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetParcelSIPAddress =     ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetPrimFloatOnWater =     true
+  Allow_osSetPrimitiveParams =      true
   Allow_osTerrainFlush =            ESTATE_MANAGER,ESTATE_OWNER
 
   ; ThreatLevel  Low
-  Allow_osAvatarName2Key =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetAvatarHomeURI =        ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osAvatarName2Key =          ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetAvatarHomeURI =        ${OSSL|osslParcelOG},ESTATE_MANAGER,ESTATE_OWNER
 
   ; ThreatLevel  Moderate
-  Allow_osDetectedCountry =         ${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_osGetGridGatekeeperURI =    ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetNumberOfAttachments =  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  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_osGetAgentCountry =         ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetGridGatekeeperURI =    ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetNumberOfAttachments =  ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
   Allow_osMessageAttachments =      true
   Allow_osRequestURL =              true
   Allow_osRequestSecureURL =        true
   Allow_osSetContentType =          true
-  Allow_osSetSpeed =                true
 
   ; ThreatLevel High
   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_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_osForceDropAttachment =     ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osForceDropAttachmentAt =   ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
   Allow_osParcelJoin =              ESTATE_MANAGER,ESTATE_OWNER
   Allow_osParcelSetDetails =        ESTATE_MANAGER,ESTATE_OWNER
   Allow_osParcelSubdivide =         ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegionNotice =            ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegionRestart =           ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetParcelDetails =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetParcelDetails =        ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRegionWaterHeight =    ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetStateEvents =          false   ; deprecated
   Allow_osSetTerrainHeight =        ESTATE_MANAGER,ESTATE_OWNER
@@ -258,15 +259,15 @@
   Allow_osAvatarStopAnimation =     true
   Allow_osForceAttachToOtherAvatarFromInventory = false
   Allow_osForceDetachFromAvatar =   false
-  Allow_osForceOtherSit =           false
+  Allow_osForceOtherSit =           ESTATE_OWNER, ESTATE_MANAGER
   Allow_osSetRot  =                 ESTATE_OWNER, ESTATE_MANAGER
 
   ; ThreatLevel  Severe
   Allow_osConsoleCommand =          false
   Allow_osGrantScriptPermissions =  false
-  Allow_osKickAvatar =              ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osKickAvatar =              ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRevokeScriptPermissions = false
-  Allow_osTeleportAgent =           ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osTeleportAgent =           ${OSSL|osslParcelO},ESTATE_MANAGER,ESTATE_OWNER
 
   ; ThreatLevel  Severe with additional internal restrictions
   Allow_osGetAgentIP =              true   ; always restricted to Administrators (true or false to disable)