diff options
| author | Melanie | 2012-03-18 20:44:56 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-18 20:44:56 +0000 |
| commit | c7e302864a2eef7f9587ed22286c96a6074ac5b3 (patch) | |
| tree | 8f0df2f66811309fd790966770434fa3ff68bfdf /bin/config-include/Grid.ini | |
| parent | Merge branch 'ubitwork' (diff) | |
| parent | Amend to previous commit: normalize strings ToLower. (diff) | |
| download | opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.zip opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.gz opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.bz2 opensim-SC_OLD-c7e302864a2eef7f9587ed22286c96a6074ac5b3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/config-include/Grid.ini')
| -rw-r--r-- | bin/config-include/Grid.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index da860c6..95d6264 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | AvatarServices = "RemoteAvatarServicesConnector" | 14 | AvatarServices = "RemoteAvatarServicesConnector" |
| 15 | NeighbourServices = "RemoteNeighbourServicesConnector" | 15 | NeighbourServices = "RemoteNeighbourServicesConnector" |
| 16 | AuthenticationServices = "RemoteAuthenticationServicesConnector" | 16 | AuthenticationServices = "RemoteAuthenticationServicesConnector" |
| 17 | AuthorizationServices = "LocalAuthorizationServicesConnector" | ||
| 17 | PresenceServices = "RemotePresenceServicesConnector" | 18 | PresenceServices = "RemotePresenceServicesConnector" |
| 18 | UserAccountServices = "RemoteUserAccountServicesConnector" | 19 | UserAccountServices = "RemoteUserAccountServicesConnector" |
| 19 | GridUserServices = "RemoteGridUserServicesConnector" | 20 | GridUserServices = "RemoteGridUserServicesConnector" |