Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

7 files changed, 266 insertions, 145 deletions

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index cb3a5c8..69a209a 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -22,13 +22,25 @@
     EntityTransferModule        = "BasicEntityTransferModule"
     InventoryAccessModule       = "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-        MapImageService                 = "MapImageServiceModule"
+    MapImageService                     = "MapImageServiceModule"
+    SearchModule                        = "BasicSearchModule"
     
     LandServiceInConnector                      = true
     NeighbourServiceInConnector         = true
     SimulationServiceInConnector        = true
     LibraryModule                                       = true
 
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.2"
+
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
@@ -40,7 +52,7 @@
     ; for the LocalGridServicesConnector which is used by the Remote one
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
-        NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+    NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
     
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -52,5 +64,6 @@
 
 [MapImageService]
         LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+
         ; in minutes
         RefreshTime = 60
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index d12ea5b..5460c0a 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -26,25 +26,31 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
+    ; PGSQL
+    ; Uncomment these lines if you want to use PGSQL storage
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
+    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
+
 [Hypergrid]
-        ; Uncomment the variables in this section only if you are in
-        ; Hypergrid configuration. Otherwise, ignore.
+    ; Uncomment the variables in this section only if you are in
+    ; Hypergrid configuration. Otherwise, ignore.
 
     ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
-        ;; If this is a standalone world, this is the address of this instance.
-        ;; If this is a grided simulator, this is the address of the external robust server that
-        ;; runs the UserAgentsService.
-        ;; For example http://myworld.com:9000 or http://myworld.com:8002
-        ;; This is a default that can be overwritten in some sections.
-        ; HomeURI = "http://127.0.0.1:9000"
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server that
+    ;; runs the UserAgentsService.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; HomeURI = "http://127.0.0.1:9000"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
-        ;; If this is a standalone world, this is the address of this instance.
-        ;; If this is a grided simulator, this is the address of the external robust server
-        ;; that runs the Gatekeeper service.
-        ;; For example http://myworld.com:9000 or http://myworld.com:8002
-        ;; This is a default that can be overwritten in some sections.
-        ; GatekeeperURI = "http://127.0.0.1:9000"
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server
+    ;; that runs the Gatekeeper service.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -81,10 +87,10 @@
     InventoryServerURI = "http://mygridserver.com:8003"
 
 [GridInfo]
-   ;
-   ; Change this to your grid info service
-   ;
-   GridInfoURI = "http://mygridserver.com:8002"
+    ;
+    ; Change this to your grid info service
+    ;
+    GridInfoURI = "http://mygridserver.com:8002"
 
 [GridService]
     ;
@@ -157,9 +163,9 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
-        ;; 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
+    ;; 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
 
 
 [HGAssetService]
@@ -171,14 +177,14 @@
     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:
+    ;; 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"
 
@@ -197,11 +203,19 @@
         MapImageServerURI = "http://mygridserver.com:8003"
 
 [AuthorizationService]
-        ; If you have regions with access restrictions
-        ; specify them here using the convention
-        ; Region_<Region_Name> = <flags>
-        ; Valid flags are:
-        ; DisallowForeigners -- HG visitors not allowed
-        ; DisallowResidents -- only Admins and Managers allowed
-        ; Example:
-        ; Region_Test_1 = "DisallowForeigners"
+  ; If you have regions with access restrictions
+    ; specify them here using the convention
+    ; Region_<Region_Name> = <flags>
+    ; Valid flags are:
+    ; DisallowForeigners -- HG visitors not allowed
+    ; DisallowResidents -- only Admins and Managers allowed
+    ; Example:
+    ; Region_Test_1 = "DisallowForeigners"
+
+;; Uncomment if you are using SimianGrid for grid services
+[SimianGrid]
+    ;; SimianGrid services URL
+    ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
+
+    ;; Capability assigned by the grid administrator for the simulator
+    ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 31a4059..2a66b4c 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -25,15 +25,27 @@
     EntityTransferModule        = "HGEntityTransferModule"
     InventoryAccessModule       = "HGInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-        FriendsModule                   = "HGFriendsModule"
-        MapImageService                 = "MapImageServiceModule"
-        UserManagementModule    = "HGUserManagementModule"
+    FriendsModule                       = "HGFriendsModule"
+    MapImageService                     = "MapImageServiceModule"
+    UserManagementModule        = "HGUserManagementModule"
+    SearchModule                        = "BasicSearchModule"
     
     LandServiceInConnector                      = true
     NeighbourServiceInConnector         = true
     SimulationServiceInConnector        = true
     LibraryModule                                       = true
 
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.2"
+
 [Profile]
     Module = "BasicProfileModule"
 
@@ -61,7 +73,7 @@
     ; Needed to display non-default map tile images for linked regions
     AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
 
-        HypergridLinker = true
+    HypergridLinker = true
     AllowHypergridMapSearch = true
 
 [LibraryService]
