13 files changed, 164 insertions, 110 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c7df7bb..e591a69 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -443,9 +443,30 @@
     ;; What is reported as the "User-Agent" when using llHTTPRequest
     ;; Defaults to not sent if not set here. See the notes section in the wiki
     ;; at http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
-    ;; " (Mozilla Compatible)" to the text where there are problems with a web server
+    ;; " (Mozilla Compatible)" to the text where there are problems with a 
+    ;; web server
     ; user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+[XMLRPC]
+    ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
+    ;; If enabled and set to XmlRpcRouterModule, this will post an event, 
+    ;; "xmlrpc_uri(string)" to the script concurrently with the first 
+    ;; remote_data event. This will contain the fully qualified URI an 
+    ;; external site needs to use to send XMLRPC requests to that script
+    ;;
+    ;; If enabled and set to XmlRpcGridRouterModule, newly created channels
+    ;; will be registered with an external service via a configured uri
+    ;XmlRpcRouterModule = "XmlRpcRouterModule"
+
+    ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
+    ;XmlRpcPort = 20800
+
+    ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} http://example.com
+    ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
+    ;; will use this address to register xmlrpc channels on the external
+    ;; service 
+    ; XmlRpcHubURI = http://example.com
+
 
 [ClientStack.LindenUDP]
     ;; See OpensSimDefaults.ini for the throttle options. You can copy the
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index dffc0ac..8a451ec 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -57,9 +57,6 @@
     ; ## CLIENTS
     ; ##
 
-    ; Enables EventQueueGet Service.
-    EventQueue = true
-
     ; Set this to the DLL containing the client stack to use.
     clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
 
@@ -371,6 +368,12 @@
     ; alert_uri = "http://myappserver.net/my_handler/"
 
 
+[EstateManagement]
+    ; If false, then block any region restart requests from the client even if they are otherwise valid.
+    ; Default is true
+    AllowRegionRestartFromClient = true
+
+
 [SMTP]
     enabled = false
 
@@ -432,20 +435,6 @@
     ; many simultaneous requests, default is 30 and is currently applied only to assets
     ;MaxRequestConcurrency = 30
 
-[XMLRPC]
-    ; ##
-    ; ## Scripting XMLRPC mapper
-    ; ##
-
-    ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
-    ; script concurrently with the first remote_data event.
-    ; This will contain the fully qualified URI an external site needs
-    ; to use to send XMLRPC requests to that script
-
-    ;XmlRpcRouterModule = "XmlRpcRouterModule"
-    ;XmlRpcPort = 20800
-
-
 [ClientStack.LindenUDP]
     ; Set this to true to process incoming packets asynchronously. Networking is
     ; already separated from packet handling with a queue, so this will only
@@ -930,7 +919,8 @@
     AvatarFriction = 0.2
     AvatarRestitution = 0.0
     AvatarDensity = 60.0
-    AvatarCapsuleRadius = 0.37
+    AvatarCapsuleWidth = 0.6
+    AvatarCapsuleDepth = 0.45
     AvatarCapsuleHeight = 1.5
     AvatarContactProcessingThreshold = 0.1
 
@@ -1421,16 +1411,6 @@
     ; DeleteScriptsOnStartup = false
 
 
-[OpenGridProtocol]
-    ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
-    ;On/true or Off/false
-    ogp_enabled=false
-
-    ;Name Prefix/suffix when using OGP
-    ogp_firstname_prefix=""
-    ogp_lastname_suffix="_EXTERNAL"
-
-
 [Concierge]
     ; Enable concierge module
     ; Default is false
@@ -1612,8 +1592,7 @@
 
     ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets.
     ; This reduces data churn
-    ; This setting is currently experimental and defaults to false.
-    RecycleBaseUDPPackets = false;
+    RecycleBaseUDPPackets = true
 
 
 [InterestManagement]
@@ -1687,5 +1666,12 @@ Enabled = False
         ;; default is module is disabled at the top level
         AutoBackupModuleEnabled = false
 
+[Sounds]
+        ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
+        Module = OpenSim.Region.CoreModules.dll:SoundModule
+
+        ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
+        MaxDistance = 100.0
+
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index bdb25b6..1d4a8e8 100755
--- a/bin/Prebuild.exe
+++ b/bin/Prebuild.exe
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index e8d6846..55b6f90 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -497,8 +497,15 @@ ConfigDirectory = "/home/opensim/etc/Configs"
 ; * 
 [HGInventoryService]
     ; For the InventoryServiceInConnector
