aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include/Standalone.ini
diff options
context:
space:
mode:
authorMelanie2010-08-08 18:24:33 +0100
committerMelanie2010-08-08 18:24:33 +0100
commit321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2 (patch)
treefe6321cf65640d1e6c9fd94b65a3cf5981470204 /bin/config-include/Standalone.ini
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentAdd distance sort for null, too (diff)
downloadopensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.zip
opensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.gz
opensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.bz2
opensim-SC-321e1148da7fd1fa3a2bf0b0460c17c632aaf5b2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin/config-include/Standalone.ini')
-rw-r--r--bin/config-include/Standalone.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 6b7dc50..eae9801 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -20,6 +20,7 @@
20 20
21 LibraryModule = true 21 LibraryModule = true
22 LLLoginServiceInConnector = true 22 LLLoginServiceInConnector = true
23 GridInfoServiceInConnector = true
23 24
24[AssetService] 25[AssetService]
25 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 26 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"