From f5a088c9cc1e068cc49f13dce3cbbf1beae2468f Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 4 Mar 2010 08:33:01 -0800 Subject: Replaced BclExtras.dll with a newer version compiled for .NET 3.5. This solves the compilation errors that have been affecting build on Windows for the past day. Thanks lkalif for noticing the conflict. --- bin/BclExtras.dll | Bin 178688 -> 0 bytes bin/BclExtras35.dll | Bin 0 -> 153600 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/BclExtras.dll create mode 100644 bin/BclExtras35.dll (limited to 'bin') diff --git a/bin/BclExtras.dll b/bin/BclExtras.dll deleted file mode 100644 index 505cf01..0000000 Binary files a/bin/BclExtras.dll and /dev/null differ diff --git a/bin/BclExtras35.dll b/bin/BclExtras35.dll new file mode 100644 index 0000000..7a7480a Binary files /dev/null and b/bin/BclExtras35.dll differ -- cgit v1.1 From e906dd3d28a3cb4dfada36daccfd8900f0e844b5 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 5 Mar 2010 22:29:51 +0000 Subject: add initial UserGrid service classes as per diva's direction this will initially store home location data instead of the presence service compiles but not enough to actually test yet --- bin/config-include/Standalone.ini | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 3011370..1843ef6 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -24,22 +24,21 @@ [InventoryService] LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" - [LibraryService] - LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" - LibraryName = "OpenSim Library" - DefaultLibrary = "./inventory/Libraries.xml" + LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" + LibraryName = "OpenSim Library" + DefaultLibrary = "./inventory/Libraries.xml" [AvatarService] LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" - ConnectionString = "URI=file:avatars.db,version=3" + ; ConnectionString = "URI=file:avatars.db,version=3" [AuthorizationService] LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" [AuthenticationService] LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" - ConnectionString = "URI=file:auth.db,version=3" + ; ConnectionString = "URI=file:auth.db,version=3" [GridService] LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" @@ -48,12 +47,12 @@ [PresenceService] LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" - StorageProvider = "OpenSim.Data.Null.dll" + ;StorageProvider = "OpenSim.Data.Null.dll" + StorageProvider = "OpenSim.Data.MySQL.dll" [UserAccountService] LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" - ConnectionString = "URI=file:userprofiles.db,version=3" - + ; ConnectionString = "URI=file:userprofiles.db,version=3" ;; These are for creating new accounts AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" @@ -62,7 +61,7 @@ [FriendsService] LocalServiceModule = "OpenSim.Services.FriendsService.dll" - ConnectionString = "URI=file:friends.db,version=3" + ; ConnectionString = "URI=file:friends.db,version=3" [Friends] Connector = "OpenSim.Services.FriendsService.dll" -- cgit v1.1 From b88259db7d7550dc963e0bfae8a7800ec38a119a Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 5 Mar 2010 23:19:22 +0000 Subject: revert accidental Standalone.ini change --- bin/config-include/Standalone.ini | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 1843ef6..3011370 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -24,21 +24,22 @@ [InventoryService] LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" + [LibraryService] - LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" - LibraryName = "OpenSim Library" - DefaultLibrary = "./inventory/Libraries.xml" + LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" + LibraryName = "OpenSim Library" + DefaultLibrary = "./inventory/Libraries.xml" [AvatarService] LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" - ; ConnectionString = "URI=file:avatars.db,version=3" + ConnectionString = "URI=file:avatars.db,version=3" [AuthorizationService] LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" [AuthenticationService] LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" - ; ConnectionString = "URI=file:auth.db,version=3" + ConnectionString = "URI=file:auth.db,version=3" [GridService] LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" @@ -47,12 +48,12 @@ [PresenceService] LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" - ;StorageProvider = "OpenSim.Data.Null.dll" - StorageProvider = "OpenSim.Data.MySQL.dll" + StorageProvider = "OpenSim.Data.Null.dll" [UserAccountService] LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" - ; ConnectionString = "URI=file:userprofiles.db,version=3" + ConnectionString = "URI=file:userprofiles.db,version=3" + ;; These are for creating new accounts AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" @@ -61,7 +62,7 @@ [FriendsService] LocalServiceModule = "OpenSim.Services.FriendsService.dll" - ; ConnectionString = "URI=file:friends.db,version=3" + ConnectionString = "URI=file:friends.db,version=3" [Friends] Connector = "OpenSim.Services.FriendsService.dll" -- cgit v1.1