4 files changed, 80 insertions, 55 deletions

diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index b7ddd0b..02edd6c 100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3a80dbe..cede84d 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -661,6 +661,25 @@
     ; many simultaneous requests, default is 30 and is currently applied only to assets
     ;MaxRequestConcurrency = 30
 
+[ScriptsHttpRequestModule]
+        ; options for llHttpRequest
+        
+        ; max number of concurrent connections per instance (all scenes), default 8
+        ; MaxPoolThreads = 8
+        
+    ; max requests per second for all scripts on a prim, default 1
+    ;PrimRequestsPerSec = 1.0
+        ; initial unthrottled burst for all scripts on a prim, default 3
+    ;PrimRequestsBurst = 3.0
+
+    ; max requests per second for the objects owner (per instance), default 25
+    ;PrimOwnerRequestsPerSec = 25.0
+        ; initial unthrottled burst for the objects owner (per instance), default 5
+    ;PrimOwnerRequestsBurst = 5.0
+        
+        ; requests timeout in miliseconds, range 200 to 60000, default 30000
+    ;RequestsTimeOut = 30000
+        
 [AccessControl]
         ; Viewer-based access control. |-separated list of allowed viewers.
     ; AllowedClients = ""
@@ -728,17 +747,6 @@
     ;texture_default = 18500
     ;asset_default = 10500
 
-    ; Configures how ObjectUpdates are aggregated. These numbers
-    ; do not literally mean how many updates will be put in each
-    ; packet that goes over the wire, as packets are
-    ; automatically split on a 1400 byte boundary. These control
-    ; the balance between responsiveness of interest list updates
-    ; and total throughput. Higher numbers will ensure more full-
-    ; sized packets and faster sending of data, but more delay in
-    ; updating interest lists
-    ;
-    ;PrimUpdatesPerCallback = 100
-
     ; TextureSendLimit determines how many packets will be put on
     ; the outgoing queue each cycle. Like the settings above, this
     ; is a balance between responsiveness to priority updates and
@@ -748,16 +756,6 @@
     ;
     ;TextureSendLimit = 20
 
-    ; CannibalizeTextureRate allows bandwidth to be moved from the
-    ; UDP texture throttle to the task throttle. Since most viewers
-    ; use HTTP textures, this provides a means of using what is largely
-    ; unused bandwidth in the total throttle. The value is the proportion
-    ; of the texture rate to move to the task queue. It must be between
-    ; 0.0 (none of the bandwidth is cannibalized) and 0.9 (90% of the
-    ; bandwidth is grabbed)
-    ;
-    ; CannibalizeTextureRate = 0.5
-
     ; Quash and remove any light properties from attachments not on the
     ; hands. This allows flashlights and lanterns to function, but kills
     ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
@@ -802,6 +800,7 @@
     Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
     Cap_GetMesh2 = "localhost"
+    ; Cap_GetAsset = "localhost"  DO not ucoment this line. Some popular viewers still dont do it right for opensim. Here to easy testing
     Cap_GetObjectCost = ""
     Cap_GetObjectPhysicsData = ""
     Cap_GroupProposalBallot = ""
diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml
index 862a66d..8f2f6002 100644
--- a/bin/ScriptSyntax.xml
+++ b/bin/ScriptSyntax.xml
@@ -1,4 +1,4 @@
-a0b4b514-3c14-6b98-ca98-e18a79e9792f
+20392e48-fad2-094e-bc5b-cda003a1e940
 <llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
 <key>controls</key>
 <map>
@@ -1513,7 +1513,7 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  </map>
  <key>OS_APIVERSION</key><map>
   <key>type</key><string>integer</string>
-  <key>value</key><string>2</string>
+  <key>value</key><string>3</string>
  </map>
  <key>OS_ATTACH_MSG_ALL</key><map>
   <key>type</key><string>integer</string>
@@ -6114,34 +6114,34 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <map>
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
-   <map><key>va</key><map><key>type</key><string>vector</string></map></map>
-   <map><key>vb</key><map><key>type</key><string>vector</string></map></map>
-   <map><key>margin</key><map><key>type</key><string>float</string></map></map>
+   <map><key>a</key><map><key>type</key><string>float</string></map></map>
+   <map><key>b</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
  <key>osApproxEquals</key>
  <map>
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
-   <map><key>va</key><map><key>type</key><string>vector</string></map></map>
-   <map><key>vb</key><map><key>type</key><string>vector</string></map></map>
+   <map><key>a</key><map><key>type</key><string>float</string></map></map>
+   <map><key>b</key><map><key>type</key><string>float</string></map></map>
+   <map><key>margin</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
  <key>osApproxEquals</key>
  <map>
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
-   <map><key>a</key><map><key>type</key><string>float</string></map></map>
-   <map><key>b</key><map><key>type</key><string>float</string></map></map>
-   <map><key>margin</key><map><key>type</key><string>float</string></map></map>
+   <map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
+   <map><key>rb</key><map><key>type</key><string>rotation</string></map></map>
   </array>
  </map>
  <key>osApproxEquals</key>
  <map>
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
-   <map><key>a</key><map><key>type</key><string>float</string></map></map>
-   <map><key>b</key><map><key>type</key><string>float</string></map></map>
+   <map><key>va</key><map><key>type</key><string>vector</string></map></map>
+   <map><key>vb</key><map><key>type</key><string>vector</string></map></map>
+   <map><key>margin</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
  <key>osApproxEquals</key>
