diff options
| author | BlueWall | 2012-09-11 22:58:21 -0400 |
|---|---|---|
| committer | BlueWall | 2012-09-11 22:58:21 -0400 |
| commit | e9322b0bf714251719919db8638bf92f19289190 (patch) | |
| tree | 4eca77cc71f4428e57f0a4c176189e114bfb9397 /bin | |
| parent | Fix prebuild.xml format for reference (diff) | |
| parent | minor: Comment out friends notification log spam for now. (diff) | |
| download | opensim-SC_OLD-e9322b0bf714251719919db8638bf92f19289190.zip opensim-SC_OLD-e9322b0bf714251719919db8638bf92f19289190.tar.gz opensim-SC_OLD-e9322b0bf714251719919db8638bf92f19289190.tar.bz2 opensim-SC_OLD-e9322b0bf714251719919db8638bf92f19289190.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSim.ini.example | 8 | ||||
| -rw-r--r-- | bin/OpenSimDefaults.ini | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index f0ebcce..0de4002 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -108,10 +108,10 @@ | |||
| 108 | ;; This can be overriden in the region config file. | 108 | ;; This can be overriden in the region config file. |
| 109 | ; ClampPrimSize = false | 109 | ; ClampPrimSize = false |
| 110 | 110 | ||
| 111 | ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0 | 111 | ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0 |
| 112 | ;; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. | 112 | ;; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. |
| 113 | ;; This can be overriden in the region config file. | 113 | ;; This can be overriden in the region config file. |
| 114 | ; LinksetPrims = 0 | 114 | ; LinksetPrims = 0 |
| 115 | 115 | ||
| 116 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true | 116 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true |
| 117 | ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. | 117 | ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index c080fbf..0173f5b 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -95,9 +95,9 @@ | |||
| 95 | ; This can be overriden in the region config file. | 95 | ; This can be overriden in the region config file. |
| 96 | ClampPrimSize = false | 96 | ClampPrimSize = false |
| 97 | 97 | ||
| 98 | ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. | 98 | ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. |
| 99 | ; This can be overriden in the region config file. | 99 | ; This can be overriden in the region config file. |
| 100 | LinksetPrims = 0 | 100 | LinksetPrims = 0 |
| 101 | 101 | ||
| 102 | ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. | 102 | ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. |
| 103 | ; This only applies when crossing to a region running in a different simulator. | 103 | ; This only applies when crossing to a region running in a different simulator. |