-    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+    LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
+        ;; alternatives:
+        ;;  HG1.5, more permissive, not recommended, but still supported
+    ;LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+        ;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
+    ;LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
+
         UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
         HomeURI = "http://127.0.0.1:8002"
 
 ; * The interface that local users get when they are in other grids.
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index fbe4a51..8ec6d75 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -90,7 +90,19 @@ ConfigDirectory = "/home/opensim/etc/Configs"
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "./assets/AssetSets.xml"
-    AllowRemoteDelete = "false"
+
+    ; Allow maptile assets to remotely deleted by remote calls to the asset service.
+    ; There is no harm in having this as false - it just means that historical maptile assets are not deleted.
+    ; This only applies to maptiles served via the version 1 viewer mechanisms
+    ; Default is false
+    AllowRemoteDelete = false
+
+    ; Allow all assets to be remotely deleted.
+    ; Only set this to true if you are operating a grid where you control all calls to the asset service
+    ; (where a necessary condition is that you control all simulators) and you need this for admin purposes.
+    ; If set to true, AllowRemoteDelete = true is required as well.
+    ; Default is false.
+    AllowRemoteDeleteAllTypes = false
 
 ; * This configuration loads the inventory server modules. It duplicates
 ; * the function of the legacy inventory server
diff --git a/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml b/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
index 7498ae0..b570c55 100644
--- a/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
+++ b/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
@@ -303,37 +303,37 @@
     <Key Name="fileName" Value="snd_TerrainStone.ogg" />
   </Section>
   <Section Name="snd_TerrainMetal">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807201c9a66" />
     <Key Name="name" Value="snd_TerrainMetal" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainMetal.ogg" />
   </Section>
   <Section Name="snd_TerrainGlass">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807202c9a66" />
     <Key Name="name" Value="snd_TerrainGlass" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainGlass.ogg" />
   </Section>
   <Section Name="snd_TerrainWood">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807203c9a66" />
     <Key Name="name" Value="snd_TerrainWood" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainWood.ogg" />
   </Section>
   <Section Name="snd_TerrainFlesh">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807204c9a66" />
     <Key Name="name" Value="snd_TerrainFlesh" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainFlesh.ogg" />
   </Section>
   <Section Name="snd_TerrainPlastic">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807205c9a66" />
     <Key Name="name" Value="snd_TerrainPlastic" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainPlastic.ogg" />
   </Section>
   <Section Name="snd_TerrainRubber">
-    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807200c9a66" />
+    <Key Name="assetID" Value="be7295c0-a158-11e1-b3dd-0807206c9a66" />
     <Key Name="name" Value="snd_TerrainRubber" />
     <Key Name="assetType" Value="1" />
     <Key Name="fileName" Value="snd_TerrainRubber.ogg" />
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 84de0ec..f28de43 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -47,36 +47,6 @@
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
-[HGInventoryService]
-    HomeURI = "http://127.0.0.1:9000"
-
-[HGAssetService]
-    HomeURI = "http://127.0.0.1:9000"
-
-    ;; 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 
-        ;;
-        ;; 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 
-        ;; of scripts, like so:
-    ; DisallowExport ="LSLText"
-    ; DisallowImport ="LSLBytecode"
-
-
-[HGInventoryAccessModule]
-    HomeURI = "http://127.0.0.1:9000"
-        Gatekeeper = "http://127.0.0.1:9000"
-
-    ;; If you want to protect your assets from being copied by foreign visitors
-    ;; uncomment the next line. You may want to do this on sims that have licensed content.
-    ; OutboundPermission = False
-
-[HGFriendsModule]
-    ; User level required to be able to send friendship invitations to foreign users
-    ;LevelHGFriends = 0;
 
 [GridService]
     ;; For in-memory region storage (default)
@@ -97,11 +67,6 @@
     ;; change this to the address of your simulator
     Gatekeeper="http://127.0.0.1:9000"
 
-[Messaging]
-    ; === HG ONLY ===
-    ;; change this to the address of your simulator
-    Gatekeeper = "http://127.0.0.1:9000"
-
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
     ;LibraryName = "My World's Library"
@@ -140,41 +105,6 @@
     ;AllowedClients = ""
     ;DeniedClients = ""
 
