diff options
| author | Melanie | 2012-11-11 21:16:58 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-11 21:16:58 +0000 |
| commit | d84de8c9b6539b6a67e8b1b48843b581ca5ec181 (patch) | |
| tree | 3fdeab45b9dd7c8804bad103508a762c89324fa5 /bin | |
| parent | Prevent datasnapshot from crashing the simulator (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-d84de8c9b6539b6a67e8b1b48843b581ca5ec181.zip opensim-SC-d84de8c9b6539b6a67e8b1b48843b581ca5ec181.tar.gz opensim-SC-d84de8c9b6539b6a67e8b1b48843b581ca5ec181.tar.bz2 opensim-SC-d84de8c9b6539b6a67e8b1b48843b581ca5ec181.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'bin')
| -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 45682a0..16cde7e 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1414,16 +1414,6 @@ | |||
| 1414 | ; DeleteScriptsOnStartup = false | 1414 | ; DeleteScriptsOnStartup = false |
| 1415 | 1415 | ||
| 1416 | 1416 | ||
| 1417 | [OpenGridProtocol] | ||
| 1418 | ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. | ||
| 1419 | ;On/true or Off/false | ||
| 1420 | ogp_enabled=false | ||
| 1421 | |||
| 1422 | ;Name Prefix/suffix when using OGP | ||
| 1423 | ogp_firstname_prefix="" | ||
| 1424 | ogp_lastname_suffix="_EXTERNAL" | ||
| 1425 | |||
| 1426 | |||
| 1427 | [Concierge] | 1417 | [Concierge] |
| 1428 | ; Enable concierge module | 1418 | ; Enable concierge module |
| 1429 | ; Default is false | 1419 | ; Default is false |