diff options
| author | root | 2009-11-26 20:41:38 +0100 |
|---|---|---|
| committer | root | 2009-11-26 20:41:38 +0100 |
| commit | 2c3f6aaa878b5458eeeab8544226ff53b7172f5a (patch) | |
| tree | 48941505962693508016fafb479c2baaf1b3568f /bin | |
| parent | First attempt at mult-sit on large single prims. (diff) | |
| parent | Remove OS version crap from about dialog (diff) | |
| download | opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.zip opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.gz opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.bz2 opensim-SC-2c3f6aaa878b5458eeeab8544226ff53b7172f5a.tar.xz | |
Merge branch 'careminster' into tests
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/NDesk.Options.dll | bin | 0 -> 22016 bytes | |||
| -rw-r--r-- | bin/OpenSim.ini.example | 3 |
2 files changed, 3 insertions, 0 deletions
diff --git a/bin/NDesk.Options.dll b/bin/NDesk.Options.dll new file mode 100644 index 0000000..df45878 --- /dev/null +++ b/bin/NDesk.Options.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 116a8fd..f9d9ca6 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -454,6 +454,9 @@ | |||
| 454 | 454 | ||
| 455 | ; Distance in meters that shouts should travel. Default is 100m | 455 | ; Distance in meters that shouts should travel. Default is 100m |
| 456 | shout_distance = 100 | 456 | shout_distance = 100 |
| 457 | |||
| 458 | ; Append a prefix to the god avatar names appearing in chat whilst in god mode | ||
| 459 | ; admin_prefix = "@" | ||
| 457 | 460 | ||
| 458 | 461 | ||
| 459 | [Messaging] | 462 | [Messaging] |