@@ -77,12 +89,13 @@
     LureModule = HGLureModule
 
 [HGInstantMessageService]
-        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-        GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
-        PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
-        UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+    PresenceService     = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+    UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
 
 [MapImageService]
-        LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-        ; in minutes
-        RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+
+    ; in minutes
+    RefreshTime = 60
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 99a589c..f561dd5 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -91,6 +91,7 @@
     ; accessible from other grids
     ;
     ProfileServerURI = "http://mygridserver.com:8002/user"
-        ;; 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
+
+    ;; 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
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index ba72fe7..424d8c8 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -19,12 +19,24 @@
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
     MapImageService                     = "MapImageServiceModule"
+    SearchModule                        = "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
     GridInfoServiceInConnector = true
     MapImageServiceInConnector = true
 
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.2"
+
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
@@ -105,9 +117,10 @@
     DSTZone = "America/Los_Angeles;Pacific Standard Time"
 
 [MapImageService]
-        LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-        ; in minutes
-        RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+
+    ; in minutes
+    RefreshTime = 60
 
 ;; This should always be the very last thing on this file
 [Includes]
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f80044e..a368bb8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -27,26 +27,31 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
+    ; PGSQL
+    ; Uncomment these lines if you want to use PGSQL storage
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
+    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
+
 [Hypergrid]
-        ; Uncomment the variables in this section only if you are in
-        ; Hypergrid configuration. Otherwise, ignore.
+    ; Uncomment the variables in this section only if you are in
+    ; Hypergrid configuration. Otherwise, ignore.
 
     ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
-        ;; If this is a standalone world, this is the address of this instance.
-        ;; If this is a grided simulator, this is the address of the external robust server that
-        ;; runs the UserAgentsService.
-        ;; For example http://myworld.com:9000 or http://myworld.com:8002
-        ;; This is a default that can be overwritten in some sections.
-        ; HomeURI = "http://127.0.0.1:9000"
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server that
+    ;; runs the UserAgentsService.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; HomeURI = "http://127.0.0.1:9000"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
-        ;; If this is a standalone world, this is the address of this instance.
-        ;; If this is a grided simulator, this is the address of the external robust server
-        ;; that runs the Gatekeeper service.
-        ;; For example http://myworld.com:9000 or http://myworld.com:8002
-        ;; This is a default that can be overwritten in some sections.
-        ; GatekeeperURI = "http://127.0.0.1:9000"
-
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server
+    ;; that runs the Gatekeeper service.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -81,11 +86,27 @@
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
+    ;;  
+    ;; DefaultRegion    If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.)
+    ;;                  then this region becomes the destination.  Only the first online default region will be used.  If no DefaultHGRegion
+    ;;                  is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified
+    ;;                  an explicit region.
+    ;;  
+    ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
+    ;;                  region will be used.
+    ;;  
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
+    ;;  
+    ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
+    ;;  
+    ;; Persistent       When the simulator is shutdown, the region is signalled as offline but left registered on the grid.
+    ;;
     ;; For example:
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
     ; === HG ONLY ===
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI="http://127.0.0.1:9000"
 
 [LibraryModule]
@@ -94,7 +115,7 @@
 
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
-        ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
+    ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "http://127.0.0.1:9000"
 
     SRV_HomeURI = "http://127.0.0.1:9000"    
@@ -115,6 +136,9 @@
     ;; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
+    ;; Set minimum fee to publish classified
+    ; ClassifiedFee = 0
+
     ;; Regular expressions for controlling which client versions are accepted/denied.
     ;; An empty string means nothing is checked.
     ;;
@@ -132,6 +156,23 @@
     ;AllowedClients = ""
     ;DeniedClients = ""
 
+    ; Basic Login Service Dos Protection Tweaks
+    ; ;
+    ; ; Some Grids/Users use a transparent proxy that makes use of the X-Forwarded-For HTTP Header, If you do, set this to true
+    ; ; If you set this to true and you don't have a transparent proxy, it may allow attackers to put random things in the X-Forwarded-For header to
+    ; ;     get around this basic DOS protection.
+    ; DOSAllowXForwardedForHeader = false
+    ; ;
+    ; ; The protector adds up requests during this rolling period of time, default 10 seconds
+    ; DOSRequestTimeFrameMS = 10000
+    ; ;
+    ; ; The amount of requests in the above timeframe from the same endpoint that triggers protection
+    ; DOSMaxRequestsInTimeFrame = 5
+    ; ;
+    ; ; The amount of time that a specific endpoint is blocked.    Default 2 minutes.
+    ; DOSForgiveClientAfterMS = 120000
+    ; ; 
+    ; ; To turn off basic dos protection, set the DOSMaxRequestsInTimeFrame to 0.
 
 [FreeswitchService]
     ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
@@ -240,27 +281,27 @@
 ;; HG configurations
 ;;
 [GatekeeperService]
-        ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
+        ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
     ; 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.
