6 files changed, 103 insertions, 59 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 8b77ee9..7db7506 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -927,14 +927,10 @@
 
 [YEngine]
     ;; experimental engine
-    ;; ONLY SUPORTS ONE REGION PER INSTANCE at this point
     ;; implements non preemptive microthreading, so fixing problems like llSleep or long events handlers
     ;; but those will suffer from timeslicing, so will be slower.
-    ;; compiles LSL directly to IL, so only suports LSL scripting (no C# etc) 
-    ;; shares the Xengine APIs like LSL, OSSL, etc.
-    ;; DANGER, do not use with HG, don't leave regions running alone with it.
-    ;; TPs or crossings to/from Xengine will full recompile scripts losing state.
-    ;; attachment scripts may misbehave, cars will stop on crossings, etc.
+    ;; warning: scripts state is lost on TP or cross to Xengine regions (cars stop, etc)
+        ;; ignore its extensions (subset of original XMRengine), those are still undefined.
     Enabled = false
     ScriptStackSize = 256
     ScriptHeapSize = 256
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index cede84d..1332ce8 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -164,15 +164,10 @@
         ; limit the maximum view range ( no effect still (does limit MaxRegionsViewDistance) )
         ;MaxDrawDistance = 512
 
-        ; the maximum distance to tell a viewer to connect to a neighbour region, so it can be seen
-        ; (it is limited by MaxDrawDistance above)
-        ; less than 256 shows immediate neighbours; 256 to 511 also second imediate neighbours etc
-        ; more than 511m can cause viewers problems specially in case of dense regions.
-        ; curretly this distance is from current region borders.
-        ; Warning: if relevant regions have different setting you may notice strange
-    ; effects due to that asymmetry
-    ; *****
+        ; Other regions visibility depends on avatar position and view range
+        ; the view range considered is limited the maximum and minimum distances:
         ;MaxRegionsViewDistance = 255
+        ;MinRegionsViewDistance = 96
 
     ; If you have only one region in an instance, or to avoid the many bugs
     ; that you can trigger in modules by restarting a region, set this to
@@ -454,7 +449,7 @@
         
         ; warp3D rendering height limits for prims (relative to rez position not bounding box)
         ; prims above RenderMaxHeight are excluded
-        ; valid values: 100 t0 4086
+        ; valid values: 100 to 4086
         ;RenderMaxHeight = 4086
         
         ; prims below RenderMinHeight are excluded
@@ -690,23 +685,6 @@
 
 
 [ClientStack.LindenUDP]
-    ; The client socket receive buffer size determines how many
-    ; incoming requests we can process; the default on .NET is 8192
-    ; which is about 2 4k-sized UDP datagrams. On mono this is
-    ; whatever the underlying operating system has as default; for
-    ; example, ubuntu 8.04 or SLES11 have about 111k, which is about
-    ; 27 4k-sized UDP datagrams (on linux platforms you can [as root]
-    ; do "sysctl net.core.rmem_default" to find out what your system
-    ; uses a default socket receive buffer size.
-    ;
-    ; client_socket_rcvbuf_size allows you to specify the receive
-    ; buffer size LLUDPServer should use. NOTE: this will be limited
-    ; by the system's settings for the maximum client receive buffer
-    ; size (on linux systems you can set that with "sysctl -w
-    ; net.core.rmem_max=X")
-    ;
-    ;client_socket_rcvbuf_size = 8388608
-
     ; Maximum outbound bytes per second for a single scene. This can be used to
     ; throttle total outbound UDP traffic for a simulator. The default value is
     ; 0, meaning no throttling at the scene level. The example given here is
@@ -731,8 +709,8 @@
     ; Adaptive throttling attempts to limit network overload when multiple
     ; clients login by starting each connection more slowly. Disabled by
     ; default
-    ;
-    enable_adaptive_throttles = false
+    ; currently disabled
+    ;enable_adaptive_throttles = false
 
     ; Per-client bytes per second rates for the various throttle categories.
     ; These are default values that will be overridden by clients. These
@@ -748,7 +726,7 @@
     ;asset_default = 10500
 
     ; TextureSendLimit determines how many packets will be put on
-    ; the outgoing queue each cycle. Like the settings above, this
+    ; the lludp outgoing queue each cycle. Like the settings above, this
     ; is a balance between responsiveness to priority updates and
     ; total throughput. Higher numbers will give a better
     ; throughput at the cost of reduced responsiveness to client
@@ -776,6 +754,11 @@
     ;
     ;PausedAckTimeout = 300
 
+        ; Support viewers object cache, default true
+        ; users may need to reduce viewer bandwitdh if some prims or terrain parts fail to rez.
+        ; change to false if you need to use old viewers that do not support this feature
+        ;
+        ; SupportViewerObjectsCache = true
 
 [ClientStack.LindenCaps]
     ;; Long list of capabilities taken from
@@ -1729,17 +1712,12 @@
 [Economy]
     ; the economy module in use
     ; default is the provided BetaGridLikeMoneyModule
-    ; - This module is for demonstration only -
     ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
     ; There is no intention to implement anything further in core OpenSimulator.
     ; This functionality has to be provided by third party modules.
-    ; To use other modules you need to override this setting on OpenSim.ini Economy (or startup) section
     ; economymodule = BetaGridLikeMoneyModule
 
-    ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
-    ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
-    ; There is no intention to implement anything further in core OpenSimulator.
-    ; This functionality has to be provided by third party modules.
+    ; Economy values get used in the BetaGridLikeMoneyModule.
 
     ;; Enables selling things for $0.  Default is true.
     ; SellEnabled = true
@@ -1767,6 +1745,14 @@
     ;PriceObjectRent = 0
     ;PriceObjectScaleFactor = 10
     ;PriceParcelRent = 0
+        
+        ; Mesh upload settings, independent of economymodule
+        
+        ; Create inventory entries for textures uploaded with a model
+        ; default is false, ie, do not create
+        ; MeshModelAllowTextureToInventory = true
+        
+
 
 [XEngine]
     ; Enable this engine in this OpenSim instance
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 0f9bb4b..726e468 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -568,6 +568,8 @@
     ;;
     ;; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
+    ;; Allow banning via hashed MAC must be set in both [GatekeeperService] and [LoginService]
+    ;DeniedMacs = "YOURLONGMACTRSING ANOTHERMAC"
 
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
@@ -663,6 +665,8 @@
     ;; Leave blank or commented for no exceptions.
     ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002"
 
+    ;; Allow banning via hashed MAC must be set in both [GatekeeperService] and [LoginService]
+    ;DeniedMacs = "YOURLONGMACTRSING ANOTHERMAC"
 
 [UserAgentService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 3222a94..50986de 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -495,6 +495,8 @@
     ;;
     ;; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
+     ;; Allow banning via hashed MAC
+    ;DeniedMacs = "YOURLONGMACTRSING ANOTHERMAC"
 
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml
index 8f2f6002..2282ada 100644
--- a/bin/ScriptSyntax.xml
+++ b/bin/ScriptSyntax.xml
@@ -1,4 +1,4 @@
-20392e48-fad2-094e-bc5b-cda003a1e940
+24121ec8-c0a3-099d-8d83-64feaa32418c
 <llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
 <key>controls</key>
 <map>
@@ -1513,7 +1513,7 @@
  </map>
  <key>OS_APIVERSION</key><map>
   <key>type</key><string>integer</string>
-  <key>value</key><string>3</string>
+  <key>value</key><string>4</string>
  </map>
  <key>OS_ATTACH_MSG_ALL</key><map>
   <key>type</key><string>integer</string>
@@ -1539,6 +1539,36 @@
   <key>type</key><string>integer</string>
   <key>value</key><string>0x1</string>
  </map>
+ <key>OS_LTPAG_ALGNLV</key><map>
+  <key>type</key><string>integer</string>
+  <key>value</key><string>0x4</string>
+  <key>tooltip</key><string>osLocalTeleportAgent align lookat to velocity</string>
+ </map>
+ <key>OS_LTPAG_FORCEFLY</key><map>
+  <key>type</key><string>integer</string>
+  <key>value</key><string>0x8</string>
+  <key>tooltip</key><string>osLocalTeleportAgent force fly</string>
+ </map>
+ <key>OS_LTPAG_FORCENOFLY</key><map>
+  <key>type</key><string>integer</string>
+  <key>value</key><string>0x16</string>
+  <key>tooltip</key><string>osLocalTeleportAgent force no fly</string>
+ </map>
+ <key>OS_LTPAG_NONE</key><map>
+  <key>type</key><string>integer</string>
+  <key>value</key><string>0x0</string>
+  <key>tooltip</key><string>osLocalTeleportAgent no flags</string>
+ </map>
+ <key>OS_LTPAG_USELOOKAT</key><map>
+  <key>type</key><string>integer</string>
+  <key>value</key><string>0x2</string>
+  <key>tooltip</key><string>osLocalTeleportAgent use lookat</string>
+ </map>
+ <key>OS_LTPAG_USEVEL</key><map>
+  <key>type</key><string>integer</string>
+  <key>value</key><string>0x1</string>
+  <key>tooltip</key><string>osLocalTeleportAgent use velocity</string>
+ </map>
  <key>OS_NPC_CREATOR_OWNED</key><map>
   <key>type</key><string>integer</string>
   <key>value</key><string>0x1</string>
@@ -6122,26 +6152,25 @@
  <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>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>osApproxEquals</key>
  <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>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>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>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>
@@ -6159,6 +6188,7 @@
   <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>
   </array>
  </map>
  <key>osAvatarName2Key</key>
@@ -6653,6 +6683,11 @@
    <map><key>rules</key><map><key>type</key><string>list</string></map></map>
   </array>
  </map>
+ <key>osGetPSTWallclock</key>
+ <map>
+  <key>return</key><string>float</string>
+  <key>arguments</key><undef/>
+ </map>
  <key>osGetRegionMapTexture</key>
  <map>
   <key>return</key><string>key</string>
@@ -6776,6 +6811,16 @@
   <key>return</key><string>string</string>
   <key>arguments</key><undef/>
  </map>
+ <key>osLocalTeleportAgent</key>
+ <map>
+  <key>arguments</key><array>
+   <map><key>agent</key><map><key>type</key><string>key</string></map></map>
+   <map><key>position</key><map><key>type</key><string>vector</string></map></map>
+   <map><key>velocity</key><map><key>type</key><string>vector</string></map></map>
+   <map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
+   <map><key>flags</key><map><key>type</key><string>integer</string></map></map>
+  </array>
+ </map>
  <key>osLoopSound</key>
  <map>
   <key>arguments</key><array>
@@ -6865,6 +6910,7 @@
    <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>
@@ -6875,7 +6921,6 @@
    <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>
@@ -7356,6 +7401,17 @@
  <key>osSetProjectionParams</key>
  <map>
   <key>arguments</key><array>
+   <map><key>linknumber</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>projection</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>texture</key><map><key>type</key><string>key</string></map></map>
+   <map><key>fov</key><map><key>type</key><string>float</string></map></map>
+   <map><key>focus</key><map><key>type</key><string>float</string></map></map>
+   <map><key>amb</key><map><key>type</key><string>float</string></map></map>
+  </array>
+ </map>
+ <key>osSetProjectionParams</key>
+ <map>
+  <key>arguments</key><array>
    <map><key>prim</key><map><key>type</key><string>key</string></map></map>
    <map><key>projection</key><map><key>type</key><string>integer</string></map></map>
    <map><key>texture</key><map><key>type</key><string>key</string></map></map>
@@ -7525,6 +7581,7 @@
   <key>arguments</key><array>
    <map><key>src</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>length</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
  <key>osStringSubString</key>
@@ -7533,7 +7590,6 @@
   <key>arguments</key><array>
    <map><key>src</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>length</key><map><key>type</key><string>integer</string></map></map>
   </array>
  </map>
  <key>osSunGetParam</key>
@@ -7554,8 +7610,7 @@
  <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>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>
@@ -7572,7 +7627,8 @@
  <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>
@@ -7597,7 +7653,8 @@
  <key>osTeleportOwner</key>
  <map>
   <key>arguments</key><array>
-   <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>
@@ -7605,8 +7662,7 @@
  <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>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>
diff --git a/bin/Warp3D.dll b/bin/Warp3D.dll
index 523d67f..055b8bc 100755
--- a/bin/Warp3D.dll
+++ b/bin/Warp3D.dll