diff options
| author | Melanie | 2013-02-28 21:20:07 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-28 21:20:07 +0000 |
| commit | eb9458fd7e3a9098712f501cdcf05d71f741ec14 (patch) | |
| tree | 1a719b0d89f22cefd04866db162694d0eb724d8d /bin/Robust.ini.example | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix potential concurrency issue since the LSL notecard cache was not being ch... (diff) | |
| download | opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.zip opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.gz opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.bz2 opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'bin/Robust.ini.example')
| -rw-r--r-- | bin/Robust.ini.example | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index bb98bbf..d932ce7 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -30,7 +30,8 @@ | |||
| 30 | [ServiceList] | 30 | [ServiceList] |
| 31 | AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" | 31 | AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" |
| 32 | InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector" | 32 | InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector" |
| 33 | VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector" | 33 | ;; Uncomment if you have set up Freeswitch (see [FreeswitchService] below) |
| 34 | ;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector" | ||
| 34 | GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector" | 35 | GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector" |
| 35 | GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector" | 36 | GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector" |
| 36 | AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" | 37 | AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector" |