diff options
| author | Melanie | 2011-11-19 22:39:15 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-19 22:39:15 +0000 |
| commit | bdb5ac96d9432eb568ed3e3bb46b012365f884bc (patch) | |
| tree | fe2ce2636be7e750b3f235a6c04b9f3a5cf2f8af /bin/Robust.HG.ini.example | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre... (diff) | |
| download | opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.zip opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.gz opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.bz2 opensim-SC-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
| -rw-r--r-- | bin/Robust.HG.ini.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index a23063d..eee7dc8 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -237,7 +237,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 237 | AllowRemoteSetLoginLevel = "false" | 237 | AllowRemoteSetLoginLevel = "false" |
| 238 | 238 | ||
| 239 | ; For V2 map | 239 | ; For V2 map |
| 240 | ; MapTileURL = "http://127.0.0.1:8002"; | 240 | MapTileURL = "http://127.0.0.1:8002"; |
| 241 | 241 | ||
| 242 | ; If you run this login server behind a proxy, set this to true | 242 | ; If you run this login server behind a proxy, set this to true |
| 243 | ; HasProxy = false | 243 | ; HasProxy = false |