Merge master into teravuswork

5 files changed, 153 insertions, 59 deletions

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index b9c6d84..ad74fc1 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -54,10 +54,3 @@
 
     ; Warning level for cache directory size
     ;CacheWarnAt = 30000
-
-    ; Perform a deep scan of all assets within all regions, looking for all assets
-    ; present or referenced.  Mark all assets found that are already present in the
-    ; cache, and request all assets that are found that are not already cached (this
-    ; will cause those assets to be cached)
-    ;
-    DeepScanBeforePurge = true
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 8d7f6fc..79f7ed6 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -137,6 +137,26 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
+[HGAssetService]
+    ;
+    ; === HG ONLY ===
+    ; Change this to your server 
+    ; accessible from other grids
+    ;
+    HomeURI = "http://mygridserver.com:8002"
+
+    ;; 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"
+
 [HGFriendsModule]
     ; User level required to be able to send friendship invitations to foreign users
     ;LevelHGFriends = 0;
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index e4bc548..f28de43 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -47,23 +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"
-
-[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)
@@ -84,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"
@@ -127,32 +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
 
 [FreeswitchService]
     ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
@@ -257,6 +209,115 @@
         ; 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
+    ;; User level required to be contacted from other grids
     ;LevelOutsideContacts = 0
+
+    ;; Restrictions on destinations of local users.
+    ;; Are local users allowed to visit other grids?
+    ;; What user level? Use variables of this forrm:
+    ;; ForeignTripsAllowed_Level_<UserLevel> = true | false
+        ;; (the default is true)
+    ;; For example:
+    ; ForeignTripsAllowed_Level_0 = false
+    ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it
+    ;;
+    ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept
+    ;; Leave blank or commented for no exceptions.
+    ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002"
+        ;;
+    ;; 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 75c4788..195e780 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -36,8 +36,6 @@
     SimulationServiceInConnector                = true
         MapImageServiceInConnector                      = true
 
-[Profile]
-    Module = "BasicProfileModule"
 
 [Messaging]
     MessageTransferModule = HGMessageTransferModule
@@ -97,6 +95,10 @@
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
+    CreateDefaultAvatarEntries = true
 
 [GridUserService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
@@ -128,6 +130,7 @@
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     ;; for the service
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
@@ -149,8 +152,15 @@
 ;; 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"
 
 ;; The interface that local users get when they are in other grids
 ;; This restricts/filters the asset operations from the outside
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index c1de71a..67d98ff 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -7,6 +7,16 @@
 [AssetService]
     ConnectionString = "URI=file:Asset.db,version=3"
 
+; The HGAssetService section controls the connection given to the AssetService in a Hypergrid configuration.
+; This has to be separate from [AssetService] because the Hypergrid facing connector uses [HGAssetService] for its config data instead.
+; However, the internal asset service will still use the [AssetService] section.
+; Therefore, you will almost certainly want the ConnectionString in [HGAssetService] to be the same as in [AssetService] 
+; so that they both access the same database.
+; This issue does not apply to normal MySQL/MSSQL configurations, since by default they use the settings in [DatabaseService] and
+; do not have separate connection strings for different services.
+[HGAssetService]
+    ConnectionString = "URI=file:Asset.db,version=3"
+
 [InventoryService]
     ;ConnectionString = "URI=file:inventory.db,version=3"
     ; if you have a legacy inventory store use the connection string below