diff options
| author | Melanie | 2013-03-05 23:57:53 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-05 23:57:53 +0000 |
| commit | 81552f41c601017f43061d923eba393b9f85a7b3 (patch) | |
| tree | 5d6c3aba0f72941c06b47eaae6f4cd0301b60b23 /bin/Robust.HG.ini.example | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | minor: Fix mono compiler warning in MonitorModule (diff) | |
| download | opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.zip opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.tar.gz opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.tar.bz2 opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
| -rw-r--r-- | bin/Robust.HG.ini.example | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 91dea8c..7746ebc 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -431,6 +431,7 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
| 431 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 431 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
| 432 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 432 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
| 433 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 433 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
| 434 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" | ||
| 434 | GridService = "OpenSim.Services.GridService.dll:GridService" | 435 | GridService = "OpenSim.Services.GridService.dll:GridService" |
| 435 | AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" | 436 | AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" |
| 436 | SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" | 437 | SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" |