diff options
| author | Melanie | 2013-02-23 20:37:09 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-23 20:37:09 +0000 |
| commit | e3ea2c4beefb65ba997beab1509aa996a46f7864 (patch) | |
| tree | 778cba450e788b13f4d000c6e49f3d94bd25f65c /bin/Robust.ini.example | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | More clarification on the [Groups] section (diff) | |
| download | opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.zip opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.gz opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.bz2 opensim-SC-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'bin/Robust.ini.example')
| -rw-r--r-- | bin/Robust.ini.example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index ecbed1f..bb98bbf 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -381,3 +381,5 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto | |||
| 381 | 381 | ||
| 382 | ; password help: optional: page providing password assistance for users of your grid | 382 | ; password help: optional: page providing password assistance for users of your grid |
| 383 | ;password = http://127.0.0.1/password | 383 | ;password = http://127.0.0.1/password |
| 384 | |||
| 385 | |||