Merge branch 'master' into careminster-presence-refactor

2 files changed, 0 insertions, 6 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1f8fca2..6d5ee14 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -87,9 +87,6 @@
     ; YOU HAVE BEEN WARNED!!!
     TrustBinaries = false
 
-    ; How many prims to send to each avatar in the scene on each Update()
-    ; MaxPrimsPerFrame = 200
-
     ; Combine all contiguous regions into one large region
     ; Order your regions from South to North, West to East in your regions.ini and then set this to true
     ; Warning!  Don't use this with regions that have existing content!, This will likely break them
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 32b240b..52e30e2 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -42,7 +42,6 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    ConnectionString = "URI=file:avatars.db,version=3"
 
 [LibraryService]
         LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -54,7 +53,6 @@
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
         ; LocalGridServicesConnector needs this
@@ -82,7 +80,6 @@
 
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
-    ConnectionString = "URI=file:friends.db,version=3"
 
 [Friends]
     Connector = "OpenSim.Services.FriendsService.dll"