Merge branch 'master' of opensimulator.org:/var/git/opensim

9 files changed, 226 insertions, 173 deletions

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index fc98879..ab8f25d 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -12,7 +12,7 @@
     InventoryServices       = "RemoteXInventoryServicesConnector"
     GridServices            = "RemoteGridServicesConnector"
     AvatarServices          = "RemoteAvatarServicesConnector"
-    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    NeighbourServices       = "NeighbourServicesOutConnector"
     AuthenticationServices  = "RemoteAuthenticationServicesConnector"
     AuthorizationServices   = "LocalAuthorizationServicesConnector"
     PresenceServices        = "RemotePresenceServicesConnector"
@@ -25,7 +25,8 @@
     LandServices            = "RemoteLandServicesConnector"
     MapImageService         = "MapImageServiceModule"
     SearchModule            = "BasicSearchModule"
-    
+    MuteListService         = "RemoteMuteListServicesConnector"
+
     LandServiceInConnector        = true
     NeighbourServiceInConnector   = true
     SimulationServiceInConnector  = true
@@ -46,7 +47,7 @@
     ; Because LocalGridServicesConnector starts this service, in grid mode we need to suppress
     ; the inappropriate console commands that it registers.
     SuppressConsoleCommands = true
-    
+
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
     LibraryName = "OpenSim Library"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 10a5b47..e93ce3c 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -105,7 +105,7 @@
 
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
+    ;; (usually bundled with the rest of the services in one
     ;; Robust server in port ${Const|PublicPort}, but not always)
     Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
 
@@ -122,7 +122,7 @@
 [Messaging]
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
+    ;; (usually bundled with the rest of the services in one
     ;; Robust server in port ${Const|PublicPort}, but not always)
     Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
 
@@ -171,7 +171,7 @@
 [HGInventoryAccessModule]
     ;
     ; === HG ONLY ===
-    ; Change this to your server 
+    ; Change this to your server
     ; accessible from other grids
     ;
     HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
@@ -187,7 +187,7 @@
 
     ;; Warning: advanced and unusual. Default is false.
     ;; Enables configurations where grids share user services, including inventory,
-    ;; while separating regions' assets from users' assets. Asset transfer between 
+    ;; while separating regions' assets from users' assets. Asset transfer between
     ;; the users' asset server and the regions' asset server is done in HG-like manner.
     ; CheckSeparateAssets = false
     ; RegionHGAssetServerURI = ${Const|BaseURL}:${Const|PublicPort}
@@ -196,7 +196,7 @@
 [HGAssetService]
     ;
     ; === HG ONLY ===
-    ; Change this to your server 
+    ; Change this to your server
     ; accessible from other grids
     ;
     HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
@@ -204,11 +204,11 @@
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
     ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
     ;;
     ;; Leave blank or commented if you don't want to apply any restrictions.
-    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange
     ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
@@ -244,3 +244,6 @@
 
     ;; Capability assigned by the grid administrator for the simulator
     ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
+
+[MuteListService]
+    MuteListServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index f5f4c87..78bcd73 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -15,7 +15,7 @@
     InventoryServices       = "HGInventoryBroker"
     GridServices            = "RemoteGridServicesConnector"
     AvatarServices          = "RemoteAvatarServicesConnector"
-    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    NeighbourServices       = "NeighbourServicesOutConnector"
     AuthenticationServices  = "RemoteAuthenticationServicesConnector"
     AuthorizationServices   = "LocalAuthorizationServicesConnector"
     PresenceServices        = "RemotePresenceServicesConnector"
@@ -30,15 +30,13 @@
     MapImageService         = "MapImageServiceModule"
     UserManagementModule    = "HGUserManagementModule"
     SearchModule            = "BasicSearchModule"
-    
+    MuteListService         = "RemoteMuteListServicesConnector"
+
     LandServiceInConnector        = true
     NeighbourServiceInConnector   = true
     SimulationServiceInConnector  = true
     LibraryModule                 = true
 
-[Profile]
-    Module = "BasicProfileModule"
-
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index efad577..24f9813 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -5,7 +5,7 @@
 ;;
 
 ;;
-;; In GridCommon.ini, these are the URLs you would use if SimianGrid is 
+;; In GridCommon.ini, these are the URLs you would use if SimianGrid is
 ;; installed at http://www.mygrid.com/Grid/
 ;;
 ; AssetServerURI = "http://www.mygrid.com/Grid/?id="
