aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2011-10-11 23:01:52 +0100
committerMelanie2011-10-11 23:01:52 +0100
commit5536cdf90ce17987ad5447187ebdd00af231ea75 (patch)
treea0ad547ffb9d4517ee62258d682504124b861dda /bin
parentMerge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge (diff)
parentAdded a setting to [Startup] section of config that will allow the simulator ... (diff)
downloadopensim-SC_OLD-5536cdf90ce17987ad5447187ebdd00af231ea75.zip
opensim-SC_OLD-5536cdf90ce17987ad5447187ebdd00af231ea75.tar.gz
opensim-SC_OLD-5536cdf90ce17987ad5447187ebdd00af231ea75.tar.bz2
opensim-SC_OLD-5536cdf90ce17987ad5447187ebdd00af231ea75.tar.xz
Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge
Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example5
-rw-r--r--bin/OpenSimDefaults.ini4
2 files changed, 9 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 57a2e06..ce86d56 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -71,6 +71,11 @@
71 ;; in a <Regions> tag. 71 ;; in a <Regions> tag.
72 ; regionload_webserver_url = "http://example.com/regions.xml"; 72 ; regionload_webserver_url = "http://example.com/regions.xml";
73 73
74 ;# {allow_regionless} {} {Allow simulator to start up with no regions configured.} {true false} false
75 ;; Allow the simulator to start up if there are no region configuration available
76 ;; from the selected region_info_source.
77 ; allow_regionless = false
78
74 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 79 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
75 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). 80 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
76 ; NonPhysicalPrimMax = 256 81 ; NonPhysicalPrimMax = 256
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index f5d7f4a..a456f4d 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -70,6 +70,10 @@
70 ; except that everything is also enclosed in a <Regions> tag. 70 ; except that everything is also enclosed in a <Regions> tag.
71 ; regionload_webserver_url = "http://example.com/regions.xml"; 71 ; regionload_webserver_url = "http://example.com/regions.xml";
72 72
73 ;; Allow the simulator to start up if there are no region configuration available
74 ;; from the selected region_info_source.
75 allow_regionless = false
76
73 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). 77 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
74 NonPhysicalPrimMax = 256 78 NonPhysicalPrimMax = 256
75 79