diff options
| author | Melanie | 2010-08-06 18:08:40 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-06 18:08:40 +0100 |
| commit | 26387252f5adbf71dc77084ff2d1b463fad5038c (patch) | |
| tree | 0453fd501165368affa2917180ef3e43c5555ea0 /bin/OpenSim.ini.example | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Fix a parenthesis in prior commit (diff) | |
| download | opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.zip opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.gz opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.bz2 opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin/OpenSim.ini.example')
| -rw-r--r-- | bin/OpenSim.ini.example | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 2c105bd..074345d 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -1267,6 +1267,11 @@ UseSafetyCommit = true | |||
| 1267 | ; DefaultAdministratorGroupUUID = ""; | 1267 | ; DefaultAdministratorGroupUUID = ""; |
| 1268 | ; DefaultAdministratorParcelName = ""; | 1268 | ; DefaultAdministratorParcelName = ""; |
| 1269 | 1269 | ||
| 1270 | [MediaOnAPrim] | ||
| 1271 | ; Enable media on a prim facilities | ||
| 1272 | Enabled = true; | ||
| 1273 | |||
| 1274 | |||
| 1270 | ;; | 1275 | ;; |
| 1271 | ;; These are defaults that are overwritten below in [Architecture]. | 1276 | ;; These are defaults that are overwritten below in [Architecture]. |
| 1272 | ;; These defaults allow OpenSim to work out of the box with | 1277 | ;; These defaults allow OpenSim to work out of the box with |