aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-10-10 22:07:51 +0100
committerMelanie2010-10-10 22:07:51 +0100
commit30f926aab6c564f76491d5de130bde3f9e5b738d (patch)
tree1b984f37ce568503de8da1bdfabe3013a53f9ed4 /bin
parentChange the part for sound playback to be the root part / object UUID instead (diff)
parent* Make line endings consistant in Meshmerizer.cs (diff)
downloadopensim-SC-30f926aab6c564f76491d5de130bde3f9e5b738d.zip
opensim-SC-30f926aab6c564f76491d5de130bde3f9e5b738d.tar.gz
opensim-SC-30f926aab6c564f76491d5de130bde3f9e5b738d.tar.bz2
opensim-SC-30f926aab6c564f76491d5de130bde3f9e5b738d.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/config-include/StandaloneHypergrid.ini6
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 317af4b..f164d33 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -31,6 +31,12 @@
31 AuthenticationServiceInConnector = true 31 AuthenticationServiceInConnector = true
32 SimulationServiceInConnector = true 32 SimulationServiceInConnector = true
33 33
34[SimulationDataStore]
35 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
36
37[EstateDataStore]
38 LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
39
34[AssetService] 40[AssetService]
35 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 41 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
36 42