Merge branch 'master' into bigmerge

author: Melanie 2011-10-12 16:45:48 +0100
committer: Melanie 2011-10-12 16:45:48 +0100
commit: 35def547f7b53312a280d3786b9196688d335382 (patch)
tree: 81a301bbb251e8a5e4b06e37eead59f0f30cb04f /bin/config-include/HyperSimianGrid.ini
parent: Disable Flotsam groups messaging module in our config base (diff)
parent: Make it possible to disable the HG linker. On non-HG systems it spits yellow (diff)
download: opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.zip
opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.gz
opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.bz2
opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 89d6be7..ec4efc0 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -40,6 +40,7 @@
    LibraryModule = false
    
    AssetCaching = "FlotsamAssetCache"
+        HypergridLinker         = "HypergridLinker"
 [SimulationDataStore]
    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
author	Melanie	2011-10-12 16:45:48 +0100
committer	Melanie	2011-10-12 16:45:48 +0100
commit	35def547f7b53312a280d3786b9196688d335382 (patch)
tree	81a301bbb251e8a5e4b06e37eead59f0f30cb04f /bin/config-include/HyperSimianGrid.ini
parent	Disable Flotsam groups messaging module in our config base (diff)
parent	Make it possible to disable the HG linker. On non-HG systems it spits yellow (diff)
download	opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.zip opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.gz opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.bz2 opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.xz

diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index 89d6be7..ec4efc0 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini
@@ -40,6 +40,7 @@
40	LibraryModule = false	40	LibraryModule = false
41		41
42	AssetCaching = "FlotsamAssetCache"	42	AssetCaching = "FlotsamAssetCache"
		43	HypergridLinker = "HypergridLinker"
43		44
44	[SimulationDataStore]	45	[SimulationDataStore]
45	LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"	46	LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"