@@ -28,17 +28,17 @@
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     AvatarServices = "SimianAvatarServiceConnector"
-    
-    NeighbourServices = "RemoteNeighbourServicesConnector"
+
+    NeighbourServices = "NeighbourServicesOutConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
     EntityTransferModule = "HGEntityTransferModule"
     InventoryAccessModule = "HGInventoryAccessModule"
-    
+
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     SimulationServiceInConnector = true
     LibraryModule = false
-    
+
     AssetCaching = "FlotsamAssetCache"
 
 [SimulationDataStore]
@@ -87,7 +87,7 @@
 [HGInventoryAccessModule]
     ;
     ; === HG ONLY ===
-    ; Change this to your profile server 
+    ; Change this to your profile server
     ; accessible from other grids
     ;
     ProfileServerURI = "http://mygridserver.com:8002/user"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 5749656..fdf7ca2 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -5,7 +5,7 @@
 ;;
 
 ;;
-;; In GridCommon.ini, these are the URLs you would use if SimianGrid is 
+;; In GridCommon.ini, these are the URLs you would use if SimianGrid is
 ;; installed at http://www.mygrid.com/Grid/
 ;;
 ; AssetServerURI = "http://www.mygrid.com/Grid/?id="
@@ -28,17 +28,17 @@
     AssetServices = "SimianAssetServiceConnector"
     InventoryServices = "SimianInventoryServiceConnector"
     AvatarServices = "SimianAvatarServiceConnector"
-    
-    NeighbourServices = "RemoteNeighbourServicesConnector"
+
+    NeighbourServices = "NeighbourServicesOutConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
     EntityTransferModule = "BasicEntityTransferModule"
     InventoryAccessModule = "BasicInventoryAccessModule"
-    
+
     LandServiceInConnector = true
     NeighbourServiceInConnector = true
     SimulationServiceInConnector = true
     LibraryModule = false
-    
+
     AssetCaching = "FlotsamAssetCache"
 
 [SimulationDataStore]
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 78ada2b..127b073 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -7,7 +7,7 @@
 [Modules]
     AssetServices           = "LocalAssetServicesConnector"
     InventoryServices       = "LocalInventoryServicesConnector"
-    NeighbourServices       = "LocalNeighbourServicesConnector"
+    NeighbourServices       = "NeighbourServicesOutConnector"
     AuthenticationServices  = "LocalAuthenticationServicesConnector"
     AuthorizationServices   = "LocalAuthorizationServicesConnector"
     GridServices            = "LocalGridServicesConnector"
@@ -22,6 +22,7 @@
     InventoryAccessModule   = "BasicInventoryAccessModule"
     MapImageService         = "MapImageServiceModule"
     SearchModule            = "BasicSearchModule"
+        MuteListService                 = "LocalMuteListServicesConnector"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
@@ -103,8 +104,8 @@
     ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
     ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
     ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
-    ;; Options are 
-    ;;   "none"     no DST 
+    ;; Options are
+    ;;   "none"     no DST
     ;;   "local"    use the server's only timezone to calculate DST.  This is previous OpenSimulator behaviour.
     ;;   "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
     ;;      'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
@@ -113,6 +114,9 @@
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
+[MuteListService]
+        LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
+
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d0b152c..8931557 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -85,20 +85,20 @@
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
-    ;;  
+    ;;
     ;; DefaultRegion    If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.)
     ;;                  then this region becomes the destination.  Only the first online default region will be used.  If no DefaultHGRegion
     ;;                  is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified
     ;;                  an explicit region.
-    ;;  
+    ;;
     ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
     ;;                  region will be used.
-    ;;  
-    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;;
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the
     ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
-    ;;  
+    ;;
     ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
-    ;;  
+    ;;
     ;; Persistent       When the simulator is shutdown, the region is signalled as offline but left registered on the grid.
     ;;
     ;; For example:
@@ -121,7 +121,7 @@
     ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-    SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}"    
+    SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
     SRV_InventoryServerURI = "${Const|BaseURL}:${Const|PublicPort}"
     SRV_AssetServerURI = "${Const|BaseURL}:${Const|PublicPort}"
     SRV_ProfileServerURI = "${Const|BaseURL}:${Const|PublicPort}"
