aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-03-04 10:43:12 +0000
committerMelanie2010-03-04 10:43:12 +0000
commit31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca (patch)
treee351c23bd3f773e0ceb4cae518987c73edc90f6d /bin
parentRemove a superfluous array creation (diff)
parentcompiler warnings revealed that public PlaySoundSlavePrims properties were ch... (diff)
downloadopensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.zip
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.gz
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.bz2
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/config-include/Standalone.ini8
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index bf693a1..3011370 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -24,10 +24,11 @@
24 24
25[InventoryService] 25[InventoryService]
26 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 26 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
27
27[LibraryService] 28[LibraryService]
28 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" 29 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
29 LibraryName = "OpenSim Library" 30 LibraryName = "OpenSim Library"
30 DefaultLibrary = "./inventory/Libraries.xml" 31 DefaultLibrary = "./inventory/Libraries.xml"
31 32
32[AvatarService] 33[AvatarService]
33 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" 34 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
@@ -52,6 +53,7 @@
52[UserAccountService] 53[UserAccountService]
53 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 54 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
54 ConnectionString = "URI=file:userprofiles.db,version=3" 55 ConnectionString = "URI=file:userprofiles.db,version=3"
56
55 ;; These are for creating new accounts 57 ;; These are for creating new accounts
56 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 58 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
57 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 59 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"