diff options
| author | Melanie | 2012-01-02 21:41:36 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-02 21:41:36 +0000 |
| commit | a6e305063e9045194cd8348f73f3b75d07f3883e (patch) | |
| tree | c3287856ea47817715da89c737e3ccfe4d4c9f5d /bin/config-include/GridHypergrid.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Reduce accessibility of some J2KImage/LLImageManager properties and methods t... (diff) | |
| download | opensim-SC-a6e305063e9045194cd8348f73f3b75d07f3883e.zip opensim-SC-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.gz opensim-SC-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.bz2 opensim-SC-a6e305063e9045194cd8348f73f3b75d07f3883e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/config-include/GridHypergrid.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 4c32498..5f0ba37 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | LandServices = "RemoteLandServicesConnector" | 26 | LandServices = "RemoteLandServicesConnector" |
| 27 | FriendsModule = "HGFriendsModule" | 27 | FriendsModule = "HGFriendsModule" |
| 28 | MapImageService = "MapImageServiceModule" | 28 | MapImageService = "MapImageServiceModule" |
| 29 | HypergridLinker = "HypergridLinker" | ||
| 30 | 29 | ||
| 31 | LandServiceInConnector = true | 30 | LandServiceInConnector = true |
| 32 | NeighbourServiceInConnector = true | 31 | NeighbourServiceInConnector = true |
| @@ -60,6 +59,7 @@ | |||
| 60 | ; Needed to display non-default map tile images for linked regions | 59 | ; Needed to display non-default map tile images for linked regions |
| 61 | AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" | 60 | AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" |
| 62 | 61 | ||
| 62 | HypergridLinker = true | ||
| 63 | AllowHypergridMapSearch = true | 63 | AllowHypergridMapSearch = true |
| 64 | 64 | ||
| 65 | [LibraryService] | 65 | [LibraryService] |