@@ -163,7 +163,7 @@
     ; ;
     ; ; The amount of time that a specific endpoint is blocked.    Default 2 minutes.
     ; DOSForgiveClientAfterMS = 120000
-    ; ; 
+    ; ;
     ; ; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
 [FreeswitchService]
@@ -197,7 +197,7 @@
     ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
     ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
     ;; stun.freeswitch.org is not guaranteed to be running so use it in
-    ;; production at your own risk    
+    ;; production at your own risk
     ; EchoServer = 127.0.0.1
     ; EchoPort = 50505
     ; AttemptSTUN = false
@@ -341,11 +341,11 @@
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
     ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
     ;;
     ;; Leave blank or commented if you don't want to apply any restrictions.
-    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange
     ;; of scripts, like so:
     ; DisallowExport ="LSLText"
     ; DisallowImport ="LSLBytecode"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index eaacfff..e305972 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -10,7 +10,7 @@
 [Modules]
     AssetServices           = "HGAssetBroker"
     InventoryServices       = "HGInventoryBroker"
-    NeighbourServices       = "LocalNeighbourServicesConnector"
+    NeighbourServices       = "NeighbourServicesOutConnector"
     AuthenticationServices  = "LocalAuthenticationServicesConnector"
     AuthorizationServices   = "LocalAuthorizationServicesConnector"
     GridServices            = "LocalGridServicesConnector"
@@ -27,7 +27,8 @@
     FriendsModule           = "HGFriendsModule"
     UserManagementModule    = "HGUserManagementModule"
     SearchModule            = "BasicSearchModule"
-    
+        MuteListService                 = "LocalMuteListServicesConnector"
+
     InventoryServiceInConnector       = true
     AssetServiceInConnector           = true
     HypergridServiceInConnector       = true
@@ -79,7 +80,7 @@
 
     ; Needed to display non-default map tile images for remote regions
     AssetService = "OpenSim.Services.AssetService.dll:AssetService"
-  
+
     HypergridLinker = true
     AllowHypergridMapSearch = true
 
@@ -123,7 +124,7 @@
     GridService           = "OpenSim.Services.GridService.dll:GridService"
     AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
     FriendsService        = "OpenSim.Services.FriendsService.dll:FriendsService"
-   
+
     ; This inventory service will be used to initialize the user's inventory
     HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
     HGInventoryServiceConstructorArg = "HGInventoryService"
@@ -190,6 +191,9 @@
     UserAgentService  = "OpenSim.Services.HypergridService.dll:UserAgentService"
     InGatekeeper = True
 
+[MuteListService]
+        LocalServiceModule = "OpenSim.Services.MuteListService.dll:MuteListService"
+
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 45eddf7..4726502 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.
 
@@ -9,7 +9,7 @@
 ;   mis-used so the permission to execute a function can be limited. Ability to
 ;   execute a function is based on the owner of the prim holding the script.
 
-[XEngine]
+[OSSL]
   ; Allow the use of os* functions (some are dangerous)
   AllowOSFunctions = true
 
@@ -31,7 +31,7 @@
   ;   higher threat level OSSL functions, as detailed later on.
   OSFunctionThreatLevel = VeryLow
 
-  ; Each of the OSSL functions can be enabled or disabled individually.
+  ; Some of the OSSL functions can be enabled or disabled individually.
   ; To disable, set the value to 'false'.
   ; To enable for everyone, set the value to 'true'.
   ; To enable for individuals or groups, set it to a comma separated list. This checks
@@ -45,12 +45,10 @@
   ;           "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
+  ;    ${OSSL|macroname} see examples below
 
-  ; The OSSL function name is prepended with "Allow_" and it checks against
-  ;   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.
-
+  ; 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
   ;    ownership or group membership does not enable OSSL functions. Uncomment the
@@ -62,155 +60,138 @@
   ; osslParcelO = "PARCEL_OWNER,"
   ; osslParcelOG = "PARCEL_GROUP_MEMBER,PARCEL_OWNER,"
 
-  ; There are a block of functions for creating and controlling NPCs.
+  ; NPC macros
   ; These can be mis-used so limit use to those you can trust.