@@ -6157,8 +6157,8 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <map>
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
-   <map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
-   <map><key>rb</key><map><key>type</key><string>rotation</string></map></map>
+   <map><key>va</key><map><key>type</key><string>vector</string></map></map>
+   <map><key>vb</key><map><key>type</key><string>vector</string></map></map>
   </array>
  </map>
  <key>osAvatarName2Key</key>
@@ -6186,14 +6186,14 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <key>osCauseDamage</key>
  <map>
   <key>arguments</key><array>
-   <map><key>avatar</key><map><key>type</key><string>string</string></map></map>
+   <map><key>avatar</key><map><key>type</key><string>key</string></map></map>
    <map><key>damage</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
  <key>osCauseHealing</key>
  <map>
   <key>arguments</key><array>
-   <map><key>avatar</key><map><key>type</key><string>string</string></map></map>
+   <map><key>agentId</key><map><key>type</key><string>key</string></map></map>
    <map><key>healing</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
@@ -6284,8 +6284,6 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
   <key>return</key><string>string</string>
   <key>arguments</key><array>
    <map><key>drawList</key><map><key>type</key><string>string</string></map></map>
-   <map><key>startX</key><map><key>type</key><string>integer</string></map></map>
-   <map><key>startY</key><map><key>type</key><string>integer</string></map></map>
    <map><key>endX</key><map><key>type</key><string>integer</string></map></map>
    <map><key>endY</key><map><key>type</key><string>integer</string></map></map>
   </array>
@@ -6295,6 +6293,8 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
   <key>return</key><string>string</string>
   <key>arguments</key><array>
    <map><key>drawList</key><map><key>type</key><string>string</string></map></map>
+   <map><key>startX</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>startY</key><map><key>type</key><string>integer</string></map></map>
    <map><key>endX</key><map><key>type</key><string>integer</string></map></map>
    <map><key>endY</key><map><key>type</key><string>integer</string></map></map>
   </array>
@@ -6539,14 +6539,14 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <map>
   <key>return</key><string>float</string>
   <key>arguments</key><array>
-   <map><key>avatar</key><map><key>type</key><string>string</string></map></map>
+   <map><key>agentId</key><map><key>type</key><string>key</string></map></map>
   </array>
  </map>
  <key>osGetHealth</key>
  <map>
   <key>return</key><string>float</string>
   <key>arguments</key><array>
-   <map><key>avatar</key><map><key>type</key><string>string</string></map></map>
+   <map><key>agentId</key><map><key>type</key><string>key</string></map></map>
   </array>
  </map>
  <key>osGetInertiaData</key>
@@ -6558,9 +6558,28 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <map>
   <key>return</key><string>string</string>
   <key>arguments</key><array>
-   <map><key>item</key><map><key>type</key><string>string</string></map></map>
+   <map><key>itemNameOrId</key><map><key>type</key><string>string</string></map></map>
+  </array>
+ </map>
+ <key>osGetInventoryLastOwner</key>
+ <map>
+  <key>return</key><string>key</string>
+  <key>arguments</key><array>
+   <map><key>itemNameOrId</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
+ <key>osGetInventoryName</key>
+ <map>
+  <key>return</key><string>string</string>
+  <key>arguments</key><array>
+   <map><key>itemId</key><map><key>type</key><string>key</string></map></map>
+  </array>
+ </map>
+ <key>osGetLastChangedEventKey</key>
+ <map>
+  <key>return</key><string>key</string>
+  <key>arguments</key><undef/>
+ </map>
  <key>osGetLinkNumber</key>
  <map>
   <key>return</key><string>integer</string>
@@ -6735,6 +6754,13 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
    <map><key>alert</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
+ <key>osKickAvatar</key>
+ <map>
+  <key>arguments</key><array>
+   <map><key>agentId</key><map><key>type</key><string>key</string></map></map>
+   <map><key>alert</key><map><key>type</key><string>string</string></map></map>
+  </array>
+ </map>
  <key>osLoadedCreationDate</key>
  <map>
   <key>return</key><string>string</string>
@@ -6839,7 +6865,6 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
    <map><key>name</key><map><key>type</key><string>string</string></map></map>
    <map><key>position</key><map><key>type</key><string>vector</string></map></map>
    <map><key>notecard</key><map><key>type</key><string>string</string></map></map>
-   <map><key>options</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
  <key>osNpcCreate</key>
@@ -6850,6 +6875,7 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
    <map><key>name</key><map><key>type</key><string>string</string></map></map>
    <map><key>position</key><map><key>type</key><string>vector</string></map></map>
    <map><key>notecard</key><map><key>type</key><string>string</string></map></map>
