diff options
| author | Melanie | 2012-03-21 00:26:02 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-21 00:26:02 +0000 |
| commit | ee9210f656f754e2caa40cb6ff39463cbf286347 (patch) | |
| tree | 8097bad8a37e210bfbdeff113a9ab00d853ad9ac /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Refix the fixed fix! (diff) | |
| download | opensim-SC-ee9210f656f754e2caa40cb6ff39463cbf286347.zip opensim-SC-ee9210f656f754e2caa40cb6ff39463cbf286347.tar.gz opensim-SC-ee9210f656f754e2caa40cb6ff39463cbf286347.tar.bz2 opensim-SC-ee9210f656f754e2caa40cb6ff39463cbf286347.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index ee51067..75c4788 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -159,8 +159,12 @@ | |||
| 159 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 159 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
| 160 | 160 | ||
| 161 | [HGFriendsService] | 161 | [HGFriendsService] |
| 162 | LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService" | 162 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService" |
| 163 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 163 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
| 164 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | ||
| 165 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | ||
| 166 | GridService = "OpenSim.Services.GridService.dll:GridService" | ||
| 167 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | ||
| 164 | 168 | ||
| 165 | [HGInstantMessageService] | 169 | [HGInstantMessageService] |
| 166 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" | 170 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" |