Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 3 insertions, 36 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8d714ce..94d021d 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -848,9 +848,6 @@
     ; Enables selling things for $0
     SellEnabled = "false"
 
-    ; 45000 is the highest value that the sim could possibly report because of protocol constraints
-    ObjectCapacity = 45000
-
     ; Money Unit fee to upload textures, animations etc
     PriceUpload = 0
 
@@ -1228,8 +1225,9 @@
 
 [InterestManagement]
      ; This section controls how state updates are prioritized for each client
-     ; Valid values are Time, Distance, SimpleAngularDistance, and FrontBack
-     UpdatePrioritizationScheme = FrontBack
+     ; Valid values are BestAvatarResponsiveness, Time, Distance,
+     ; SimpleAngularDistance, and FrontBack
+     UpdatePrioritizationScheme = BestAvatarResponsiveness
      ReprioritizationEnabled = true
      ReprioritizationInterval = 2000.0
      RootReprioritizationDistance = 10.0
@@ -1266,34 +1264,3 @@
     ;; default standalone, overridable in StandaloneCommon.ini
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; The following is the configuration section for the new style services
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Architecture]
-    ; Choose exactly one and only one of the architectures below.
-
-    Include-Standalone      = "config-include/Standalone.ini"
-    ;Include-HGStandalone    = "config-include/StandaloneHypergrid.ini"
-    ;Include-Grid            = "config-include/Grid.ini"
-    ;Include-HGGrid          = "config-include/GridHypergrid.ini"
-    ;Include-SimianGrid      = "config-include/SimianGrid.ini"
-    ;Include-HyperSimianGrid = "config-include/HyperSimianGrid.ini"
-
-    ; Then choose
-    ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
-    ; config-include/GridCommon.ini.example (if you're connected to a grid)
-    ; Copy to your own .ini there (without .example extension) and edit it
-    ; to customize your data
-
-
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;; The below pulls in optional module config files
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-[Modules]
-    Include-modules = "addon-modules/*/config/*.ini"
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; ENSURE [Architecture] and [Modules] Sections with their "includes"
-;; are last to allow for overrides
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;