-        ;;
-        ;;
+    ;; 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 = ""
 
@@ -283,7 +324,7 @@
     ;; 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)
+    ;; (the default is true)
     ;; For example:
     ; ForeignTripsAllowed_Level_0 = false
     ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it
@@ -291,45 +332,45 @@
     ;; 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]
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; 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:
+    ;; 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]
-        ;; If you have these set under [Startup], no need to set it here, leave it commented
+    ;; If you have these set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
-        ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; GatekeeperURI = "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.
+    ;; 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
+    ;; 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
@@ -337,18 +378,32 @@
 
 [Messaging]
     ; === HG ONLY ===
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "http://127.0.0.1:9000"
 
 
 [EntityTransfer]
-        ;; User level from which local users are allowed to HG teleport. Default 0 (all users)
-        ;LevelHGTeleport = 0
+    ;; 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
+    ;; 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
+    ;; If appearance is restricted, which accounts' appearances are allowed to be exported?
+    ;; Comma-separated list of account names
     AccountForAppearance = "Test User, Astronaut Smith"
+
+;; UserProfiles Service
+;;
+;; To use, set Enabled to true then configure for your site...
+[UserProfilesService]
+    LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
+    Enabled = false
+
+    ;; Configure this for separate databse
+    ; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
+    ; Realm = UserProfiles
+
+    UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
+    AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 195e780..370ab90 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -5,7 +5,7 @@
 ;;
 
 [Startup]
-        WorldMapModule = "HGWorldMap"
+    WorldMapModule = "HGWorldMap"
 
 [Modules]
     AssetServices                       = "HGAssetBroker"
@@ -19,11 +19,13 @@
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices          = "RemoteSimulationConnectorModule"
     AvatarServices                      = "LocalAvatarServicesConnector"
-        MapImageService                 = "MapImageServiceModule"
+    UserProfilesServices    = "LocalUserProfilesServicesConnector"
+    MapImageService                     = "MapImageServiceModule"
     EntityTransferModule        = "HGEntityTransferModule"
     InventoryAccessModule       = "HGInventoryAccessModule"
     FriendsModule                       = "HGFriendsModule"
-        UserManagementModule    = "HGUserManagementModule"
+    UserManagementModule        = "HGUserManagementModule"
+    SearchModule                        = "BasicSearchModule"
     
     InventoryServiceInConnector                 = true
     AssetServiceInConnector                             = true
@@ -31,11 +33,21 @@
     NeighbourServiceInConnector                 = true
     LibraryModule                                               = true
     LLLoginServiceInConnector                   = true
-        GridInfoServiceInConnector                      = true
+    GridInfoServiceInConnector                  = true
     AuthenticationServiceInConnector    = true
     SimulationServiceInConnector                = true
-        MapImageServiceInConnector                      = true
-
+    MapImageServiceInConnector                  = true
+
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.2"
 
 [Messaging]
     MessageTransferModule = HGMessageTransferModule
@@ -55,8 +67,6 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
-
     ; For HGInventoryBroker
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
@@ -64,9 +74,9 @@
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
 
 [LibraryService]
-        LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
-        LibraryName = "OpenSim Library"
-        DefaultLibrary = "./inventory/Libraries.xml"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
+    LibraryName = "OpenSim Library"
+    DefaultLibrary = "./inventory/Libraries.xml"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -113,7 +123,7 @@
     LocalServiceModule          = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService          = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     GridUserService                     = "OpenSim.Services.UserAccountService.dll:GridUserService"
-        UserAgentService                = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    UserAgentService            = "OpenSim.Services.HypergridService.dll:UserAgentService"
     AuthenticationService       = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     InventoryService            = "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService                     = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -122,9 +132,9 @@
     FriendsService                      = "OpenSim.Services.FriendsService.dll:FriendsService"
    
 [MapImageService]
-        LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-        ; in minutes
-        RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+    ; in minutes
+    RefreshTime = 60
 
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -138,8 +148,8 @@
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
 
 [UserAgentService]
-        LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
-        ;; for the service
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    ;; for the service
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
@@ -147,16 +157,19 @@
     FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
+    ;; 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
+
         
 ;; The interface that local users get when they are in other grids
 ;; This greatly restricts the inventory operations while in other grids
 [HGInventoryService]
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
-        ;; alternatives:
-        ;;  HG1.5, more permissive, not recommended, but still supported
+    ;; 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
+    ;;  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"
@@ -169,20 +182,19 @@
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
 [HGFriendsService]
-        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
-        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
-        FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
-        UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-        GridService = "OpenSim.Services.GridService.dll:GridService"
-        PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [HGInstantMessageService]
-        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-        GridService = "OpenSim.Services.GridService.dll:GridService"
-        PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
-        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
-        InGatekeeper = True
-
+    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    GridService = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    InGatekeeper = True
 
 ;; This should always be the very last thing on this file
 [Includes]