6 files changed, 43 insertions, 10 deletions

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index cb3a5c8..15ba55a 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -23,6 +23,7 @@
     InventoryAccessModule       = "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
         MapImageService                 = "MapImageServiceModule"
+        SearchModule                    = "BasicSearchModule"
     
     LandServiceInConnector                      = true
     NeighbourServiceInConnector         = true
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index d12ea5b..920a691 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -205,3 +205,12 @@
         ; 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"
\ No newline at end of file
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 31a4059..7edcafb 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -28,6 +28,7 @@
         FriendsModule                   = "HGFriendsModule"
         MapImageService                 = "MapImageServiceModule"
         UserManagementModule    = "HGUserManagementModule"
+        SearchModule                    = "BasicSearchModule"
     
     LandServiceInConnector                      = true
     NeighbourServiceInConnector         = true
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index ba72fe7..d3b9cb4 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -19,6 +19,7 @@
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
     MapImageService                     = "MapImageServiceModule"
+        SearchModule                    = "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f80044e..6b991a8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -85,7 +85,7 @@
     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 +94,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 +115,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.
     ;;
@@ -240,7 +243,7 @@
 ;; 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?
@@ -297,11 +300,11 @@
     ; 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.
@@ -318,7 +321,7 @@
 
 
 [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"
 
@@ -337,7 +340,7 @@
 
 [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"
 
 
@@ -352,3 +355,19 @@
         ;; 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..3abf49b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -19,11 +19,13 @@
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices          = "RemoteSimulationConnectorModule"
     AvatarServices                      = "LocalAvatarServicesConnector"
+    UserProfilesServices    = "LocalUserProfilesServicesConnector"
         MapImageService                 = "MapImageServiceModule"
     EntityTransferModule        = "HGEntityTransferModule"
     InventoryAccessModule       = "HGInventoryAccessModule"
     FriendsModule                       = "HGFriendsModule"
         UserManagementModule    = "HGUserManagementModule"
+        SearchModule                    = "BasicSearchModule"
     
     InventoryServiceInConnector                 = true
     AssetServiceInConnector                             = true
@@ -55,8 +57,6 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
-
     ; For HGInventoryBroker
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
@@ -147,6 +147,9 @@
     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
@@ -183,7 +186,6 @@
         UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
         InGatekeeper = True
 
-
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"