diff options
| author | Melanie | 2010-08-04 00:33:02 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-04 00:33:02 +0100 |
| commit | e12993ed22d59375bc9d0aa17230c74eeb4ccda3 (patch) | |
| tree | 4b98affa74715dbad24b34a31d4abe22f1ff2990 /bin | |
| parent | Allow specifying default region flags. Correct a typo. (diff) | |
| parent | Allow specifying default region flags. Correct a typo. (diff) | |
| download | opensim-SC_OLD-e12993ed22d59375bc9d0aa17230c74eeb4ccda3.zip opensim-SC_OLD-e12993ed22d59375bc9d0aa17230c74eeb4ccda3.tar.gz opensim-SC_OLD-e12993ed22d59375bc9d0aa17230c74eeb4ccda3.tar.bz2 opensim-SC_OLD-e12993ed22d59375bc9d0aa17230c74eeb4ccda3.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Robust.HG.ini.example | 1 | ||||
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 0cf9ab1..9269e39 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -207,6 +207,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 207 | ;; for the service | 207 | ;; for the service |
| 208 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" | 208 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" |
| 209 | GridService = "OpenSim.Services.GridService.dll:GridService" | 209 | GridService = "OpenSim.Services.GridService.dll:GridService" |
| 210 | GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" | ||
| 210 | 211 | ||
| 211 | ;; The interface that local users get when they are in other grids. | 212 | ;; The interface that local users get when they are in other grids. |
| 212 | ;; This restricts the inventory operations while in other grids. | 213 | ;; This restricts the inventory operations while in other grids. |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index e87270d..35e7da2 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -114,6 +114,8 @@ | |||
| 114 | ;; for the service | 114 | ;; for the service |
| 115 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" | 115 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" |
| 116 | GridService = "OpenSim.Services.GridService.dll:GridService" | 116 | GridService = "OpenSim.Services.GridService.dll:GridService" |
| 117 | GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" | ||
| 118 | |||
| 117 | 119 | ||
| 118 | ;; The interface that local users get when they are in other grids | 120 | ;; The interface that local users get when they are in other grids |
| 119 | ;; This greatly restricts the inventory operations while in other grids | 121 | ;; This greatly restricts the inventory operations while in other grids |