diff options
author | Justin Clark-Casey (justincc) | 2010-03-03 22:20:06 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-03-03 22:20:06 +0000 |
commit | e97ba577888ae0da6f227fea6a2b78cca1a5d886 (patch) | |
tree | 73f2f7dcc7c0aaa898e295014635db56072e0820 /bin | |
parent | Fix bug where approximately half the time, attachments would rez only their r... (diff) | |
download | opensim-SC_OLD-e97ba577888ae0da6f227fea6a2b78cca1a5d886.zip opensim-SC_OLD-e97ba577888ae0da6f227fea6a2b78cca1a5d886.tar.gz opensim-SC_OLD-e97ba577888ae0da6f227fea6a2b78cca1a5d886.tar.bz2 opensim-SC_OLD-e97ba577888ae0da6f227fea6a2b78cca1a5d886.tar.xz |
reset the accidental local configuration changes
Diffstat (limited to '')
-rwxr-xr-x | bin/OpenSim.exe.config | 2 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index 4e7ef51..3c7adf5 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config | |||
@@ -12,7 +12,7 @@ | |||
12 | <log4net> | 12 | <log4net> |
13 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | 13 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> |
14 | <layout type="log4net.Layout.PatternLayout"> | 14 | <layout type="log4net.Layout.PatternLayout"> |
15 | <conversionPattern value="%date{HH:mm:ss,fff} - %message" /> | 15 | <conversionPattern value="%date{HH:mm:ss} - %message" /> |
16 | </layout> | 16 | </layout> |
17 | </appender> | 17 | </appender> |
18 | 18 | ||
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index dc65ffd..3011370 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -24,21 +24,22 @@ | |||
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" |
34 | ; ConnectionString = "URI=file:avatars.db,version=3" | 35 | ConnectionString = "URI=file:avatars.db,version=3" |
35 | 36 | ||
36 | [AuthorizationService] | 37 | [AuthorizationService] |
37 | LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" | 38 | LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" |
38 | 39 | ||
39 | [AuthenticationService] | 40 | [AuthenticationService] |
40 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 41 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
41 | ; ConnectionString = "URI=file:auth.db,version=3" | 42 | ConnectionString = "URI=file:auth.db,version=3" |
42 | 43 | ||
43 | [GridService] | 44 | [GridService] |
44 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 45 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
@@ -51,7 +52,8 @@ | |||
51 | 52 | ||
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" |
@@ -60,7 +62,7 @@ | |||
60 | 62 | ||
61 | [FriendsService] | 63 | [FriendsService] |
62 | LocalServiceModule = "OpenSim.Services.FriendsService.dll" | 64 | LocalServiceModule = "OpenSim.Services.FriendsService.dll" |
63 | ; ConnectionString = "URI=file:friends.db,version=3" | 65 | ConnectionString = "URI=file:friends.db,version=3" |
64 | 66 | ||
65 | [Friends] | 67 | [Friends] |
66 | Connector = "OpenSim.Services.FriendsService.dll" | 68 | Connector = "OpenSim.Services.FriendsService.dll" |