-  osslNPC =                         ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-               
+  osslNPC = ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+
+  ; The OSSL function name is prepended with "Allow_" and it checks against
+  ;   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
-  Allow_osDrawEllipse =             true
-  Allow_osDrawFilledPolygon =       true
-  Allow_osDrawFilledRectangle =     true
-  Allow_osDrawImage =               true
-  Allow_osDrawLine =                true
-  Allow_osDrawPolygon =             true
-  Allow_osDrawRectangle =           true
-  Allow_osDrawText =                true
-  Allow_osGetAgents =               ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetAvatarList =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetCurrentSunHour =       true
+  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_osGetInventoryDesc  =       true
-  Allow_osGetMapTexture =           true
-  Allow_osGetRegionSize =           true
+  Allow_osGetNPCList =              ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetRezzingObject =        true
-  Allow_osGetSunParam =             true
-  Allow_osGetTerrainHeight =        true
-  Allow_osIsNpc =                   true
-  Allow_osIsUUID =                  true
-  Allow_osList2Double =             true
-  Allow_osMax =                     true
-  Allow_osMin =                     true
-  Allow_osMovePen =                 true
-  Allow_osNpcGetOwner =             ${XEngine|osslNPC}
+  Allow_osNpcGetOwner =             ${OSSL|osslNPC}
   Allow_osParseJSON =               true
   Allow_osParseJSONNew =            true
-  Allow_osSetFontName =             true
-  Allow_osSetFontSize =             true
-  Allow_osSetPenCap =               true
-  Allow_osSetPenColor =             true
-  Allow_osSetPenSize =              true
-  Allow_osSetSunParam =             ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osTeleportOwner =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetSunParam =             ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osTeleportOwner =           ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osWindActiveModelPluginName = true
-  Allow_osCheckODE =                true    ; Here for completeness. This function cannot be turned off
-  
+
   ; ThreatLevel  Nuisance
   Allow_osSetEstateSunSettings =    ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRegionSunSettings =    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_osGetDrawStringSize =       true
