aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2009-09-14 10:29:28 -0700
committerDiva Canto2009-09-14 10:29:28 -0700
commit69b19a3b85cc18c417500da4acbf07ef21e0a8b4 (patch)
treed98fbb2dfe5f63e7f2dfff4efa4dacc7532036a9 /bin
parentRemoved dependencies that OptionalModules had on IronPython and Puma. They ar... (diff)
parentlabel load and save iar commands as experimental. (diff)
downloadopensim-SC_OLD-69b19a3b85cc18c417500da4acbf07ef21e0a8b4.zip
opensim-SC_OLD-69b19a3b85cc18c417500da4acbf07ef21e0a8b4.tar.gz
opensim-SC_OLD-69b19a3b85cc18c417500da4acbf07ef21e0a8b4.tar.bz2
opensim-SC_OLD-69b19a3b85cc18c417500da4acbf07ef21e0a8b4.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index ff1a773..a255260 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -80,6 +80,11 @@
80 80
81 ; How many prims to send to each avatar in the scene on each Update() 81 ; How many prims to send to each avatar in the scene on each Update()
82 ; MaxPrimsPerFrame = 200 82 ; MaxPrimsPerFrame = 200
83
84 ; Combine all contiguous regions into one large region
85 ; Order your regions from South to North, West to East in your regions.ini and then set this to true
86 ; Warning! Don't use this with regions that have existing content!, This will likely break them
87 CombineContiguousRegions=false
83 88
84 ; ## 89 ; ##
85 ; ## STORAGE 90 ; ## STORAGE