Commit Graph

968 Commits

Author SHA1 Message Date
Melanie
585259ef08 Merge branch 'master' into careminster-presence-refactor 2010-05-04 18:39:04 +01:00
Diva Canto
484584b83c Fixed: migration #2 for SQLite. Problem was that ATTACH cannot be done inside a transaction. 2010-05-04 09:44:30 -07:00
Melanie Thielker
da849aea78 Allow regions to get the list of the other regions in the estate 2010-05-04 17:56:30 +02:00
Melanie Thielker
9635af61f0 Allow regions to get the list of the other regions in the estate 2010-05-04 15:52:29 +01:00
Melanie Thielker
23d7a942ea Refix the fix 2010-05-03 23:11:48 +01:00
Melanie Thielker
92dff5edb1 Add folder version incrementing to XInventoryService. Fixes offline give
for avatar->avatar
2010-05-03 23:11:37 +01:00
Melanie Thielker
deaa79ca9e Refix the fix 2010-05-03 23:53:49 +02:00
Melanie Thielker
80bf3934af Add folder version incrementing to XInventoryService. Fixes offline give
for avatar->avatar
2010-05-03 23:47:32 +02:00
Melanie
9f8acbfe3e Merge branch 'master' into careminster-presence-refactor 2010-05-03 01:40:24 +01:00
Diva Canto
bd49985afa Switched everything to XInventory by default. The old Inventory is still there for now, in case bugs pop up with XInventory. 2010-05-02 10:31:35 -07:00
Justin Clark-Casey (justincc)
f3662e3d15 minor: eliminate more debug Console.WriteLines, convert one to logging instead 2010-04-30 22:22:03 +01:00
Melanie
9bc5098dd8 Merge branch 'master' into careminster-presence-refactor 2010-04-30 20:15:19 +01:00
Justin Clark-Casey (justincc)
d921329799 take out some debug logging in the sqlite db adaptor 2010-04-30 18:18:21 +01:00
Justin Clark-Casey (justincc)
89e79c1133 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-30 17:54:00 +01:00
Justin Clark-Casey (justincc)
cc67de5b86 rename SQLiteNG to SQLite and SQLite to SQLiteLegacy
this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG
MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone)
See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details
This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies).  And change data columns in sqlite is a pita.
2010-04-30 17:45:00 +01:00
Melanie
08ebcdb0b8 Merge branch 'master' into careminster-presence-refactor 2010-04-29 23:33:26 +01:00
AlexRa
be1141f0f7 Refactoring in Migration.cs: "using()" instead of explicit Dispose()
This ensures that 'cmd' gets disposed on errors
2010-04-28 13:40:35 +03:00
AlexRa
b49e9eff56 Fixed comments in Migration.cs: wrong argument order (no change to code) 2010-04-28 13:11:42 +03:00
AlexRa
8b75302a1e Just a bit of spellchecking in the comments 2010-04-28 12:21:39 +03:00
Melanie
bbffe16f13 Merge branch 'master' into careminster-presence-refactor 2010-04-27 00:27:05 +01:00
Justin Clark-Casey (justincc)
6e99e5b47a get region prim saving working properly in SQLiteNG
it wasn't working because of debug work that I'd forgotton to take out
2010-04-23 20:56:24 +01:00
Justin Clark-Casey (justincc)
f313d57fa4 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-23 20:11:26 +01:00
Justin Clark-Casey (justincc)
1b488c2581 dispose of the DbCommand used to execute migrations after we've finished with it rather than within the loop
disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway
2010-04-23 20:08:24 +01:00
Justin Clark-Casey
e78f874cfd put SQLiteNG classes in their own namespace to avoid confusion 2010-04-23 19:40:15 +01:00
Justin Clark-Casey (justincc)
fcbac43114 minor: correct the assembly information for SQLiteNG 2010-04-23 19:14:43 +01:00
Justin Clark-Casey (justincc)
5ee77886ac Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-23 19:05:32 +01:00
Justin Clark-Casey (justincc)
e84cc2f9db Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll
Include the library so that Windows builds correctly
It appears that Windows is okay with either SQLite or SQLiteNG
Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite
2010-04-23 18:56:50 +01:00
Justin Clark-Casey (justincc)
a23bebdc0f Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will shortly be changed to work under mono 2.6 and above 2010-04-23 17:17:15 +01:00
Melanie
ebcc9874d4 Insert a ROLLBACK command on migration step failure. This ensures that
updating the Migrations table will not occur in a partial transaction, which
would be auto-rolled-back later.
2010-04-22 17:45:03 +01:00
Melanie
98cb4f74b2 Merge branch 'master' into careminster-presence-refactor 2010-04-19 07:00:40 +01:00
Diva Canto
4e1cbd1bf3 One more bug fix in sqlite sql statements. 2010-04-16 18:04:20 -07:00
Diva Canto
2597a3406c Bug fix: UserAccounts in SQLite was missing the primary key constraint. 2010-04-16 17:43:15 -07:00
Diva Canto
930d374525 Expose Delete at IUserAccountData interface. It was there already. No changes in IUserAccountService, just the data layer. 2010-04-16 16:36:44 -07:00
Diva Canto
b3e9dd4fc2 Bug fix in SQLite/SQLiteUserAccountData.cs: Missing'(' in one of the SQL statements. 2010-04-16 15:10:57 -07:00
Justin Clark-Casey (justincc)
e0f8362e7a minor: add some documentation around the asset udp request path and replace some magic numbers with libomv enums 2010-04-14 22:31:11 +01:00
Diva Canto
5fc9fe70af Added NullInventoryData for unit tests and quick try-outs of the services in 64-bit machines (no SQLite). 2010-04-06 19:38:01 -07:00
Melanie
ec637e2b8c Committing the LightShare code, which was developed by TomMeta of Meta7.
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
2010-03-31 04:20:20 +01:00
Melanie
7d917e7c5c Rename Meta7Windlight to LightShare 2010-03-30 23:29:03 +01:00
Melanie
5693870fe2 Merge branch 'master' into careminster-presence-refactor 2010-03-30 21:34:27 +01:00
John Hurliman
d6a64bf732 * Catch exceptions thrown when MySQLEstateData.LinkRegion() is called. This won't fix the bug I'm seeing with regions not realizing they are already part of an estate, but it will fix the OpenSim crash if that situation ever comes up 2010-03-26 13:50:25 -07:00
Justin Clark-Casey (justincc)
87fe96ae2c replace recent IModule.GetGroup() with better GetGroupRecord(string name) 2010-03-26 00:10:29 +00:00
Melanie
3fb73e4e26 UNTESTED SQLite code to enable estate setup in interactive confguration 2010-03-23 02:18:55 +00:00
Melanie
dcf18689b9 First stage of the new interactive region creation. This will allow creation
of a region and joining it to an existing estate or creating a new estate,
as well as creating an estate owner if in standalone, and assigning estate
owners. In Grid mode, existing users must be used. MySQL ONLY!!!! so far, as
I can't develop or test for either SQLite or MSSQL.
2010-03-23 02:05:56 +00:00
Melanie
07a6b37001 Somehow the starting estate number in MySQL was lost. This adds a migration
to start estates at 100. Existing databases having autcreated estates below
100 will see a gap in estate numbering. Other database implementors need to
ensure that no estates with numbers less that 100 are autocreated, unless
they are prepared to deal with the viewer's built-in notions of
Linden Mainland
2010-03-22 20:38:27 +00:00
Melanie
70b0e07d1e Remove the reading of estate_settings.xml and the associated processing of
defaults. Adding code to facilitate estate creation / managemment as part of
first time start up
2010-03-22 18:49:56 +00:00
Melanie
d3f33acc1a Merge branch 'master' into careminster-presence-refactor 2010-03-15 17:23:35 +00:00
Jeff Ames
f58a0394ed Formatting cleanup. Add copyright notices. 2010-03-10 13:15:36 +09:00
Melanie
40873504dc Merge branch 'master' into careminster-presence-refactor 2010-03-09 22:46:17 +00:00
unknown
c135235000 MSSQL tweaks for latest ROBUST - friends handling fixed, GridUserData placeholder added.
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 18:37:08 +00:00
Melanie
8180c72cbc Merge branch 'master' into careminster-presence-refactor 2010-03-06 12:37:24 +00:00