fix merge issue

1 files changed, 16 insertions, 16 deletions

diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 7535b47..1da5e9d 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -1,6 +1,6 @@
 ; Enable OSSL functions.
 ; Including this file in a region's set of INI files, causes the OpenSimulator
-;   specific functions to be enabled. 
+;   specific functions to be enabled.
 ; See http://opensimulator.org/wiki/OSSL for a description of OSSL functions and
 ;   refer to http://opensimulator.org/wiki/OSSL_Implemented for a list of functions.
 
@@ -45,9 +45,9 @@
   ;           "PARCEL_OWNER" -- enable for parcel owner
   ;           "PARCEL_GROUP_MEMBER" -- enable for any member of the parcel group
   ;           uuid -- enable for specified ID (may be avatar or group ID)
-  ;    from this we can also create macros that can be include in the list as 
+  ;    from this we can also create macros that can be include in the list as
   ;    ${OSSL|macroname} see examples below
-  
+
   ; parcel macros
   ; Allowing ossl functions for anyone owning a parcel can be dangerous especially if
   ;    a region is selling or otherwise giving away parcel ownership. By default, parcel
@@ -68,10 +68,10 @@
   ;   the owners of the containing prim. There can also be entries beginning with
   ;   'Creators_". The 'Creators_" parameters can only be a list of UUIDs and it is
   ;   checked against the creator of the script itself.
-  
+
 ; *************************************************
- 
-  ; ThreatLevel  None 
+
+  ; ThreatLevel  None
   Allow_osGetAgents =               ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetAvatarList =           ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetGender =               true
@@ -85,11 +85,11 @@
   Allow_osSetSunParam =             ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osTeleportOwner =           ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osWindActiveModelPluginName = true
-  
+
   ; ThreatLevel  Nuisance
   Allow_osSetEstateSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRegionSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel  VeryLow
   Allow_osEjectFromGroup =          ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osForceBreakAllLinks =      ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
@@ -110,7 +110,7 @@
   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
@@ -125,7 +125,7 @@
   Allow_osNpcSetProfileAbout =      ${OSSL|osslNPC}
   Allow_osNpcSetProfileImage =      ${OSSL|osslNPC}
   Allow_osDie =                     ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel  Moderate
   Allow_osDropAttachment =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osDropAttachmentAt =        ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
@@ -141,7 +141,7 @@
   Allow_osGetSimulatorMemoryKB =    ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osMessageAttachments =      ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetSpeed =                ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel High
   Allow_osCauseDamage =             ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osCauseHealing =            ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
@@ -190,7 +190,7 @@
   Allow_osSetTerrainHeight =        ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetTerrainTexture =       ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetTerrainTextureHeight = ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel  VeryHigh
   Allow_osAgentSaveAppearance =     ESTATE_MANAGER,ESTATE_OWNER
   ; Warning: The next function allows scripts to force animations on avatars without the user giving permission.
@@ -209,7 +209,7 @@
   Allow_osRegionNotice =            ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRot  =                 false
   Allow_osSetParcelDetails =        ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel  Severe
   Allow_osConsoleCommand =          false
   Allow_osGrantScriptPermissions =  false
@@ -217,10 +217,10 @@
   Allow_osRevokeScriptPermissions = false
   Allow_osTeleportAgent =           ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osTeleportObject =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  
+
   ; ThreatLevel  Severe with additional internal restrictions
   Allow_osGetAgentIP =              true   ; always restricted to Administrators (true or false to disable)
-  
+
 ; available functions out of Threat level control (for reference only)
 ;  Allow_osCheckODE =                true
 ;  Allow_osClearInertia =            true
@@ -231,7 +231,7 @@
 ;  Allow_osDrawFilledRectangle =     true
 ;  Allow_osDrawImage =               true
 ;  Allow_osDrawLine =                true
-;  Allow_osDrawPolygon =             true 
+;  Allow_osDrawPolygon =             true
 ;  Allow_osDrawRectangle =           true
 ;  Allow_osDrawResetTransform =      true
 ;  Allow_osDrawRotationTransform =   true