+   <map><key>options</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
  <key>osNpcGetOwner</key>
@@ -7089,7 +7115,6 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
    <map><key>seconds</key><map><key>type</key><string>float</string></map></map>
-   <map><key>msg</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
  <key>osRegionRestart</key>
@@ -7097,6 +7122,7 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
   <key>return</key><string>integer</string>
   <key>arguments</key><array>
    <map><key>seconds</key><map><key>type</key><string>float</string></map></map>
+   <map><key>msg</key><map><key>type</key><string>string</string></map></map>
   </array>
  </map>
  <key>osReplaceString</key>
@@ -7199,14 +7225,14 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <key>osSetHealRate</key>
  <map>
   <key>arguments</key><array>
-   <map><key>avatar</key><map><key>type</key><string>string</string></map></map>
+   <map><key>agentId</key><map><key>type</key><string>key</string></map></map>
    <map><key>health</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
  <key>osSetHealth</key>
  <map>
   <key>arguments</key><array>
-   <map><key>avatar</key><map><key>type</key><string>string</string></map></map>
+   <map><key>agentId</key><map><key>type</key><string>key</string></map></map>
    <map><key>health</key><map><key>type</key><string>float</string></map></map>
   </array>
  </map>
@@ -7432,6 +7458,8 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
   <key>arguments</key><array>
    <map><key>src</key><map><key>type</key><string>string</string></map></map>
    <map><key>value</key><map><key>type</key><string>string</string></map></map>
+   <map><key>start</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>count</key><map><key>type</key><string>integer</string></map></map>
    <map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
@@ -7441,8 +7469,6 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
   <key>arguments</key><array>
    <map><key>src</key><map><key>type</key><string>string</string></map></map>
    <map><key>value</key><map><key>type</key><string>string</string></map></map>
-   <map><key>start</key><map><key>type</key><string>integer</string></map></map>
-   <map><key>count</key><map><key>type</key><string>integer</string></map></map>
    <map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
@@ -7528,7 +7554,8 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <map>
   <key>arguments</key><array>
    <map><key>agent</key><map><key>type</key><string>string</string></map></map>
-   <map><key>regionName</key><map><key>type</key><string>string</string></map></map>
+   <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
    <map><key>position</key><map><key>type</key><string>vector</string></map></map>
    <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
   </array>
@@ -7537,8 +7564,6 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <map>
   <key>arguments</key><array>
    <map><key>agent</key><map><key>type</key><string>string</string></map></map>
-   <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
-   <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
    <map><key>position</key><map><key>type</key><string>vector</string></map></map>
    <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
   </array>
@@ -7547,6 +7572,7 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <map>
   <key>arguments</key><array>
    <map><key>agent</key><map><key>type</key><string>string</string></map></map>
+   <map><key>regionName</key><map><key>type</key><string>string</string></map></map>
    <map><key>position</key><map><key>type</key><string>vector</string></map></map>
    <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
   </array>
@@ -7564,8 +7590,6 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <key>osTeleportOwner</key>
  <map>
   <key>arguments</key><array>
-   <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
-   <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
    <map><key>position</key><map><key>type</key><string>vector</string></map></map>
    <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
   </array>
@@ -7581,6 +7605,8 @@ a0b4b514-3c14-6b98-ca98-e18a79e9792f
  <key>osTeleportOwner</key>
  <map>
   <key>arguments</key><array>
+   <map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
    <map><key>position</key><map><key>type</key><string>vector</string></map></map>
    <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
   </array>
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index a96459a..f127b1f 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -155,7 +155,6 @@
   Allow_osForceDropAttachmentAt =   ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetLinkPrimitiveParams =  ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetPhysicsEngineType =    true
-  Allow_osGetPrimitiveParams =      ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetRegionMapTexture =     ${OSSL|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osGetScriptEngineName =     true
   Allow_osGetSimulatorVersion =     true
@@ -185,7 +184,6 @@
   Allow_osParcelSubdivide =         ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegionRestart =           ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegionNotice =            ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osSetPrimitiveParams =      false
   Allow_osSetProjectionParams =     ${OSSL|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetRegionWaterHeight =    ESTATE_MANAGER,ESTATE_OWNER
   Allow_osSetStateEvents =          false   ; deprecated
@@ -250,6 +248,7 @@
 ;  Allow_osGetLinkNumber =           true
 ;  Allow_osGetMapTexture =           true
 ;  Allow_osGetPhysicsEngineName =    true
+;  Allow_osGetPrimitiveParams =      true
 ;  Allow_osGetRegionSize =           true
 ;  Allow_osGetSunParam =             true
 ;  Allow_osGetTerrainHeight =        true
@@ -275,6 +274,7 @@
 ;  Allow_osSetPenCap =               true
 ;  Allow_osSetPenColor =             true
 ;  Allow_osSetPenSize =              true
+;  Allow_osSetPrimitiveParams =      true
 ;  Allow_osSetSoundRadius =          true
 ;  Allow_osStopSound =               true
 ;  Allow_osStringSubString =         true