diff options
| author | Melanie | 2012-11-11 21:16:29 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-11 21:16:29 +0000 |
| commit | 3c48b44b68002c3983404f48b2a51836793b6433 (patch) | |
| tree | 42546ba5a6cefee37f07a6097635d78cce1053b8 /bin/OpenSimDefaults.ini | |
| parent | Prevent datasnapshot from crashing the simulator (diff) | |
| parent | moving windlight-sources to correct namespace-named folder (world); add Light... (diff) | |
| download | opensim-SC_OLD-3c48b44b68002c3983404f48b2a51836793b6433.zip opensim-SC_OLD-3c48b44b68002c3983404f48b2a51836793b6433.tar.gz opensim-SC_OLD-3c48b44b68002c3983404f48b2a51836793b6433.tar.bz2 opensim-SC_OLD-3c48b44b68002c3983404f48b2a51836793b6433.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 4b58985..ed1b969 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1418,16 +1418,6 @@ | |||
| 1418 | ; DeleteScriptsOnStartup = false | 1418 | ; DeleteScriptsOnStartup = false |
| 1419 | 1419 | ||
| 1420 | 1420 | ||
| 1421 | [OpenGridProtocol] | ||
| 1422 | ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. | ||
| 1423 | ;On/true or Off/false | ||
| 1424 | ogp_enabled=false | ||
| 1425 | |||
| 1426 | ;Name Prefix/suffix when using OGP | ||
| 1427 | ogp_firstname_prefix="" | ||
| 1428 | ogp_lastname_suffix="_EXTERNAL" | ||
| 1429 | |||
| 1430 | |||
| 1431 | [Concierge] | 1421 | [Concierge] |
| 1432 | ; Enable concierge module | 1422 | ; Enable concierge module |
| 1433 | ; Default is false | 1423 | ; Default is false |