-[GatekeeperService]
-    ExternalName = "http://127.0.0.1:9000"
-
-    ; Does this grid allow incoming links to any region in it?
-    ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
-    AllowTeleportsToAnyRegion = true
-
-        ;; Regular expressions for controlling which client versions are accepted/denied.
-        ;; An empty string means nothing is checked.
-        ;;
-        ;; Example 1: allow only these 3 types of clients (any version of them)
-        ;; AllowedClients = "Imprudence|Hippo|Second Life"
-        ;;
-        ;; Example 2: allow all clients except these
-        ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
-        ;;
-        ;; Note that these are regular expressions, so every character counts.
-        ;; Also note that this is very weak security and should not be trusted as a reliable means
-        ;; for keeping bad clients out; modified clients can fake their identifiers.
-        ;;
-        ;;
-    ;AllowedClients = ""
-    ;DeniedClients = ""
-
-    ;; Are foreign visitors allowed?
-    ;ForeignAgentsAllowed = true
-    ;;
-    ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept.
-    ;; Leave blank or commented for no exceptions.
-    ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002"
-    ;;
-    ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept
-    ;; Leave blank or commented for no exceptions.
-    ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002"
-
 
 [FreeswitchService]
     ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
@@ -279,6 +209,44 @@
         ; Example:
         ; Region_Test_1 = "DisallowForeigners"
 
+;;
+;; HG configurations
+;;
+[GatekeeperService]
+    ExternalName = "http://127.0.0.1:9000"
+
+    ; Does this grid allow incoming links to any region in it?
+    ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
+    AllowTeleportsToAnyRegion = true
+
+        ;; Regular expressions for controlling which client versions are accepted/denied.
+        ;; An empty string means nothing is checked.
+        ;;
+        ;; Example 1: allow only these 3 types of clients (any version of them)
+        ;; AllowedClients = "Imprudence|Hippo|Second Life"
+        ;;
+        ;; Example 2: allow all clients except these
+        ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+        ;;
+        ;; Note that these are regular expressions, so every character counts.
+        ;; Also note that this is very weak security and should not be trusted as a reliable means
+        ;; for keeping bad clients out; modified clients can fake their identifiers.
+        ;;
+        ;;
+    ;AllowedClients = ""
+    ;DeniedClients = ""
+
+    ;; Are foreign visitors allowed?
+    ;ForeignAgentsAllowed = true
+    ;;
+    ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept.
+    ;; Leave blank or commented for no exceptions.
+    ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002"
+    ;;
+    ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept
+    ;; Leave blank or commented for no exceptions.
+    ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002"
+
 [UserAgentService]
     ;; User level required to be contacted from other grids
     ;LevelOutsideContacts = 0
@@ -299,3 +267,57 @@
     ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept.
     ;; Leave blank or commented for no exceptions.
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
+
+[HGInventoryService]
+    HomeURI = "http://127.0.0.1:9000"
+
+[HGAssetService]
+    HomeURI = "http://127.0.0.1:9000"
+
+    ;; 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 
+        ;;
+        ;; 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 
+        ;; of scripts, like so:
+    ; DisallowExport ="LSLText"
+    ; DisallowImport ="LSLBytecode"
+
+
+[HGInventoryAccessModule]
+    HomeURI = "http://127.0.0.1:9000"
+        Gatekeeper = "http://127.0.0.1:9000"
+
+    ;; If you want to protect your assets from being copied by foreign visitors
+    ;; uncomment the next line. You may want to do this on sims that have licensed content.
+        ;; true = allow exports, false = disallow exports. True by default.
+    ; OutboundPermission = True
+
+        ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+        ;; and available when they return. True by default.
+        ;RestrictInventoryAccessAbroad = True
+
+[HGFriendsModule]
+    ; User level required to be able to send friendship invitations to foreign users
+    ;LevelHGFriends = 0;
+
+[Messaging]
+    ; === HG ONLY ===
+    ;; change this to the address of your simulator
+    Gatekeeper = "http://127.0.0.1:9000"
+
+
+[EntityTransfer]
+        ;; User level from which local users are allowed to HG teleport. Default 0 (all users)
+        ;LevelHGTeleport = 0
+
+        ;; Are local users restricted from taking their appearance abroad?
+        ;; Default is no restrictions
+    ;RestrictAppearanceAbroad = false
+
+        ;; If appearance is restricted, which accounts' appearances are allowed to be exported?
+        ;; Comma-separated list of account names
+    AccountForAppearance = "Test User, Astronaut Smith"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 76d588c..195e780 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -152,7 +152,13 @@
 ;; This greatly restricts the inventory operations while in other grids
 [HGInventoryService]
     ; For the InventoryServiceInConnector
-    LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+    LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
+        ;; alternatives:
+        ;;  HG1.5, more permissive, not recommended, but still supported
+    ;LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+        ;;  HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
+    ;LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
+
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index f976efe..2ae1c75 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index a00bc3a..d4852a5 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index acaa9c8..77cf7e3 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 996ea21..4ec62b2 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib
index 18ca868..91f7264 100755
--- a/bin/lib64/libopenjpeg-dotnet.dylib
+++ b/bin/lib64/libopenjpeg-dotnet.dylib