aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-15 23:03:02 +0100
committerJustin Clark-Casey (justincc)2010-09-15 23:03:02 +0100
commite6bc77d832812ed1e51ee643638c680f520b25d0 (patch)
treefb295d46ba4c11a8e15e077974c03906569c5295 /bin/OpenSimDefaults.ini
parentrename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co... (diff)
parentMark up OpenSim.ini.example for use with an automatic configuration tool. (diff)
downloadopensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.zip
opensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.gz
opensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.bz2
opensim-SC_OLD-e6bc77d832812ed1e51ee643638c680f520b25d0.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini39
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 @@
848 ; Enables selling things for $0 848 ; Enables selling things for $0
849 SellEnabled = "false" 849 SellEnabled = "false"
850 850
851 ; 45000 is the highest value that the sim could possibly report because of protocol constraints
852 ObjectCapacity = 45000
853
854 ; Money Unit fee to upload textures, animations etc 851 ; Money Unit fee to upload textures, animations etc
855 PriceUpload = 0 852 PriceUpload = 0
856 853
@@ -1228,8 +1225,9 @@
1228 1225
1229[InterestManagement] 1226[InterestManagement]
1230 ; This section controls how state updates are prioritized for each client 1227 ; This section controls how state updates are prioritized for each client
1231 ; Valid values are Time, Distance, SimpleAngularDistance, and FrontBack 1228 ; Valid values are BestAvatarResponsiveness, Time, Distance,
1232 UpdatePrioritizationScheme = FrontBack 1229 ; SimpleAngularDistance, and FrontBack
1230 UpdatePrioritizationScheme = BestAvatarResponsiveness
1233 ReprioritizationEnabled = true 1231 ReprioritizationEnabled = true
1234 ReprioritizationInterval = 2000.0 1232 ReprioritizationInterval = 2000.0
1235 RootReprioritizationDistance = 10.0 1233 RootReprioritizationDistance = 10.0
@@ -1266,34 +1264,3 @@
1266 ;; default standalone, overridable in StandaloneCommon.ini 1264 ;; default standalone, overridable in StandaloneCommon.ini
1267 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 1265 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
1268 1266
1269 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1270 ;; The following is the configuration section for the new style services
1271 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1272[Architecture]
1273 ; Choose exactly one and only one of the architectures below.
1274
1275 Include-Standalone = "config-include/Standalone.ini"
1276 ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini"
1277 ;Include-Grid = "config-include/Grid.ini"
1278 ;Include-HGGrid = "config-include/GridHypergrid.ini"
1279 ;Include-SimianGrid = "config-include/SimianGrid.ini"
1280 ;Include-HyperSimianGrid = "config-include/HyperSimianGrid.ini"
1281
1282 ; Then choose
1283 ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
1284 ; config-include/GridCommon.ini.example (if you're connected to a grid)
1285 ; Copy to your own .ini there (without .example extension) and edit it
1286 ; to customize your data
1287
1288
1289 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1290 ;; The below pulls in optional module config files
1291 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1292[Modules]
1293 Include-modules = "addon-modules/*/config/*.ini"
1294
1295
1296;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1297;; ENSURE [Architecture] and [Modules] Sections with their "includes"
1298;; are last to allow for overrides
1299;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;