Merge branch 'master' into httptests

2 files changed, 12 insertions, 11 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 5ca4ff1..51f6c9c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -2061,7 +2061,7 @@
     ;MessagingEnabled = true 
 
     ; Experimental option to only message cached online users rather than all users
-    ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
+    ; Should make large group with few online members messaging faster, at the expense of more calls to ROBUST presence service
     ; (Flotsam groups only; in V2 this is always on)
     MessageOnlineUsersOnly = false
 
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index aa7c90b..aed43f0 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -77,7 +77,7 @@
   Allow_osGetGender =               true
   Allow_osGetHealth =               true
   Allow_osGetHealRate =             true
-  Allow_osGetNPCList =               ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetNPCList =              ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetRezzingObject =        true
   Allow_osNpcGetOwner =             ${XEngine|osslNPC}
   Allow_osParseJSON =               true
@@ -121,7 +121,7 @@
   Allow_osLoadedCreationTime =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osMessageObject =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegexIsMatch =            true
-  Allow_osGetAvatarHomeURI =            ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osGetAvatarHomeURI =        ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osNpcSetProfileAbout =      ${XEngine|osslNPC}
   Allow_osNpcSetProfileImage =      ${XEngine|osslNPC}
   Allow_osDie =                     ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
@@ -138,6 +138,7 @@
   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_osGetSimulatorMemoryKB =    ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osMessageAttachments =      ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetSpeed =                ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   
@@ -221,28 +222,28 @@
   Allow_osGetAgentIP =              true   ; always restricted to Administrators (true or false to disable)
   
 ; available functions out of Threat level control (for reference only)
-;  Allow_osClearInertia =            true
 ;  Allow_osCheckODE =                true
+;  Allow_osClearInertia =            true
 ;  Allow_osCollisionSound =          true
 ;  Allow_osDrawEllipse =             true
 ;  Allow_osDrawFilledEllipse =       true
 ;  Allow_osDrawFilledPolygon =       true
 ;  Allow_osDrawFilledRectangle =     true
-;  Allow_osDrawResetTransform =      true
-;  Allow_osDrawRotationTransform =   true
-;  Allow_osDrawScaleTransform =      true
-;  Allow_osDrawTranslationTransform = 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_osGetPhysicsEngineName =    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
@@ -253,12 +254,12 @@
 ;  Allow_osMax =                     true
 ;  Allow_osMin =                     true
 ;  Allow_osMovePen =                 true
+;  Allow_osSetFontName =             true
+;  Allow_osSetFontSize =             true
 ;  Allow_osSetInertia =              true
 ;  Allow_osSetInertiaAsBox =         true
 ;  Allow_osSetInertiaAsSphere =      true
 ;  Allow_osSetInertiaAsCylinder =    true
-;  Allow_osSetFontName =             true
-;  Allow_osSetFontSize =             true
 ;  Allow_osSetPenCap =               true
 ;  Allow_osSetPenColor =             true
 ;  Allow_osSetPenSize =              true