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/HyperSimianGrid.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 'bin/config-include/HyperSimianGrid.ini')
| -rw-r--r-- | bin/config-include/HyperSimianGrid.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index ec4efc0..99a589c 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | LibraryModule = false | 40 | LibraryModule = false |
| 41 | 41 | ||
| 42 | AssetCaching = "FlotsamAssetCache" | 42 | AssetCaching = "FlotsamAssetCache" |
| 43 | HypergridLinker = "HypergridLinker" | ||
| 44 | 43 | ||
| 45 | [SimulationDataStore] | 44 | [SimulationDataStore] |
| 46 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 45 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
| @@ -56,6 +55,7 @@ | |||
| 56 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 55 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
| 57 | NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector" | 56 | NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector" |
| 58 | 57 | ||
| 58 | HypergridLinker = true | ||
| 59 | AllowHypergridMapSearch = true | 59 | AllowHypergridMapSearch = true |
| 60 | 60 | ||
| 61 | [LibraryService] | 61 | [LibraryService] |