+  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 =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osInviteToGroup =           ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osReplaceString =           true
-  Allow_osSetDynamicTextureData =       ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureDataBlend =  ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureDataBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureURL =        ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureURLBlend =   ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetDynamicTextureURLBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetParcelMediaURL =       ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetParcelSIPAddress =     ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  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_osSetDynamicTextureURL =        ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetDynamicTextureURLBlend =   ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetDynamicTextureURLBlendFace = ${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_osSetWindParam =            ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetWindParam =            ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osTerrainFlush =            ESTATE_MANAGER,ESTATE_OWNER
   Allow_osUnixTimeToTimestamp =     true
-  
+
   ; ThreatLevel  Low
-  Allow_osAvatarName2Key =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osAvatarName2Key =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osFormatString =            true
-  Allow_osKey2Name =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osKey2Name =                ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osListenRegex =             true
-  Allow_osLoadedCreationDate =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osLoadedCreationID =        ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osLoadedCreationTime =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osMessageObject =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  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 =            ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcSetProfileAbout =      ${XEngine|osslNPC}
-  Allow_osNpcSetProfileImage =      ${XEngine|osslNPC}
-  Allow_osDie =                     ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  
+  Allow_osGetAvatarHomeURI =        ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcSetProfileAbout =      ${OSSL|osslNPC}
+  Allow_osNpcSetProfileImage =      ${OSSL|osslNPC}
+  Allow_osDie =                     ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+
   ; ThreatLevel  Moderate
-  Allow_osDropAttachment =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osDropAttachmentAt =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetGridCustom =           ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetGridGatekeeperURI =    ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetGridHomeURI =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetGridLoginURI =         ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osDropAttachment =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osDropAttachmentAt =        ${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 =  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetRegionStats =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetSimulatorMemory =      ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osMessageAttachments =      ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetSpeed =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  
+  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
+
   ; ThreatLevel High
-  Allow_osCauseDamage =             ${XEngine|osslParcelO}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_osForceCreateLink =         ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osForceDropAttachment =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osForceDropAttachmentAt =   ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetAgentIP =              ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetLinkPrimitiveParams =  ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  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_osGetPrimitiveParams =      ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetRegionMapTexture =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetPrimitiveParams =      ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetRegionMapTexture =     ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetScriptEngineName =     true
   Allow_osGetSimulatorVersion =     true
-  Allow_osMakeNotecard =            ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osMakeNotecard =            ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osMatchString =             true
-  Allow_osNpcCreate =               ${XEngine|osslNPC}
-  Allow_osNpcGetPos =               ${XEngine|osslNPC}
-  Allow_osNpcGetRot =               ${XEngine|osslNPC}
-  Allow_osNpcLoadAppearance =       ${XEngine|osslNPC}
-  Allow_osNpcMoveTo =               ${XEngine|osslNPC}
-  Allow_osNpcMoveToTarget =         ${XEngine|osslNPC}
-  Allow_osNpcPlayAnimation =        ${XEngine|osslNPC}
-  Allow_osNpcRemove =               ${XEngine|osslNPC}
-  Allow_osNpcSaveAppearance =       ${XEngine|osslNPC}
-  Allow_osNpcSay =                  ${XEngine|osslNPC}
-  Allow_osNpcSetRot =               ${XEngine|osslNPC}
-  Allow_osNpcShout =                ${XEngine|osslNPC}
-  Allow_osNpcSit =                  ${XEngine|osslNPC}
-  Allow_osNpcStand =                ${XEngine|osslNPC}
-  Allow_osNpcStopAnimation =        ${XEngine|osslNPC}
-  Allow_osNpcStopMoveToTarget =     ${XEngine|osslNPC}
-  Allow_osNpcTouch =                ${XEngine|osslNPC}
-  Allow_osNpcWhisper =              ${XEngine|osslNPC}
-  Allow_osOwnerSaveAppearance =     ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  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_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_osParcelJoin =              ESTATE_MANAGER,ESTATE_OWNER
   Allow_osParcelSubdivide =         ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegionRestart =           ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetContentType =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osRegionNotice =            ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetContentType =          ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetPrimitiveParams =      false
-  Allow_osSetProjectionParams =     ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osSetProjectionParams =     ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRegionWaterHeight =    ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetStateEvents =          false   ; deprecated
   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.
@@ -223,17 +204,79 @@
   Allow_osForceDetachFromAvatar =   false
   Allow_osForceOtherSit =           false
   ; The notecard functions can cause a lot of load on the region if over used
-  Allow_osGetNotecard =             ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetNotecardLine =         ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osGetNumberOfNotecardLines = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osRegionNotice =            ESTATE_MANAGER,ESTATE_OWNER
+  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_osSetRot  =                 false
-  Allow_osSetParcelDetails =        ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
-  
+  Allow_osSetParcelDetails =        ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
+
   ; 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
+  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_osAdjustSoundVolume =       true
+;  Allow_osAngleBetween =            true
+;  Allow_osCheckODE =                true
+;  Allow_osClearInertia =            true
+;  Allow_osCollisionSound =          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_osGetCurrentSunHour =       true
+;  Allow_osGetInertiaData =          true
+;  Allow_osGetInventoryDesc =        true
+;  Allow_osGetLinkNumber =           true
+;  Allow_osGetMapTexture =           true
+;  Allow_osGetPhysicsEngineName =    true
+;  Allow_osGetRegionSize =           true
+;  Allow_osGetSunParam =             true
+;  Allow_osGetTerrainHeight =        true
+;  Allow_osGetDrawStringSize =       true
+;  Allow_osIsNpc =                   true
+;  Allow_osIsUUID =                  true
+;  Allow_osList2Double =             true
+;  Allow_osLoopSound =               true
+;  Allow_osLoopSoundMaster =         true
+;  Allow_osLoopSoundSlave =          true
+;  Allow_osMax =                     true
+;  Allow_osMin =                     true
+;  Allow_osMovePen =                 true
+;  Allow_osPlaySound =               true
+;  Allow_osPlaySoundSlave =          true
+;  Allow_osPreloadSound =            true
+;  Allow_osRound =                   true
+;  Allow_osSetFontName =             true
+;  Allow_osSetFontSize =             true
+;  Allow_osSetInertia =              true
+;  Allow_osSetInertiaAsBox =         true
+;  Allow_osSetInertiaAsSphere =      true
+;  Allow_osSetInertiaAsCylinder =    true
+;  Allow_osSetPenCap =               true
+;  Allow_osSetPenColor =             true
+;  Allow_osSetPenSize =              true
+;  Allow_osSetSoundRadius =          true
+;  Allow_osStopSound =               true
+;  Allow_osTriggerSound =            true
+;  Allow_osTriggerSoundLimited =     true
+;  Allow_osVecDistSquare =           true
+;  Allow_osVecMagSquare =            true
+;  Allow_osVolumeDetect =            true