aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorMelanie2010-03-01 01:01:32 +0000
committerMelanie2010-03-01 01:01:32 +0000
commit38ea1dd5c82df6e037f7e634df572df5a38b2bd0 (patch)
tree5d94d42e833985ff13a1522085b28f9889d70595 /bin/config-include
parentShould have things the right way around, better that way (diff)
parentfix bug where region settings loaded via an oar (water height, terrain textur... (diff)
downloadopensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.zip
opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.gz
opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.bz2
opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.xz
Merge branch 'master' into presence-refactor
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/Standalone.ini3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index b35f8a5..bf693a1 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -24,7 +24,6 @@
24 24
25[InventoryService] 25[InventoryService]
26 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 26 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
27
28[LibraryService] 27[LibraryService]
29 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" 28 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
30 LibraryName = "OpenSim Library" 29 LibraryName = "OpenSim Library"
@@ -42,7 +41,7 @@
42 ConnectionString = "URI=file:auth.db,version=3" 41 ConnectionString = "URI=file:auth.db,version=3"
43 42
44[GridService] 43[GridService]
45 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 44 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
46 Realm = "regions" 45 Realm = "regions"
47 StorageProvider = "OpenSim.Data.Null.dll" 46 StorageProvider = "OpenSim.Data.Null.dll"
48 47