Commit Graph

1742 Commits (9a5844fdb9bdb4b60619bd340b7868265fd6dbae)

Author SHA1 Message Date
Melanie 474910c9d6 Merge branch 'master' into careminster-presence-refactor 2011-04-17 18:48:53 +01:00
Justin Clark-Casey (justincc) da4a9653a2 minor: remove some mono compiler warnings 2011-04-12 22:33:06 +01:00
Melanie 42b96a8be0 Merge branch 'master' into careminster-presence-refactor 2011-04-12 00:27:39 +01:00
Justin Clark-Casey (justincc) 49d80f5711 Include code to return more information about the NullReferenceException seen in
http://opensimulator.org/mantis/view.php?id=5403 prior to doing something about it.
2011-04-11 23:07:56 +01:00
Melanie 738daadace Merge branch 'master' into careminster-presence-refactor 2011-04-08 04:16:29 +01:00
Justin Clark-Casey (justincc) 9d40c0dcc7 Remove the SQLite legacy adaptor. This is no longer needed now that the main adaptor works on Mac OS X.
The SQLite legacy adapator was also not at all well maintained, even worse than the mainline sqlite adapator.
2011-04-07 23:20:04 +01:00
Melanie 407c2b1823 Merge branch 'master' into careminster-presence-refactor 2011-04-06 09:22:55 +01:00
Teravus Ovares (Dan Olivares) 18e206d2ed * Bugfix - Compile NullEstateData implement public List<int> IEstateDataStore.GetEstatesByOwner(UUID) 2011-04-04 23:45:28 -04:00
Mic Bowman d5e0674213 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2011-04-04 20:04:01 -07:00
Mic Bowman b2fbadeae8 Updates NullStorage plugin.
Thanks MisterBlue...
2011-04-04 20:02:13 -07:00
Justin Clark-Casey (justincc) f58941e89f Make the "All Estates" option work from the client (this makes chosen changes to all the estates that the user owns).
This applies to adding/removing estate users, groups, managers and bans.
This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420
Thanks very much, Snoopy!
2011-04-05 01:30:13 +01:00
Justin Clark-Casey (justincc) 7bba31e8d9 remove some mono compiler warnings 2011-03-31 22:20:12 +01:00
Melanie a62b435a39 Merge branch 'master' into careminster-presence-refactor 2011-03-27 21:41:54 +01:00
Melanie c330f89fb1 Add some more fields to Estate settings and make them work.
Run alter table estate_settings add column AllowLandmark tinyint not null default 1, add column AllowParcelChanges tinyint not null default 1, add column AllowSetHome tinyint not null default 1;
to make this work.
2011-03-22 10:43:43 +01:00
Melanie a073ca57da Add a definition for a region flag to omit a region from traffic counting 2011-03-22 09:23:46 +01:00
Justin Clark-Casey (justincc) d3a20a1e92 On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names. 2011-03-21 21:37:06 +00:00
Melanie e4f143fb1c Merge branch 'master' into careminster-presence-refactor 2011-03-21 07:57:56 +00:00
Justin Clark-Casey (justincc) fdcf910e00 Fix a bug in T015_LargeSceneObjects() where the large scene object was stored 31 times (1 time for each added part) instead of once at the end, even though only the largest 31 prim scene object was retrieved and tested.
This considerably speeds up the test, when on sqlite it now only takes 2 seconds rather than 30+
2011-03-14 23:35:03 +00:00
Justin Clark-Casey (justincc) 38c3be07b8 when retrieving a sog in database tests, don't bother adding the scene since this isn't used 2011-03-14 23:32:44 +00:00
Justin Clark-Casey (justincc) 8509678e48 Add method doc to T015_LargeSceneObjects() and slightly clean up formatting.
This test takes a considerable time on SQLite but should remain since it's testing storage and retrieval of a scene object with 31 parts.
2011-03-14 23:26:50 +00:00
Justin Clark-Casey (justincc) 48c62eb51b Add current method output to all persistence level tests so that we can track where we are in the test suite 2011-03-14 23:17:15 +00:00
Melanie 4a5560a86e Change avatar picker search to work properly when two name parts are used 2011-03-12 13:06:13 +01:00
Justin Clark-Casey (justincc) f6f8d124d1 minor: remove mono compiler warning 2011-03-12 00:52:43 +00:00
Melanie 9165a5207d Merge branch 'master' into careminster-presence-refactor 2011-03-10 07:14:03 +00:00
Justin Clark-Casey (justincc) 9456bb77fb Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
Justin Clark-Casey (justincc) 8a2360bf81 Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests 2011-03-09 01:21:31 +00:00
Diva Canto 9923a2ff10 Pull up Assembly of the MySQL classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is just a refactor -- no functional changes whatsoever. 2011-03-08 09:02:29 -08:00
Melanie 9be1d2aef1 Merge branch 'master' into careminster-presence-refactor 2011-02-24 02:37:21 +00:00
Marck af22b7cb1a GetRegion(s)ByName with SQLite behaves like it does with other databases.
The in-memory storage of region data that is used by default with SQLite now handles wildcards in region names in the same way as SQL queries do with other databases.
2011-02-22 13:00:45 +01:00
Justin Clark-Casey (justincc) 754c244f46 In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row from the data adaptor's Rows list in addition to calling Delete.
This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication).
Probably a holdover from copying code from the older legacy adaptor.
Resolves http://opensimulator.org/mantis/view.php?id=5361
2011-02-11 23:06:14 +00:00
Melanie e2762a68b3 Merge branch 'master' into careminster-presence-refactor 2011-02-12 00:42:10 +00:00
Melanie f3968c4959 Merge branch 'master' into careminster-presence-refactor 2011-01-18 06:18:10 +00:00
Melanie 06e225bc0b Also fix MySQLXInventoryData 2011-01-18 01:31:14 +00:00
Melanie 75644e0f6e Prevent activation and deactivation of gestures from clobbering the slam
bits
2011-01-18 01:26:42 +00:00
Melanie 4f8ba53f86 Prevent activation and deactivation of gestures from clobbering the slam
bits
2011-01-18 00:55:08 +01:00
Diva Canto 72748746d5 Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB. 2010-12-05 19:43:24 -08:00
Melanie 45314c6622 Merge branch 'master' into careminster-presence-refactor 2010-12-06 02:54:51 +00:00
Melanie e05f728b08 Merge branch 'master' into careminster-presence-refactor 2010-11-27 01:08:12 +00:00
Marck 7c02d5cec5 Another attempt at fixing failing test for creator info. 2010-11-26 23:04:31 +01:00
Melanie ee9aca9c52 Add the ability for gods to impersonate users. For this, bit 6 needs to be
set in the target's UserFlags and the impersonator must have UserLevel 200
or above. The user can then log in using the target's name and their own
password.
2010-11-25 20:34:55 +01:00
Melanie 2c1c04119d Merge branch 'master' into careminster-presence-refactor 2010-11-25 01:24:32 +00:00
Diva Canto a4bf6c5343 Attempt at fixing failing test. 2010-11-23 07:44:42 -08:00
Melanie 6557d5f359 Merge branch 'master' into careminster-presence-refactor 2010-11-23 14:05:09 +00:00
Marck ba2bf78dcf Fix joining land parcels not being stored correctly in SQLite. Thank you to goetz for the initial patch in Mantis #5230. 2010-11-23 11:45:12 +01:00
Melanie 22ff06ba17 Merge branch 'master' into careminster-presence-refactor 2010-11-22 01:09:26 +00:00
Diva Canto c617d658dd Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
Diva Canto af8c8197ab Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still used?!? 2010-11-21 13:29:20 -08:00
Diva Canto 51343caeb5 Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of SOP.CreatorID. Untested, but should work. 2010-11-21 13:27:03 -08:00
Diva Canto 6a9ae9e7cb Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
Melanie 5f8ab9f018 Merge branch 'master' into careminster-presence-refactor 2010-11-03 02:34:36 +00:00
Melanie 6c3b7617b0 Add lsClearWindlightScene() to the lightshare module to remove WL settings
from a region and allow normal day cycles to be reestablished
2010-11-03 02:31:43 +00:00
Melanie 4ab9d37a8e When LightShare is enabled, the standard day cycle is bypassed and replaced by
midday defaults when no specific LightShare profile is set.
This prevents LightShare info being send out when the region has no LightShare
profile, allowing normal day/night cycles to happen.
2010-11-03 02:04:17 +00:00
Melanie 26f12f479f Merge branch 'master' into careminster-presence-refactor 2010-11-02 22:58:33 +00:00
Melanie e98d8d500f Fix logins and avatar appearance. Contains a Migration. May contain nuts.
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
2010-10-30 19:06:47 +01:00
Melanie 551015db63 Alphabetize results on region search by prefix matching 2010-10-18 20:29:00 +01:00
Melanie bb7a755cba Merge branch 'master' into careminster-presence-refactor 2010-10-18 20:30:46 +01:00
Melanie 2be93066da Bump migration version on LastSeen field so it is actually run 2010-10-18 19:08:26 +01:00
Melanie 46e5c8e919 Merge branch 'master' into careminster-presence-refactor 2010-10-16 10:52:56 +01:00
Diva Canto e039a8c8c2 UPdated the MySql driver to 6.2.4. Also established a much larger MySqlCommand timeout on fetching prims. 2010-10-15 15:43:06 -07:00
Justin Clark-Casey (justincc) aa60c4b129 fix build break 2010-10-13 22:18:57 +01:00
Melanie Thielker ccd5610997 Correctly update the LastSeen field 2010-10-13 18:41:09 +01:00
Melanie Thielker 01728fb19e Ensure no UUID.Zero region ID is ever written to presence. Add a Migration
to add a LastSeen field of type "Timestamp" to Presence for MySQL
2010-10-13 18:40:33 +01:00
Melanie d8149373c1 Merge branch 'master' into careminster-presence-refactor 2010-10-06 00:27:10 +01:00
Jeff Ames bc9f793a92 Formatting cleanup. 2010-10-04 21:28:17 -04:00
Melanie 4fbdcb95a0 Merge branch 'master' into careminster-presence-refactor 2010-09-25 06:19:26 +01:00
Teravus Ovares (Dan Olivares) acd5bbdb71 * One more item for CSharpSqlite
* Hopefully this will enable mac people to use SQLite again
* Someone cooler then me will need to figure out how to define CSharpSqlite with Mono so the conditional will pick up.
* There's also an error that occurs when you first load OpenSimulator under CSharpSQLite that goes away after.
* The databases are not byte for byte compatible.  Mono.Data.Sqlite is able to read CSharpSqlite made databases but not the reverse way.
2010-09-23 01:45:54 -04:00
Teravus Ovares (Dan Olivares) 983c6a74b1 * Add CSharpSqlite to prebuild
* Use a conditional define to determine whether we're using CSharpSqlite or Mono.Data.Sqlite
#if CSharpSqlite
    using Community.CsharpSqlite.Sqlite;
#else
    using Mono.Data.Sqlite;
#endif
* Hopefully, this will restore sqlite functionality on a Mac.  In visual studio, you can edit the OpenSim.Data.SQLite project, go to the Build tab and enter CSharpSqlite in the box.  I'm not sure how to define CSharpSqlite in Mono, someone better at it then me will have to take the job of figuring out the best way to define it in Mono.
2010-09-23 01:21:08 -04:00
Melanie 9feef34a81 Merge branch 'master' into careminster-presence-refactor 2010-09-21 04:03:14 +01:00
Justin Clark-Casey (justincc) a22f007246 Improve the explanative text of migration failures
When running for the first time, people see migration failures because of sql statements that are trying to move data from old tables (e.g. users).  The amended text attempts to calm their nerves.
2010-09-18 03:37:10 +01:00
Melanie 7df4383235 Merge branch 'master' into careminster-presence-refactor
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
2010-09-17 03:49:30 +01:00
John Hurliman 860b2a502f Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection 2010-09-16 17:30:46 -07:00
Melanie 6a1ce17cdb Merge branch 'master' into careminster-presence-refactor
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
John Hurliman c03b24cbfd Merged 2010-09-12 14:21:51 -07:00
John Hurliman 0db1ed0b5a * Added ISimulationDataService and IEstateDataService
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
Jeff Ames f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
Jeff Ames 20cd1da6bf Add copyright headers. 2010-09-12 12:54:31 -04:00
John Hurliman e2544584ad Changed all string references of "IRegionDataStore" to "ISimulationDataStore" 2010-09-11 22:02:34 -07:00
John Hurliman 109b517583 Fixed the naming mess around data connectors for simulation data 2010-09-11 20:43:06 -07:00
John Hurliman 47ac9f97b1 Re-enabled asset last access time logging in MySQL 2010-09-11 18:29:38 -07:00
John Hurliman dd277a0d02 First pass at cleaning up thread safety in EntityManager and SceneGraph 2010-09-10 12:04:12 -07:00
Melanie 3284356bba Merge branch 'master' into careminster-presence-refactor 2010-09-07 01:48:00 +01:00
Justin Clark-Casey (justincc) 3d033520fa Fix deletion persistence when freshly delinked prims are removed
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is not required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.

Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:43:20 +01:00
Justin Clark-Casey (justincc) 11f4a65f42 Fix deletion persistence when freshly delinked prims are removed
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.

Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:12:06 +01:00
Melanie Thielker 6a0a878f7c Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
2010-09-05 14:28:33 +01:00
Melanie Thielker e593607171 Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
2010-09-05 14:16:42 +02:00
Melanie 4e0d6e8e41 Merge branch 'master' into careminster-presence-refactor 2010-09-03 03:37:18 +01:00
Justin Clark-Casey (justincc) b9db495d91 Fix sqlite migration problems by moving migrations in 019_RegionStore.sql and 020 into RegionStore.migrations
This shows that panda is still not running the sqlite database tests since this change fixes the test failure in that area when "nant test" is executed locally
2010-09-01 22:06:56 +01:00
Melanie 79bfa275da Merge branch 'master' into careminster-presence-refactor 2010-08-30 02:30:28 +01:00
Melanie eefb207c1b Fix a casting operation to use ToString() 2010-08-30 02:10:11 +01:00
Jonathan Freedman 0a83fde85c Implements parcel media setting persistence and packet / CAPS handling
properly for the new media settings.

Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 02:07:55 +01:00
Justin Clark-Casey (justincc) 692cf3c657 Remove parts locking from data classes since these are using a copy of the scene object 2010-08-26 00:17:26 +01:00
Justin Clark-Casey (justincc) 8031f8ec09 Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking 2010-08-26 00:08:53 +01:00
Melanie fc8d2be632 Merge branch 'master' into careminster-presence-refactor
This was rather conflicted. Please test linking.
2010-08-26 00:11:07 +01:00
Melanie 252e159340 Merge branch 'master' into careminster-presence-refactor 2010-08-25 23:22:23 +01:00
Justin Clark-Casey (justincc) 289c21099c Add automated test at the opensim 'api' level to check that a given item goes to the correct directory
Also removes some mono compiler warnings
2010-08-24 16:50:31 +01:00
Melanie Thielker f58a809536 Skip conversion if fields that are null in the database. This may
uncover errors elsewhere.
2010-08-19 11:45:56 +01:00
Melanie Thielker 0344395776 Skip conversion if fields that are null in the database. This may
uncover errors elsewhere.
2010-08-19 12:01:40 +02:00
Melanie e74809ff4c Merge branch 'master' into careminster-presence-refactor 2010-08-18 00:59:20 +01:00
Marck 30d0bf4207 Fix SQLite database plugin for UserAccountData queries with a single word. 2010-08-15 17:27:06 -07:00
Justin Clark-Casey (justincc) 39a748b47a refactor: Use SOP.Flags rather than SOP.ObjectFlags 2010-08-13 20:23:53 +01:00
Diva Canto 7741143fb5 Enforce DB limits on region name to 32 chars, or else (not good). Removed a piece of code from Hyperlinker that didn't work anyway. Shortened the hyperlink region name. 2010-08-10 11:17:38 -07:00
Melanie c2e5d1d203 Merge branch 'master' into careminster-presence-refactor 2010-08-10 19:49:35 +01:00
Justin Clark-Casey (justincc) 3b26baf282 Even if all data migratios are up to date, still print the current revision to the log 2010-08-09 22:54:13 +01:00
Melanie 321e1148da Merge branch 'master' into careminster-presence-refactor 2010-08-08 18:24:33 +01:00
Melanie a5e4a2bb3b Add distance sort for null, too 2010-08-08 18:18:42 +01:00
Melanie Thielker 1f25b9e8db Thank you, Marck00, for a patch that implemented region distance sorting
for fallback regions. Applied with changes.
2010-08-08 17:37:50 +01:00
Melanie Thielker 1cde77293e Thank you, Marck00, for a patch that implemented region distance sorting
for fallback regions. Applied with changes.
2010-08-08 17:51:43 +02:00
Melanie 26387252f5 Merge branch 'master' into careminster-presence-refactor 2010-08-06 18:08:40 +01:00
Justin Clark-Casey (justincc) 1270727c96 Merge branch 'moap' 2010-08-06 18:29:30 +01:00
Justin Clark-Casey (justincc) 7f3f1bfe88 fix mysql/mssql prim serialization problem 2010-08-04 20:23:18 +01:00
Justin Clark-Casey (justincc) 2a0254f2da Implement MediaUrl persistence for MySQL and MsSQL
Not sure how I forgot this.  This may resolve problems with media textures not persisting over restart for these databases.
2010-08-03 17:54:40 +01:00
Justin Clark-Casey (justincc) 9d8a67fe13 get rid of PrimitiveBaseShape.MediaRaw staging post
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
2010-08-03 16:26:27 +01:00
Melanie 5f94b98cb2 Merge branch 'master' into careminster-presence-refactor 2010-08-01 18:00:04 +01:00
Diva Canto c4ecbd1fb1 White space from previous commit. 2010-07-31 16:40:58 -07:00
Marck f91ec19224 Implemented console command "show hyperlinks". 2010-07-31 16:38:23 -07:00
Justin Clark-Casey (justincc) 109ddd1bd5 add mssql support for media on a prim
compiles but not tested.  please test and correct if necessary!
2010-07-26 23:34:23 +01:00
Justin Clark-Casey (justincc) 849fc0483f add mysql support for media on a prim 2010-07-26 23:34:23 +01:00
Justin Clark-Casey (justincc) 412fed975f relocate serialization code from SQLiteRegionData to MoapModule using load and save events.
This is better modularity.  It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields.  MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
2010-07-26 23:34:23 +01:00
Justin Clark-Casey (justincc) afdbeba4e4 Put a wrapper around the media texture region serialization
THIS WILL BREAK EXISTING MEDIA TEXTURE PERSISTENCE.  Please delete your existing sqlite databases if you are experimenting with this branch.
This wrapper will make it easier to maintain compatibility if the media texture data evolves.
This will also make it easier to store non-sl media texture data.
2010-07-26 23:34:22 +01:00
Justin Clark-Casey (justincc) f872a2af11 add missing regionstore migration file for new fields. D'oh!
this should enable persistence now
2010-07-26 23:34:22 +01:00
Justin Clark-Casey (justincc) fc76ce0f46 fix bug where prim persistence would fail if media had never been set 2010-07-26 23:34:21 +01:00
Justin Clark-Casey (justincc) 43f480864b fix problem persisting when only one face had a media texture 2010-07-26 23:34:20 +01:00
Justin Clark-Casey (justincc) 9682e0c733 Implement media texture persistence over server restarts for sqlite
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-26 23:34:19 +01:00
Melanie 686837d9ed Merge branch 'master' into careminster-presence-refactor 2010-07-20 21:18:27 +01:00
Diva Canto 6afa55d446 Removed a few obsolete mono addin references. Mantis #4854 2010-07-14 14:47:01 -07:00
Melanie 0b74662ce2 Merge branch 'master' into careminster-presence-refactor 2010-07-14 19:53:15 +01:00
Justin Clark-Casey (justincc) 5d83b3f991 comment out obsolete assert that 'item has been passed to another user since it was last set' perms flag was set when a prim item was added to a scene object 2010-07-14 17:53:43 +01:00
Melanie dd14016885 Revamp the permissions propagation. This MAY mess up. Please test.
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:45:16 +01:00
Melanie Thielker 89c1c5c35a Revamp the permissions propagation. This MAY mess up. Please test.
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:40:23 +02:00
Melanie 922e874653 Merge branch 'master' into careminster-presence-refactor 2010-07-11 13:32:10 +01:00
Diva Canto fe60b6783d Hopefully fixes mantis #4852 2010-07-08 16:21:01 -07:00
Tom Grimshaw a5a1df68c2 Provide the interface for StoreAsset to report success or failure 2010-06-28 04:02:33 -07:00
Diva Canto 76d2f0f68e Same patch as before but for SQLite. 2010-06-27 12:40:17 -07:00
Diva Canto b0129b35f8 Added checks to XInventory DB layer to truncate names and descriptions. 2010-06-27 12:37:16 -07:00
Melanie ba38c697e8 Merge branch 'master' into careminster-presence-refactor 2010-06-27 20:05:55 +01:00
Justin Clark-Casey (justincc) d399bd3eb7 minor: fix spelling mistake interupt -> interrupt in migrations
This is for  mantis 4783
2010-06-25 21:18:52 +01:00
Melanie Thielker 3ea4e5ccbe Correctly update the LastSeen field 2010-06-21 23:26:27 +02:00
Melanie Thielker 53905cf919 Bump the migration version, ot it would never happen 2010-06-21 22:15:33 +02:00
Melanie Thielker ab023c6a29 Fix build break 2010-06-21 18:06:46 +02:00
Melanie Thielker 973537f819 Ensure no UUID.Zero region ID is ever written to presence. Add a Migration
to add a LastSeen field of type "Timestamp" to Presence for MySQL
2010-06-21 17:06:05 +02:00
Melanie a3ebd4db3f Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql"
Didn't do what it said on the package!

This reverts commit 8643db3ef0.
2010-06-19 23:45:56 +01:00
Melanie 8643db3ef0 This is a HACK! Downright nasty. For some reason, the devs of the mysql
connector have decided that their vision of timeouts is the only valid one.
This uses reflection to show them the finger. Please test.
2010-06-19 22:48:43 +01:00
Melanie e3432b8f63 Revert "Set command timeout to infinity on migrations"
This reverts commit 51d30fd34a.
2010-06-17 17:48:34 +01:00
Melanie 51d30fd34a Set command timeout to infinity on migrations 2010-06-17 17:43:40 +01:00
Melanie 0b75f759b4 Merge branch 'master' into careminster-presence-refactor 2010-06-16 04:10:55 +01:00
Diva Canto 9c9ce9e8dd * Deleted duplicated migration that was failing anyway.
* Added an error message in initial estate owner creation that makes it clear what needs to happen.
2010-06-14 11:50:42 -07:00
Melanie 6b2d2413f7 Merge branch 'master' into careminster-presence-refactor 2010-06-09 16:48:37 +01:00
Melanie 008e840cf2 Add the BEGIN; I had missed 2010-06-09 16:37:20 +01:00
Melanie 668c3b4062 Re-add Migration version 32, which apparently got dropped completely. 2010-06-09 16:34:18 +01:00
Diva Canto 5c0068723f Changed XInventoryData's CreatorID to a string. 2010-06-08 15:52:26 -07:00
Diva Canto 9b9804a498 * Changed CreatorIDs consistently to varchar(128)
* Deleted redundant migration for assets in SQLite
* Rewrote XInventory migrations in SQLite in the new style
2010-06-08 15:47:14 -07:00
Melanie d2dfbbe339 Merge branch 'master' into careminster-presence-refactor 2010-06-08 00:44:53 +01:00
Melanie a246cbce8d Add a migration to adjust types in the WL table. The new connector likes that
better
2010-06-08 00:37:38 +01:00
Melanie c5878b6610 Merge branch 'master' into careminster-presence-refactor 2010-06-04 21:11:15 +01:00
Justin Clark-Casey (justincc) 75878c8f43 get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
additional tweaks to get this working properly
2010-06-04 20:43:05 +01:00
Justin Clark-Casey (justincc) 86f2339b6e remove estate stuff in sqlite region migrations since this also exists in estate migrations, change Sandbox to sandbox in sqlite region migrations
re-enabling the sqlite data tests revealed these errors!
2010-06-04 18:46:58 +01:00
Justin Clark-Casey (justincc) 5c322335e5 add sqlite database back to database tests
this appears to be okay even though we reuse it between runs without deleting it first.
size of the database appears not to be changing though that could be deceptive
2010-06-04 18:27:16 +01:00
Justin Clark-Casey (justincc) 55040a84a5 Fix bug where prim items were not loaded in the new sqlite database handler
This addresses mantis http://opensimulator.org/mantis/view.php?id=4739
2010-06-04 17:14:12 +01:00
Melanie 97501495eb Merge branch 'master' into careminster-presence-refactor 2010-05-26 17:19:02 +01:00
Melanie 1c7f60ab49 Merge branch 'unitests'
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-26 10:56:24 +01:00
AlexRa 5d65ef2db3 Minor correction to AssetTests.cs
(forgot to change test descriptions, has no effect on running the tests)
2010-05-26 10:25:56 +03:00
Melanie 00737f1c13 Merge branch 'master' into careminster-presence-refactor 2010-05-24 23:40:22 +01:00
Diva Canto 1ab826d67c The 8th migration statement in AssetStore.migrations didn't look right. 2010-05-23 12:22:47 -07:00
AlexRa 57f4729eea Ensured that tests are skipped for wrong conn string, also m_log chng
The base test class now tries to connect to DB, ignores all tests in the
class if unable to.

Also m_log changed to instance field (which in this case shouldn't cause
any problems),  to avoid having to define it separately in each derived
class.  Here I touched things that I don't understand well (using log4net),
so please review this commit.
2010-05-23 12:46:33 +03:00
AlexRa b9b6d9c4ea Removed (unused?) empty SQL files from MSSQL resource dir
There was a whole bunch of these SQL files, all empty and apparently
unused.  Removing them is just a clean-up, if anybody has a reason for these
files to be there, feel free to revert.
2010-05-23 11:48:30 +03:00
AlexRa 05d9ca1b26 MySQL Migrations: Minor correcton to Region/Estate split
(some Estate SQL left behind in the Region migration)
2010-05-23 11:48:28 +03:00
AlexRa 52a3dbd076 MSSQL Migration: CreatorID in InventoryItems changed to VARCHAR(36)
Again, the same thing about potentially having non-GUID CreatorID.
2010-05-23 11:48:25 +03:00
AlexRa 89b7c64b6f Various minor changes in the data tests 2010-05-23 11:48:22 +03:00
AlexRa 9976cb93ce Further corrections to MS SQL stores (now passes all tests)
Besides, AssetData is slightly optimized to StoreAsset in one request
("IF EXISTS() UPDATE ... ELSE INSERT ...")

The main change in the MS SQL Inventory implem. is that it now return
empty list (or whatever) when called with UUID.Zero, which is consistent
with how the code for other DBs work.

I did no changes at all in XInventory, as there is no test set for them.
2010-05-23 11:48:19 +03:00
AlexRa ebc2b6d4f6 Split migrations for RegionStore and EstateStore (see WARNING!)
ok, so the estate stores now want their own migration files, but as it
happened the SQL definition were inside the Region migrations.
It seems better/cleaner to keep each 'store' separately updatable.

WARNING: any editing in the middle of the migration scripts (as opposite
to just appending to them) has the potential of messing up updates of
existing databases.  As far as I can see, this one is (probably) safe,
the worst that could happen is the EstateStore migration silently fail
if the estate the tables are already there.
2010-05-23 11:48:16 +03:00
AlexRa 2537acc04d Unitests: Asset, Estate, Region (the "legacy" one), Inventory
The tests have been modified to work under NUnit 2.4.6
(the one currently used in the project).

They will also work with NUnit 2.5+ as is, but will look better
if you #define NUNIT25 for them.
2010-05-23 11:48:10 +03:00
AlexRa 330ad501a5 Added MS SQL test conn to INI - only as an example, modify before use!!!
NOTE that this INI file is currently loaded as a embedded RESOURCE, which is weird and has a
disadvantage of having to rebuild the Tests whenever the conn strings are changed.
The only reason is that I couldn't figure out a reliable way to put this INI into the correct
dir at runtime. If somebody can do it, that would be cool.
2010-05-23 11:48:08 +03:00
AlexRa 40031e6d37 Removed MySql and SQLite-specific asset test files 2010-05-23 11:48:05 +03:00
AlexRa b1e6e99506 BasicAssetTest.cs replaced by AssetTests.cs
AssetTests: The name has changed to reflect the fact it is no longer a base class,
but the complete asset test for all supported databases.

The test can also check storing of CreatorID, but the feature is
disabled at this commit!
2010-05-23 11:48:02 +03:00
AlexRa 749cf0f6eb Bugfix in tests (must clear db before migrations, not after) 2010-05-23 11:47:59 +03:00
AlexRa f527584ed3 EstateData tests passing on all DBs 2010-05-23 11:47:56 +03:00
AlexRa 94f4c20866 Corrections in RegionTests.cs. It now fully works!
The problem was that some tests relied on prior tests
to leave the DB in a particular state, but the test class
cleared the DB every time. The affected tests have been
merged into one to remove the dependencies.

tested on all 3 Dbs, all tests green.
2010-05-23 11:47:54 +03:00
AlexRa 6322a085b3 Minor corrections in BasicDataServiceTest.cs
(added more functions for cleaning up DB from the
derived tests)
2010-05-23 11:47:51 +03:00
AlexRa 187a98615b MSSQL: added asset_flags, CreatorID to migrations 2010-05-23 11:47:48 +03:00
AlexRa 49f4cc4246 MSSQLAssetData updated to support [CreatorID], [asset_flags] 2010-05-23 11:47:45 +03:00
AlexRa f7bf3facff MSSQLAssetData: fixed some weirdness
Fixed unfinished SQL in FetchAssetMetadataSet, fixed SQL
in UpdateAsset (must not modify ID).

NOT tested!  But apparently shouldn't work worse than the previous version,
esp. the FetchMetadata thing.
2010-05-23 11:47:42 +03:00
AlexRa 7f70ae0ebd All data tests made DBMS-independent 2010-05-23 11:47:39 +03:00
AlexRa 91ad1f4ee7 Added generic base classes for testing database services
These are some generic classes that simplify writing tests
for any of the data connectors and databases. Among other
things, configuring the connection strings is done once,
in a separate resource file.

Tests based on the new BasicDataServiceTest class require
NUnit 2.5 or better.
2010-05-23 11:47:36 +03:00
Diva Canto 213e372253 Cleaned up MySql migrations a bit more, got rid of all old-form migration files. Restored Presence table to its taboo-breaking form. 2010-05-20 20:24:50 -07:00
Melanie a92780fe5f Merge branch 'master' into careminster-presence-refactor 2010-05-21 03:51:58 +01:00
Melanie 859beaf830 Revert one of the previous patches' hunks. The new code looked better, but
was less efficient.
2010-05-20 11:03:38 +01:00
AlexRa ce787a4c41 Series of patches to include creator ID in assets.
Contains a migration.

SQLite: May contain nuts.

The SQLite migration copies the entire asset table. Be prepared for quite a wait. Don't interrupt it. Back up your assets db.

BasicAssetTest checks CreatorID storage, new test for weird CreatorID

(now also checks that non-GUID or empty CreatorID gets stored correctly)

Signed-off-by: Melanie <melanie@t-data.com>
2010-05-20 11:01:51 +01:00
AlexRa d6a6668bd7 Scrambled asset type in BasicAssetTest.cs!
The asset type wasn't in the list of "DontScramble" fields,
so the test assets were stored with randomized type, which
caused exception on reading them.

Also the scrambler was moved from local var to the class level,
so it could be used in the new tests I've added (see the next commit).
2010-05-19 21:50:34 +03:00
AlexRa 64fe823b92 MySQLAssetData.cs now supports asset_flags, CreatorID 2010-05-19 21:50:32 +03:00
AlexRa eacd8d0263 MySQL: added CreatorID, moved asset_flag to migration script 2010-05-19 21:50:30 +03:00
AlexRa accf8c420d SQLite: CreatorID added (and asset_flags moved) to the migration script 2010-05-19 21:49:30 +03:00
AlexRa c6977cbd4d Added CreatorID to SQLite asset data 2010-05-19 21:49:24 +03:00
AlexRa ccee95552f A bit of harmless refactoring in SQLiteAssetData.cs 2010-05-19 21:49:22 +03:00
AlexRa 527a257b9f Kind of fixed Melanie's "Exception(sql)" correction
Throwing an Ex. with SQL command in the message looks weird,
this is a bit better, but I'm still not sure if that's the
proper way to handle.  Also, there is a catch one level up,
so is this one necessary?
2010-05-19 21:49:18 +03:00
Melanie e4b8d76b10 Change appender to deal with line feeds more intelligently.
Change migration error reporting to not truncate the statement when
reporting. It's a bit messier than the old error reporting, but at least
one gets an idea of what could be wrong again. And things look a lot
neater now.
2010-05-19 04:17:56 +01:00
Melanie 0c209a469b Clean up output a bit 2010-05-19 03:48:03 +01:00
Melanie 20642f2f21 Fix the migration message to say "Continuing" again. Remove line feed, which
prevented the full message from displaying.
2010-05-19 03:26:37 +01:00
Melanie 9fa8013ca5 Remove the return that was inserted in the last merge to allow
migrations to continue in the face of an error
2010-05-19 03:07:31 +01:00
Melanie dedc0c0bd4 Revert "Allow migration steps to fail again without bringing down the house"
This reverts commit 167db50259.
2010-05-19 02:47:31 +01:00
Melanie 167db50259 Allow migration steps to fail again without bringing down the house 2010-05-19 02:33:23 +01:00
Melanie 298368dd99 Merge commit 'alex/mssql-estate-bugfix'
This fixes some type conversion bugs and also makes the estate lists
work properly for MSSQL. Strawberry, please check this.

Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 23:39:09 +01:00
Melanie d2bc673667 Make m_log in migrations private. Define new m_log in derived class 2010-05-18 23:33:05 +01:00
Melanie caf61ab7d8 Binary Guids are 16 chars long. Fix parser. 2010-05-18 23:22:30 +01:00
AlexRa deae030145 Some more corrections after MySQL connector update 2010-05-19 02:28:19 +03:00
AlexRa 8a0c5d14d4 All (?) MySQL stores fixed to use DBGuid.FromDB()
This was needed if we want to update to the latest MySQL
connector dll.  It automatically converts CHAR(36) to
Guids, so getting them as strings no longer works.

By using DBGuid.FromDB(), we unlink from any particular
storage format of GUIDs, could even make them BINARY(16)
if we like.

Actually not all MySql units are touched, but the remaining ones don't
seem to be affected (they don't read GUIDs from DB)
2010-05-19 01:33:02 +03:00
AlexRa a27d49b188 Added DBGuids.cs (static func DBGuid.FromDB()
This DBMS-independent function to be used converting UUIDs
from whatever format used in the DB (string/binary/Guid).
This is mostly needed for MySQL, as in MSSQL they are always
UNIQUEIDENTIFIERs and in SQLite always strings (but would look
better if we use it there anyway).
2010-05-19 01:32:50 +03:00
AlexRa d95f232629 Massive bugfix in MSSQLEstateData (now works!) 2010-05-18 21:08:51 +03:00
AlexRa dfeb9a0b5c MS SQL migrations converted to the new format 2010-05-16 17:04:50 +03:00
AlexRa 1ad12851d0 Migrations for SQLite converted to new format 2010-05-16 17:04:39 +03:00
AlexRa ee713cb253 Converted MySQL migration history to the new format
Replaced all NNN_StoreName.sql migration resources with a more
readable, single-file-per-store
2010-05-16 17:04:13 +03:00
AlexRa b49fb3db7c Added MySqlMigrations.cs (supports stored proc/funcs)
Uses MySqlScript class to correctly run proc/func definitions
that need delimiter change. Requires MySql.Data.dll 6.2 or later.
2010-05-16 16:25:08 +03:00
AlexRa 8b6a295874 Migration.cs supports single-file migration history format
Scans for migration resources in either old-style "scattered" (one file per version)
or new-style "integrated" format (single file "Resources/{StoreName}.migrations[.nnn]") with ":VERSION nnn" sections).
In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
that must be sent to the server separately.  The old-style migrations are loaded each in one piece
and don't support the ':GO' feature.

Status:  TESTED and works fine in all modes!
2010-05-16 16:22:38 +03:00
Melanie fada4cb6c4 Merge branch 'master' into careminster-presence-refactor 2010-05-10 04:05:04 +01:00
Diva Canto 6f2f0fa0ca OK, this really fixes it, I promise. 2010-05-09 14:12:59 -07:00
Diva Canto 9cf6b81256 Yey for unit tests. The previous commit had a couple of bugs on SQL statements. Fixed here. 2010-05-09 14:02:02 -07:00
Diva Canto b233a4b2ca * Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
Melanie 6a3e1734e6 Merge branch 'master' into careminster-presence-refactor 2010-05-09 18:03:57 +01:00
Melanie bc6995f921 Add Delete handler to SQLite (NG) 2010-05-09 18:02:36 +01:00
Melanie 60357d3778 Implement the "delete" path for assets. Adds a new option to allow remote asset deletion in robust handler. 2010-05-09 17:56:52 +01:00
Melanie 4e0d62547d Merge branch 'master' into careminster-presence-refactor 2010-05-09 17:04:23 +01:00
Melanie 9b22393cf3 Add a field asset_flags and a corresponding enum to the asset database. This
CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS
WITH LATER ONES. It may also eat your babies, yada, yada, yada.
The usual cautions for migrations to the assets table apply.
Coding: Can not guarantee nut free.
2010-05-09 17:02:22 +01:00
Melanie 14fcc2510e Merge branch 'master' into careminster-presence-refactor 2010-05-08 13:31:36 +01:00
Diva Canto 15562017f2 These files are part of the GridUserService write-up. 2010-05-07 21:32:02 -07:00
Diva Canto a58859a0d4 GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
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
Diva Canto 5171464ac1 Justin, I must have been dyslexic when I wrote UserGridService as the name for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere. 2010-03-05 21:36:45 -08:00
Justin Clark-Casey (justincc) e906dd3d28 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
2010-03-05 22:29:51 +00:00
Justin Clark-Casey (justincc) e39fc95659 Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
2010-03-05 00:54:46 +00:00
Justin Clark-Casey (justincc) 82cccdeb94 minor: comment out a forgotton debug log line 2010-03-04 22:50:02 +00:00
Justin Clark-Casey (justincc) a1643c78be remove test presence from NullPresenceData since this appears to stop existing sessions with home locations from being picked up
only tested for a single user so this may still fail for multiple users
this may well be all academic anyway since standalone need to persistently store home location in presence data in some way
2010-03-04 22:43:30 +00:00
Melanie 028a87fe37 Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
Diva Canto 763285aaf1 Fixed SQL tests. 2010-03-02 07:29:41 -08:00
Melanie bef311dfb9 Merge branch 'master' into presence-refactor
This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor
branch remains for experimental work.
2010-03-02 04:46:13 +00:00
Diva Canto 53a8286468 Changed the query in GetFriends in SQLite to match the one in MySql. 2010-03-01 21:35:46 -08:00
Jeff Ames 780ee4f991 Fix a few compiler warnings. 2010-03-01 23:04:45 +09:00
Melanie bfcc57c071 Change friends to handle offers as it was originally designed. This may
need to be changed in SQLite & MSSQL as well
2010-03-01 00:02:14 +00:00
Diva Canto 774958bbbf Added FriendsData to both Null storage and SQLite. Untested. 2010-02-28 16:09:06 -08:00
Melanie 92029dc171 Remove some obsolete files from MSSQL. Fix a missing constructor arg that
was introdiced by the latest jhurlipatch
2010-02-24 16:00:06 +00:00
StrawberryFride 2fa5694ec9 MSSQL Additions for Presence Refactor branch. Most functionality tested and works, some outstanding issues around login location and border crossings on y axis.
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-24 15:50:44 +00:00
John Hurliman df76e95aa2 Changed asset CreatorID to a string 2010-02-22 14:18:59 -08:00
John Hurliman 71c6559a91 Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor 2010-02-22 14:10:19 -08:00
John Hurliman 7665aad002 * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it 2010-02-22 13:27:17 -08:00
Melanie 1f45e6c649 Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
Diva Canto 70de6956ff Small bug fixes for making tests work. 2010-02-21 18:56:44 -08:00
Diva Canto b92645ac56 MySQL tests pass, except T016_RandomSogWithSceneParts. Total mystery as to why that test doesn't show in panda. 2010-02-21 17:59:00 -08:00
Diva Canto bb171717ce Deleted obsolete files in the Data layer. Compiles. 2010-02-21 15:38:52 -08:00
Diva Canto bd5a4dab0c Bug fixes on field names in order to make data import work from old users table to new UserAccounts table. 2010-02-21 09:39:12 -08:00
Diva Canto 552e9e8c78 * Added SQlite connector for AvatarData. Tested -- works.
* Small bug fix in debug message
* Set default standalone configs to use SQLite across the board
2010-02-21 09:09:35 -08:00
Diva Canto 8a4947f8c7 SQLite connector for UserAccounts and Auth works. Yey! 2010-02-21 08:47:24 -08:00
Diva Canto 56fb7821ad Restored mising m_Connection. 2010-02-20 21:24:18 -08:00
Melanie d761d1624b Fix SQLite locking and make it more fascist for now 2010-02-21 04:20:22 +00:00
Diva Canto 611eeb583c Reverted SQLite/SQLiteGenericTableHandler to what it was + singleton. 2010-02-20 20:59:04 -08:00
Diva Canto df59d098b3 SQLite connector better, but access to tables still doesn't work. 2010-02-20 20:13:38 -08:00
Diva Canto 0ab6aac052 Added UserAccountData and auth to the SQLite connector. Compiles, runs, but access to these tables doesn't work. 2010-02-20 17:52:38 -08:00
Justin Clark-Casey (justincc) 4355bcc417 Disable Data.BasicRegioNTest.T016_RandomSogWithSceneParts() temporarily since it's making the tests fail but the cause is not obvious (wrapped up in layers of reflection) 2010-02-16 19:31:49 +00:00
Melanie c033223c63 Merge branch 'master' into presence-refactor 2010-02-15 00:20:48 +00:00
Diva Canto d326a1df3f Extraneous debug messages removed 2010-02-14 17:01:22 -08:00
Diva Canto dc19785672 Added UserAccount, Avatar and Authentication to Data.Null, so that OpenSim can run out-of-the-box. #WaitingForSQLite 2010-02-14 16:57:02 -08:00
Melanie 2084e08ad7 Merge branch 'master' into careminster 2010-02-14 22:27:39 +00:00
Teravus Ovares (Dan Olivares) 45493171b0 * SQLite match code casing with regionsettings table field casing (what's with the upper case S in Sandbox while the rest is lower case 0.o)
* It's doubtful that this will have any effect on mantis http://opensimulator.org/mantis/view.php?id=4577 .   Sqlite 3 is required, Sqlite 2 was reported.
2010-02-13 05:50:57 -05:00
Teravus Ovares (Dan Olivares) fa6da2f6c6 * This is an attempt to resolve mantis 4437 by using SqliteAdapter type statements instead of blanket SQL statements. The hope is that this makes SQLite work on Linux/Mono again. Re: http://opensimulator.org/mantis/view.php?id=4437
* Added a 'Create Update Statement' method that takes two fields for a primary key
* Added an Update and Delete command for parcels and land access list table rows.
2010-02-13 05:09:15 -05:00
Justin Clark-Casey (justincc) 802a969267 Fix http://opensimulator.org/mantis/view.php?id=4224
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache.  However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
2010-02-12 21:32:03 +00:00
Melanie 1dfcf68330 Add the friends service skel and correct some namespace issues 2010-02-09 07:05:38 +00:00
Melanie 0ad8046582 Resolve a merge issue 2010-02-08 22:44:17 +00:00
Melanie c8f3bb56ff Merge branch 'master' into careminster 2010-02-08 22:11:38 +00:00
Melanie ef8b2d2f90 Convert null presence data to a singleton as well. Standalone logins now work 2010-02-08 21:38:49 +00:00
Melanie d8bab61af4 Convert NullRegionData to a singleton pattern, since that is required
for a standalone
2010-02-08 21:24:04 +00:00
Melanie 210649f0d4 Make an exception report more clear. Fix a database access in Presence to
conform to the changes in the generic table handler.
2010-02-08 17:38:05 +00:00
Melanie baaf660511 Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
Melanie c6adbccc27 Finish the "Get friends" method 2010-02-07 12:06:00 +00:00
Master ScienceSim e1b5c61247 Updated MySQL connection management to use the MySQL connection pooling. This should accommodate various timeout problems that exist with the current connection pool code in a more general and standard way. 2010-02-05 18:07:59 -08:00
OpenSim Master 5f1f5c29e9 Fixing an incorrect logging message in insertUserRow 2010-02-05 18:06:01 -08:00
OpenSim Master 3e697ad57e * Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null 2010-02-05 18:05:57 -08:00
John Hurliman e251f42443 Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor 2010-02-05 17:46:37 -08:00
OpenSim Master 310e14cf03 Fixing an incorrect logging message in insertUserRow 2010-02-05 17:45:36 -08:00
OpenSim Master e982397cde * Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null 2010-02-05 17:45:31 -08:00
Melanie b92cb6126d Implement the friends data adaptor 2010-02-05 12:31:29 +00:00
Melanie 776d62b9c6 Merge branch 'master' into careminster 2010-02-04 17:29:33 +00:00
Melanie f9a61f2825 Some interface and data structure changes, add the missing method in friends 2010-02-04 10:51:36 +00:00
Justin Clark-Casey (justincc) b9c3846e81 minor: remove some mono compiler warnings 2010-02-03 22:19:28 +00:00
Diva Canto bb736cee6b Beginning of friends. 2010-02-01 16:05:59 -08:00
Diva Canto 35a245b67a Assorted bug fixes related to hyperlinking 2010-01-31 22:35:23 -08:00
Diva Canto 22a3ad7f6c * Bug fix in XInventoryData -- groupOwned is an int in the DB
* Bug fix in InventoryServerInConnector -- m_config
2010-01-31 11:26:12 -08:00
Melanie fe5d80a285 Add a Hyperlink flag to the regions table 2010-01-19 04:17:27 +00:00
Diva Canto 5ce12c92d9 Fixed a missing field in the last regions table migration. 2010-01-16 08:32:32 -08:00
Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
Melanie 0d5f182c02 Add a handful of new region flags and a small migration 2010-01-15 21:13:57 +00:00
Melanie 78e9dc7c2c Add a "LockedOut" flag to allow locking a region out via the grid server.
This flag prevents registration of a known region
2010-01-10 04:23:23 +00:00
Melanie 9727e3d66b Add "Persistent" flag to regions table flags values 2010-01-10 02:44:57 +00:00
Melanie e189b3056f Add last_seen field to regions table 2010-01-10 02:13:55 +00:00
Melanie 28d6705358 Preliminary work on the new default region setting mechanism 2010-01-09 20:46:32 +00:00
Melanie d22bdb5095 Merge branch 'master' into careminster 2010-01-09 12:02:48 +00:00
Melanie d14589d1ab Add migrations to add fields to user and auth tables 2010-01-08 18:10:59 +00:00
Melanie 28ba16ee53 Add the port of the XInventoryService for the new Sqlite framework 2010-01-05 00:35:54 +00:00
Melanie 033a3da254 Sqlite framework and generic handler. They compile. More I cannot say. 2010-01-04 23:30:38 +00:00
Melanie 7f960cd595 Merge branch 'master' into presence-refactor 2010-01-04 21:41:33 +00:00
Melanie 1ae9bfc074 Finish conversion if XInventoryService 2010-01-04 20:53:28 +00:00
Melanie e76333555d First stage port of the XInventoryService 2010-01-04 20:53:26 +00:00
Melanie 0907d5d69e Finish conversion if XInventoryService 2010-01-04 20:52:44 +00:00
Melanie 53d3f46add First stage port of the XInventoryService 2010-01-04 18:47:47 +00:00
Melanie d4d55b4f4b Add the data service 2010-01-04 02:53:22 +00:00
Melanie 6e8d94685d AvatarStore. Untested, but complete 2010-01-04 02:52:43 +00:00
Melanie 791c6188fd Some work on avatar service. Retrieval and storage done 2010-01-04 02:07:31 +00:00
Melanie 3c18c0189a Avatar appearance skeleton 2010-01-04 00:56:39 +00:00
Melanie 61ce884336 Merge branch 'master' into careminster 2010-01-03 21:43:39 +00:00
Jeff Ames 70d5b1c34c Formatting cleanup. Add copyright headers. 2010-01-04 06:17:30 +09:00
Diva Canto 4240f2dec6 New LL login service is working! -- tested in standalone only. Things still missing from response, namely Library and Friends. Appearance service is also missing. 2010-01-01 16:54:24 -08:00
Melanie 0d9591bf35 Prevent the creation of duplicate inventory folders in the case of a login
database issue. Now the login will instaead fail later.
2010-01-01 22:51:00 +00:00
Diva Canto c540c93b54 Auth data migration. 2010-01-01 08:45:41 -08:00
Melanie 61f63fdc38 Put PassCollision on the ignore list for testing, since we don't save that
yet.
2009-12-31 23:51:53 +00:00
Melanie 01f6aee020 Implement avatar picker queries 2009-12-31 02:26:00 +00:00
Melanie 99ad7aac7f Implement saving user account data 2009-12-31 01:34:03 +00:00
Melanie bda18c33fd Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor 2009-12-30 22:23:58 +00:00
Melanie b6097ae9a8 Some modifications to user service. Query by name is implemented now 2009-12-30 22:23:17 +00:00
Diva Canto 1d2a332b96 Unit tests for presence. They helped fix a couple of wrongnesses. 2009-12-30 14:17:18 -08:00
Diva Canto 28516e2648 Fixed a couple of bugs that were bombing the data migration. 2009-12-29 16:51:59 -08:00
Diva Canto 6eb5754f5a Polished the IUserService interface. 2009-12-29 13:27:21 -08:00
Melanie 8631cea215 Change the interface a bit before someone depends on it's current form 2009-12-29 20:14:26 +00:00
Melanie 18ca978b81 Give the new user tables the once-over. Strip the current set of methods
from IUserAccountService, we need to define what goes in there. Change
the handler to the generic handler. Adjust migrations, add index
2009-12-29 18:31:27 +00:00
Diva Canto e9df86a6d6 * Added useraccount table 2009-12-29 09:22:52 -08:00
Diva Canto c164b85ea6 * Added packing/unpacking of the Home fields in PresenceInfo
* Cleaned up IUserService and beefed up UserAccoutData
2009-12-28 20:26:44 -08:00
Melanie 3249d5be9a Add the indices to really make this table work 2009-12-28 23:47:58 +00:00
Melanie c4f5ac970c Add a migration to add the 3 new fields 2009-12-28 23:45:15 +00:00
Melanie e0fc854f05 Adding new fields and home location methid to presence. Adding cleanup
(deleting all but one presence record) on logout so that they don't pile up.
2009-12-28 23:42:08 +00:00
Melanie 2ed207509b Add the second step of the friends migration to pull data from the old table into the new 2009-12-28 19:12:33 +00:00
Melanie 5b69f58aae Make Migratons continue int he face of an error. This is required for the
friends migration, which MAY error out if the old friends table is not
in the same database as the new one being created. This error is nonfatal,
it would only mean that friends will not be migrated automatically. It would
bite people with nonstandard configurations.
2009-12-28 18:59:38 +00:00
Melanie 397a296492 Add the migration for friends and guard the presence Report function 2009-12-28 18:52:24 +00:00
Melanie 9a8f6c79c9 Forgot the migration file 2009-12-28 17:57:45 +00:00
Melanie 92a40129b5 Database and presence changes. Untested 2009-12-28 17:34:42 +00:00
Melanie 831f759644 Add the MySQL presence data module 2009-12-27 03:05:45 +00:00
Melanie 8b9332e321 Finish the presence service 2009-12-27 03:00:54 +00:00
Melanie ca3aa283ba Merge branch 'master' into presence-refactor 2009-12-27 01:28:15 +00:00
Melanie 982e3ff5d9 Presence Step 1 2009-12-27 01:27:51 +00:00
root a18f4964cf Correct some issues with the last commit 2009-12-27 01:32:23 +01:00
root b7951d5177 Correct some issues with the last commit 2009-12-26 23:57:49 +00:00
Melanie f5c310d9d4 Merge branch 'master' into careminster 2009-12-26 23:39:02 +00:00
Melanie 0369256720 Close a SQL injection loophole in the new database driver 2009-12-26 23:38:11 +00:00
root 43c303e27a Make the GenericTableHandler work as intended 2009-12-26 03:24:46 +01:00
root 92be01d5e6 Make the GenericTableHandler work as intended 2009-12-26 01:50:21 +00:00
Melanie e51be5f4a7 Merge branch 'master' into careminster 2009-12-26 00:21:03 +00:00
Melanie 9972b12812 Add a generic REPLACE INTO handler for put into the generic table handler 2009-12-26 00:19:54 +00:00
CasperW 6dbe25360e Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use. 2009-12-17 18:40:34 +01:00
Kitto Flora 0020afaf67 Merge branch 'master' into tests 2009-12-15 06:01:59 -05:00
Melanie 824d7190c2 Merge branch 'master' into careminster 2009-12-14 00:40:56 +00:00
Adam Frisby 963cf25813 * Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
2009-12-13 03:04:16 +11:00
Kitto Flora b056c243e4 Commit partial work because of repo change 2009-12-12 10:12:59 -05:00
Melanie 204c59c5ac Refix the fix 2009-12-11 02:42:05 +00:00
grid d68b664243 Kill a NRE caused by an error message trying to print unavailable data 2009-12-11 02:42:00 +00:00
Melanie f6b1344722 Refix the fix 2009-12-11 02:40:33 +00:00
grid 5ffd59e7b8 Kill a NRE caused by an error message trying to print unavailable data 2009-12-10 22:09:16 -05:00
unknown d092977f4a Windlight configuration option in ini, and migration 2009-12-09 01:53:41 +01:00
unknown e3f229225c Enable scripting interface for windlight 2009-12-09 01:34:26 +01:00
unknown dbd8c400ce Merge branch 'careminster' into windlight 2009-12-07 18:14:02 +01:00
unknown 29a740ec8c Initial windlight codebase commit 2009-12-07 18:05:40 +01:00
Kunnis 4c61fcfc40 Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-06 03:57:15 +00:00
Justin Clark-Casey (justincc) c58d30616b Log old position and region information when an orphaned child prim is found 2009-12-02 18:54:24 +00:00
Justin Clark-Casey (justincc) 0f745e928f Apply patch that fixes the failing T013_eStateSettingsRandomStorage test
See http://opensimulator.org/mantis/view.php?id=3993
Thanks Kunnis
2009-11-27 18:52:20 +00:00
Adam Frisby b516fe67a0 * Implements SQL Rollback support to Inventory Service for quicker backup restoration.
* Can optionally replace the OpenGridMode committed earlier.
* Will create a series of incrementing restore SQL files, one per user, in folders listed per-day.
* For MySql Section of InventoryService INI:
rollback = "true"
rollbackdir = "/absolute/path/to/rollback/storage/dir"
2009-11-23 17:20:03 +11:00
Adam Frisby 4973c057eb * Adds a modicum of additional checking to the Inventory Service (MySQL only)
* Enable "opengridmode=true" in your Inventory Connector (where the mysql connection strings are) to enable if you are running a 'wide-open-grid'.
* More comprehensive rollback support being implemented, should be available later today.
2009-11-23 16:08:06 +11:00
Jeff Ames 9f5c2acd12 Formatting cleanup. 2009-11-23 11:26:06 +09:00
Melanie 23438e66e7 Implement generic delete method 2009-11-18 08:53:07 +00:00
Melanie 06ecdf1967 Tweak presence handling and whip up a database connector and handler
for testign the new generic table handling
2009-11-18 08:21:28 +00:00
Melanie 0cd3bf074a Change PresenceData to PresenceInfo to remove a naming conflict in the
OpenSim.Data namespace
2009-11-18 06:19:39 +00:00
Melanie 9997790211 Committing the incomplete table handler to get it into the tree. No user
functionality yet
2009-11-15 20:19:19 +00:00
Justin Clark-Casey (justincc) 73b437b7b4 minor: remove some mono compiler warnings 2009-11-12 18:30:32 +00:00
John Hurliman afef1ac191 Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen 2009-11-05 13:10:58 -08:00
John Hurliman de71d23e14 Removing Console.WriteLine()s that were brought in with the revert 2009-11-02 11:54:39 -08:00
John Hurliman 67ac9881fa Removing duplicate SceneObjectPart.RotationalVelocity property 2009-11-02 11:28:35 -08:00
John Hurliman 6309fcc5b4 Reverting the memory leak patch for MySQL. Problems have been reported with the grid server after running for several hours 2009-11-02 11:19:55 -08:00
John Hurliman b498693cff * Tweak to region module loading to check for a matching constructor first instead of throwing and catching exceptions
* Commenting out the MySQL startup sequence that cleans out dropped attachments under the advice that it is no longer relevant. If anything, it could be brought back as a database cleanup console command
* Updated to the latest libomv 0.8.0-pre. UUID.TryParse() will no longer throw and catch exceptions for most failed UUID parses
2009-10-27 01:46:14 -07:00
John Hurliman 730930955a Changing Scene.ForEachClient to use the synchronous for loop instead of Parallel. This is quite possibly the source of some deadlocking, and at the very least the synchronous version gives better stack traces
* Lock the LLUDPClient RTO math * Add a helper function for backing off the RTO, and follow the optional advice in RFC 2988 to clear existing SRTT and RTTVAR values during a backoff

* Removing the unused PrimitiveBaseShape.SculptImage parameter * Improved performance of SceneObjectPart instantiation * ZeroMesher now drops SculptData bytes like Meshmerizer, to allow the texture data to be GCed * Improved typecasting speed in MySQLLegacyRegionData.BuildShape()

* Improved the instantiation of PrimitiveBaseShape
2009-10-25 00:40:21 -07:00
John Hurliman a41cd1d069 * Unregister Mono.Addins event handlers in PluginLoader.Dispose() and always handle PluginLoader with the using pattern. This freed up 121,634,796 bytes on my system
* Avoid allocating an Action<IClientAPI> object every round of the OutgoingPacketHandler
* Removed unnecessary semi-colon endings from OpenSim.ini.example [InterestManagement] section
2009-10-23 13:14:29 -07:00
Melanie d0019704e6 Adding the presence service skeleton 2009-10-23 09:47:45 +01:00
John Hurliman fdce1be3db * Removed OpenSim.Data.NHibernate
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
2009-10-19 16:52:27 -07:00
John Hurliman bd03cbd815 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization 2009-10-19 15:19:37 -07:00
Jeff Ames 0d29614ca1 Formatting cleanup. 2009-10-19 08:58:03 +09:00
John Hurliman b4526a5a6d * Big performance increase in loading prims from the region database with MySQL
* Handle the AgentFOV packet
* Bypass queuing and throttles for ping checks to make ping times more closely match network latency
* Only track reliable bytes in LLUDPCLient.BytesSinceLastACK
2009-10-18 02:00:42 -07:00
John Hurliman e776dfb1d7 * Changing the "clean dropped attachments" MySQL command to a using statement inside a try/catch. This statement times out for me very frequently
* More verbose logging when zerocoding fails on an outbound packet
2009-10-16 13:22:45 -07:00
John Hurliman a18489dc9b * Change appearance packets from State to Task. This will hopefully fix the cloud issues
* Changed the throttling logic to obey the requested client bandwidth limit but also share bandwidth between some of the categories to improve throughput on high prim or heavily trafficked regions
2009-10-16 12:20:01 -07:00
John Hurliman 4790f8576c * Replaced (possibly broken?) math for calculating the unix timestamp in MySQLAssetData with Utils.DateTimeToUnixTime()
* Disabled UpdateAccessTime() function since it was only writing zeros anyways. This gave me a significant performance improvement for startup times and avatar logins in standalone mode
* Load attachments asynchronously so avatars with lots of attachments don't have to race the timeout clock to login
2009-10-14 19:23:44 -07:00
Melanie 09cd2ac443 Stop null values from being returned on database queries 2009-10-12 20:46:19 +01:00
John Hurliman c855806548 Reverting MySQLLegacyRegionData spam 2009-10-06 14:26:00 -07:00
John Hurliman a3a8691ebe MySQLLegacyRegionData: Extreme Spam Edition(tm) 2009-10-06 14:18:37 -07:00
John Hurliman fa6027aa09 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle 2009-10-06 12:15:24 -07:00
Melanie 8a7a947faa Remove the using() constructs from the new style database modules; they caused
the underlying connection of a reader or command to be closed before the
reader or command itself. Added the proper logic to Close and dispose items
in CloseDBConnection. Readers and Connections need Close(), Commands need
Dispose(), in the order Reader, Command, Connection.
Also reinstated 80-column-friendly formatting
2009-10-06 14:30:25 +01:00
John Hurliman e7c877407f * Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet
* Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing
* Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively
* Fixed formatting for a MySQLAssetData error logging line
2009-10-06 02:38:00 -07:00
John Hurliman 6720369376 Added CloseDBConnection() to replace the old CloseReaderCommand(). This will close the MySQLConnection attached to a MySQLCommand. I'm not sure if this accounts for every time a database connection needs to be closed, but it matches up 1:1 with the places where the database connection was previously being closed 2009-10-05 16:39:40 -07:00
Melanie 5702c8f910 Adapt to renamed members in landObject 2009-10-05 16:31:54 +01:00
unknown 7c3e5afc0c MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy up 2009-10-05 16:08:35 +01:00
John Hurliman 29a4614529 * MySQL data tests now pass by fixing a bad fix for a bad cast on the asset Local member in MySQLAssetData
* First pass at applying the using(){} pattern to IDisposable objects. Always use the using pattern on IDisposable objects whenever possible, do not manually call .Close() or .Dispose() unless there is no other way to write the code. This pass mostly covers OpenSim.Data.MySQL, and should have no functional change (tests still pass)
2009-10-04 13:57:51 -07:00
Melanie 6878b26b0d Merge branch 'diva-textures-osgrid' 2009-10-04 05:49:16 +01:00
John Hurliman 387e9f7a7f * Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
dr scofield (aka dirk husemann) 75a42e0459 reducing region DB log spam 2009-10-02 12:05:59 +02:00
dr scofield (aka dirk husemann) 2107b67f1b - cleaning up LandData/ILandObject capitalization issues
- adding LandDataSerializer to OAR mechanics
2009-10-02 11:31:30 +02:00
Diva Canto c8c4b4c505 Switched log level of an annoying message in SQLite to Debug, and commented it too. 2009-10-01 16:39:41 -07:00
Jeff Ames 606e831ff5 Formatting cleanup. 2009-10-01 09:38:36 +09:00
Jeff Ames ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
Jeff Ames f00126dc2d Add copyright header. Formatting cleanup. 2009-09-29 08:32:59 +09:00
Melanie 42746e99bd Make the RegionData plugin store the RegionName 2009-09-27 23:02:40 +01:00
Melanie 12640d0824 Prevent manually setting Data["locX"] and Data["locY"], since that would
overwrite the posX and posY members of the structure
2009-09-27 21:58:34 +01:00
Melanie b5bf3f87d5 Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
	OpenSim/Data/MySQL/MySQLRegionData.cs
2009-09-27 21:25:10 +01:00
Melanie 8e091f5903 Add the Migration for the regions table 2009-09-27 21:17:23 +01:00
Justin Clark-Casey (justincc) 2995d87d75 minor: remove some mono compiler warnings 2009-09-25 19:29:40 +01:00
Diva Canto 6a5d7650d0 All tests pass for MySQL/MySQLRegionData.
Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient.
2009-09-24 18:23:55 -07:00
Diva Canto 1faaa0a43a GridServerPostHandler finished. GridClient tests all work. More guards on getting parameters and replies over the wire. 2009-09-24 15:30:00 -07:00
Diva Canto 1260c81a9c More tests. Seems to be working.
Grid connector modules are enabled for standalones only, but nothing in the simulator uses them yet, so it's safe to go in.
2009-09-23 20:51:04 -07:00
Diva Canto 67276589c8 Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo.
Added grid configs to standalones.
2009-09-23 17:20:07 -07:00
Diva Canto 4a55ff88c0 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-18 19:17:02 -07:00
Diva Canto e736273815 First pass at the grid service. 2009-09-18 19:16:30 -07:00
John Hurliman f42d085ab1 SceneObjectGroup cleanup. Removes the default constructor and unnecessary null checks on m_rootPart 2009-09-16 15:06:08 -07:00
Melanie df7904c58b Add the Null storage implementation for the RegionData service. Standalones
have no regions table, so this is needed
2009-09-16 18:20:08 +01:00
Melanie a251864e64 Add the migration for scoping grid data 2009-09-16 17:56:24 +01:00
Melanie 90a4d4f9f9 Adding the MySQL RegionData service. 2009-09-16 17:52:16 +01:00
Melanie 8622f205d7 Database interface tot the new region store 2009-09-16 17:05:35 +01:00
Justin Clark-Casey (justincc) b061f2a3b0 oops, disable T012_EstateSettingsRandomStorage() again since it does appear to fail occasionally 2009-09-07 18:39:23 +01:00
Justin Clark-Casey (justincc) 116933bee5 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2009-09-07 18:26:53 +01:00
Melanie a6e2e94345 Thank you, StrawberryFride, for a hit-and-run patch to add authentication
and user services to MSSQL
2009-09-06 23:05:06 +01:00
Justin Clark-Casey (justincc) fc8efc1667 T012_EstateSettingsRandomStorage() which wasn't being run because the method was private
test appears to work, so method made public to run in tests
2009-09-06 22:09:19 +01:00
Melanie 2a8f66b221 Revising the user account data interfaces. No user functionality yet 2009-09-06 04:28:42 +01:00
Melanie 67f803c919 Add the new AuthStore to migrations. Update OpenSim.Server.ini 2009-09-04 08:10:05 +01:00
Melanie ac40c7a74c Fully implement unencrypted auth token operations 2009-09-04 07:48:09 +01:00
Melanie c9a24ece54 More work on new authentication service 2009-09-04 03:13:32 +01:00
Melanie 90262d4092 Add the user authentication data adapter. This is meant to use a new table
schema, but can read the old ones for compatibility. It should not be used
to write to the old tables unless you know what you're doing!
This is untested and will probably not work.
2009-09-04 00:23:26 +01:00
Chris Hart c4ae9413f1 MSSQL Minor tweak to recent patch for region loading (Thanks Grumly57 for spotting it!) 2009-09-03 19:07:50 +01:00
Chris Hart 4841858600 MSSQL patch to mirror mantis 4077 for MySQL to improve region load times 2009-09-02 19:42:18 +01:00
Melanie f32de6fe88 Thank you, dslake, for a set of patches to improve OpenSim startup
and idle performance.
2009-09-02 03:33:31 +01:00
Arthur Valadares 604ef5ba79 Fix issue where conversion of temporary boolean variable fails on MySQL 2009-08-21 17:48:45 -03:00
Diva Canto a3db2936f7 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-08-19 17:36:34 -07:00
Diva Canto 6e35ddb0e9 Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in SQlite. Fixes most grief in
http://opensimulator.org/mantis/view.php?id=4035
http://opensimulator.org/mantis/view.php?id=4027
2009-08-19 17:35:42 -07:00
Kunnis b1853d9f26 Fixing a spot I missed in assets. Switching Grid to the new naming schema with Store/Get 2009-08-19 23:46:25 +01:00
Kunnis f1287cc7af * Switching IAssetData to follow the new naming schema, removing the separate insert and update methods. 2009-08-19 23:45:22 +01:00
Jeff Ames 82c888fc6c Add copyright headers. Formatting cleanup. Fix a compiler warning. 2009-08-17 10:29:06 +09:00
Kunnis dd78c250ae * Added Expression based ignores to the PropertyScrambler, which makes a lot of the tests clearer because I'm not constantly resetting properties. 2009-08-16 14:34:16 -04:00
Kunnis 5dde4a4cfa * More improvements to BasicAssetTest.cs 2009-08-16 14:26:43 -04:00
Kunnis d2e5380cb2 * Fixed MySQL/MySQLAssetData.cs to properly do updates * Removed an extra parameter from MySQL/MySQLInventoryData.cs * Fixed a bug in SQLite/SQLiteAssetData.cs that was causing a NRE when updating an asset. * Improved the BasicAssetTest.cs to do full create/update/get testing * Improved the BasicInventoryTest.cs to do full create/update/get of both a folder and an item * Moved the null ref tests to the start of the PropertyCompareConstraint.cs, so that it doesn't throw when passing in a null item 2009-08-16 14:17:29 -04:00
Kunnis f6251ce810 * Modified SQLite/SQLiteInventoryStore.cs to not throw if the inventory row does not exist, to match the mysql behavior. * Modified SQLite/SQLiteRegionData.cs to only persist temporary items following the same rules mysql uses. * Added another ignore to the inventory test that was missing. * Added a few more ignores to the RegionTest that the first version of my test were missing. * Added ignoring the root Folder ID, which is set by the inventory system. * Added several improvements to the PropertyCompareConstraint: Protection against infinite loops, added IComparable<T> (for UUID) and moved IComparable before the property matching. * Fixed a bug where I was saving the inside of the ignore expression instead of the outside of it. 2009-08-16 14:15:59 -04:00
Kunnis 23d478f2fa Adding in Reflection-based testing, to ensure that all properties are covered. 2009-08-16 13:35:44 -04:00
Jeff Ames 2b630470b0 Add copyright headers. Formatting cleanup. 2009-08-16 17:30:13 +09:00
Justin Clark-Casey (justincc) 31820b0026 minor formatting adjustments 2009-08-14 18:36:09 +01:00
Kunnis c18f7560d9 Adding in Reflection-based testing, to ensure that all properties are covered. 2009-08-14 18:15:25 +01:00
Jeff Ames bc6ec3b564 Formatting cleanup. 2009-08-09 00:43:13 +09:00
Teravus Ovares (Dan Olivares) c8a68fb3fb * Remove hard coded 256 limitations from various places. There's no more 256m limitation within the OpenSimulator framework, however, the LLClient ClientView does not support regions larger then 256 meters so, if you try and make your region larger by setting Constants.RegionSize = 512; in OpenSim.Framework.Constants.cs, the terrain will not display on clients using the LLUDP protocol 2009-08-07 18:40:56 -04:00
Sean Dague b0e6d0fc01 skip sqlite tests on z linux, as sqlite doesn't work right on the platform 2009-08-06 14:01:36 -04:00
Teravus Ovares 64bd9a3354 * Updates libOMV to version 0.7.0
* Uses mantis #3811 as a base (thanks jhuliman) with changes.
* E-mail regarding interface changes sent to the opensim-dev list 
* Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html
2009-07-25 15:49:10 +00:00
Justin Clarke Casey 98687df56b * Apply http://opensimulator.org/mantis/view.php?id=3586
* Make MSSQL current in NHibernate
* Thanks mpallari
2009-07-24 20:39:46 +00:00
Justin Clarke Casey a54998e1f9 * minor: spacing adjustment to retrigger panda 2009-07-24 20:27:24 +00:00
Justin Clarke Casey c3bb9ec42c * Apply asset and inventory name and description bound checks to MySQL 2009-07-24 20:01:17 +00:00
Justin Clarke Casey f75949692e * Extend mssql name string size checking to create/update folder 2009-07-24 19:47:15 +00:00
Justin Clarke Casey 92047114ac * Extend inventory name and description length checks to UpdateItem for mssql 2009-07-24 19:41:53 +00:00
Justin Clarke Casey de893a4a10 * Correct minor bug where item description bounded string was not actually being used in the previous patches. 2009-07-24 19:35:16 +00:00
Justin Clarke Casey b67c1f5086 * Apply similar bounds checks on name and description fields on MSSQL UpdateAsset 2009-07-24 19:21:37 +00:00
Justin Clarke Casey a3f4330c87 * Apply http://opensimulator.org/mantis/view.php?id=3902
* Restrict asset and inventory name descriptions so as not to overflow MSSQL field lengths
* Thanks StrawberryFride
2009-07-24 19:10:32 +00:00
Teravus Ovares d54aac41d2 * Added a user friendly message to the sqlite regionsettings saver giving them troubleshooting options and telling them to restart the simulator. This situation, hopefully is temporary and generates an exception when sqlite users first start OpenSimulator because of an unexpected condition in the database layer. Restart and all is well.
* Added a user friendly message to the 'No IInventoryService available' condition with troubleshooting options.
2009-07-10 21:47:54 +00:00
Melanie Thielker 744196d9ba Thank you, StrawberryFride, for a patch to fix MSSQL parameter naming. 2009-07-09 15:14:43 +00:00
Sean Dague fe21189aa4 From: Chris Yeoh <yeohc@au1.ibm.com>
Ooops, sorry there was a bug in the patch and causes an exception
on some system (I think it only happens on windows since it didn't
occur during my testin). I've attached a one liner which fixes the problem.
2009-06-30 13:50:12 +00:00
Arthur Valadares dc9900d73f Thanks StrawberryFride, for a patch that fixes MSSQL migration:
Minor tweak to a region migration SQL script for the OAR DateTime field - SQL Server syntax slightly different from MySQL (and there is no unsigned in MSSQL, sadly)
2009-06-29 19:24:43 +00:00
Sean Dague 3dc2010da6 From: Chris Yeoh <yeohc@au1.ibm.com>
Attached is a patch that changes the oar file saving of creation date/time to an integer
instead of a string. I did this after justincc emailed me saying there is a problem
with internationalisation doing it the old way and I said I'd fix it. Its been
tested with MySQL and I've made the changes for MSSQL but that hasn't been well tested.
2009-06-29 15:05:12 +00:00
Jeff Ames 65d48a5e60 Formatting cleanup, ignore some generated files. 2009-06-22 11:04:09 +00:00
Sean Dague fa54ef5030 more type clean fixes for mono 2.4.2 2009-06-19 00:01:50 +00:00
Sean Dague 96f3001bfb mono 2.4.2 seems a little more type strict, fix some sqlite tests to pass 2009-06-18 23:59:21 +00:00
MW 2755f6b891 Applied patch from Mantis #3817, which fixes a error when using MSSQL. I don't use MSSQL so couldn't test this myself. But there was certainly duplicated instructions in these files...which this patch fixes. Thanks Grumly57 2009-06-18 20:18:47 +00:00
Melanie Thielker 3ee599b900 Add the missing resource files for MSSQL
Mantis #3800
2009-06-17 14:54:25 +00:00
Melanie Thielker 664dd58cd9 Fixes Mantis #3793 . Committing thomax/Snoopy's patch to allow deeding of objects, with changes:
- Set OwnerID = GroupID for deeded objects.
- Close a security loophole that would have allowed a user with deed rights in a group to deed ANY object to that group, even if it's not owned by them and/or not set to that group
- Set LastOwnerID correctly. Handle objects vs. prims correctly.
2009-06-14 21:44:34 +00:00
Charles Krinke 831264fc98 Thank you kindly, BlueWall, for a patch that solves:
SQLite error on creating user.
2009-06-10 17:53:06 +00:00
Jeff Ames a23d64dec1 Formatting cleanup. 2009-06-10 04:28:56 +00:00
Dr Scofield 717fd3b5b9 From: Chris Yeoh <yeohc@au1.ibm.com>
This patch adds oar file date and time (UTC) meta data to an oar file
when it is created.  It also adds a unique ID, though this id does not
in anyway identify the machine that the oar file was created on.

When an oar file with this meta data is loaded this extra information
is saved with the region settings and available via LSL through:

- osLoadedCreationDate()
- osLoadedCreationTime()
- osLoadedCreationID()

If there is no meta data these fields will be blank. Subsequent oar
file loads will erase the information for the previous oar file
load. Persistence has only been implemented for MySQL, the other
backends need updating.

Overall this allows us to much more easily identify the specific version of
software that clients are using. Its very straightforward to edit the oar file
to change the ID string to be something more human friendly.

Included in the patch is a new file OpenSim/Data/MySQL/Resources/030_RegionStore.sql
required for the MySQL DB migration.

btw I had a chat with justincc about this a few weeks ago since he
wrote the oar file import/export and he sounded happy to accept
something that included date/time information but didn't want anything
that would silently leak private information like machine names.
2009-06-03 12:48:04 +00:00
Jeff Ames 840de6c036 Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00
Charles Krinke 2d37ff6fb2 Thank you kindly, StrawberryFride for a patch that:
Added in some key code to read properties from MSSQL for user profiles 
which fixes issues of users having trouble editing estate settings on a 
grid where estate managers are not god, and fixes the option of enabling 
grid god functionality on MSSQL grids.

I have applied this to trunk only. I need someone else to examine and apply
to 0.6.5-Post-Fixes, or give me some direction, please.
2009-05-31 20:53:59 +00:00
Dr Scofield 901fdca13b From: Chris Yeoh <cyeoh@au1.ibm.com>
The attached patch implements llPassTouches. It has been added
to the export/import XML along with the flag for AllowedInventoryDrop.

The MySQL backend has been updated as well, though I haven't
done one of those before so could do with a check. I added
the migration mysql file as well.

The other data backends need updating as well.
2009-05-27 18:01:06 +00:00
lbsa71 ba360ede8b * Upped version number to 0.6.5 2009-05-25 11:43:56 +00:00
Dr Scofield c18c1f6c7c Revert "From: Chris Yeoh <cyeoh@au1.ibm.com>"
This reverts r9666. for some reason the mysql update does not work.
2009-05-25 11:32:31 +00:00
Dr Scofield 0bff818d39 From: Chris Yeoh <cyeoh@au1.ibm.com>
The attached patch implements llPassTouches. It has been added
to the export/import XML along with the flag for AllowedInventoryDrop.

The MySQL backend has been updated as well, though I haven't
done one of those before so could do with a check. I added
the migration mysql file as well.

The other data backends need updating as well.
2009-05-25 11:26:36 +00:00
Jeff Ames ecfad4944b Update svn properties. 2009-05-20 01:02:37 +00:00
Charles Krinke 7a8a481f88 Thank you kindly, StrawberryFride, for a patch that:
Adds maturity & access logic for MSSQL platform to 
mirror that of MySQL as committed in 9502.
2009-05-17 18:18:48 +00:00
Jeff Ames 5cfd84c924 Update svn properties. 2009-05-17 10:26:00 +00:00
Justin Clarke Casey 3791386d4d * Change default sqlite asset db back to Asset.db instead of AssetStorage.db
* This inconsistency has actually existed for some time but only the recent change brought it to light
* In the past, the default in ConfigurationLoader took precedence over the one in SQLiteAssetData
2009-05-15 18:50:38 +00:00
Charles Krinke c1d680b6c3 Thank you kindly, Patnad, for a patch that:
This is to handle the changes in the v1.23 viewer 
of LL regarding the adult rating. With this patch 
a region can be changed to the adult rating from 
LL viewer v1.23 and above.
2009-05-12 03:30:37 +00:00
Sean Dague 51a9c91909 WARNING: contains migration
Since creatorID is no longer treated as a UUID type in the code from the database we need to make sure that it isn't null in the database.  This updates all empty string and null values for this column to the Zero UUID, and makes the column a not null definition with a default fo the Zero UUID.
2009-05-08 14:16:07 +00:00
Sean Dague 3485b2b1c3 now that creatorID is no longer a strict UUID, and the column can still be NULL,
we lost protection from NULL strings.  This puts some protection in for that case.
This may address many of the inventory issues that are being seen intermitently.
2009-05-08 12:28:22 +00:00
Justin Clarke Casey 2284c8509f * Consistently used dashed uuid format for mysql region data, as is done for all other tables
* This revision contains a mysql data migration.  Please backup your mysql region database as a precaution before using this code.
* I also advise that you do a runprebuild[.sh|.bat] and a clean build ("nant clean build" if you're using the command line).
* This change is needed for future id schemes
2009-05-07 14:20:32 +00:00
Justin Clarke Casey e033f4028d * Consistently use dashed uuid format for sqlite region data, as was previously done for sqlite inventory data.
* This revision contains a data migration.  Please backup your sqlite region db as a precaution before using this code
* I also advise that you do a runprebuild[.sh|.bat] and a clean build ("nant clean build" if you're using the command line).
* This change is needed for future id schemes
2009-05-07 13:20:29 +00:00
Justin Clarke Casey c320dca2db * minor: remove some mono compiler warnings 2009-04-29 18:11:41 +00:00
Homer Horwitz 94ab683fe1 Thanks, Ewe Loon for a patch that
provides persistent AvatarAppearance for SQLite.
Fixes Mantis #3296.
2009-04-25 20:55:55 +00:00
Sean Dague de1aef9499 silly C# not letting me use a File.Exists test for a directory. Don't
you know a directory is just a special kind of file on Linux.
2009-04-24 12:40:42 +00:00
Sean Dague fefcb8432f change power linux detection method, the previous method only worked
with interactive logins, not under panda.
2009-04-24 12:06:24 +00:00
Justin Clarke Casey 0d51c22620 * Allow interested user data plugins to store temporary user profiles
* Database and the OGS1 plugins are not interested and hence ignore these calls
2009-04-23 18:57:39 +00:00
Justin Clarke Casey 342126b7b9 * Resolve http://opensimulator.org/mantis/view.php?id=3509 by putting some service initialization into CommsManager
* What is really needed is a plugin and interface request system as being done for region modules
2009-04-22 22:19:43 +00:00
Justin Clarke Casey 4c80685563 * Allow plugins to play nicely in UserManagerBase
* Some methods were returning the value of the first plugin queried, even if the return was null
* Other methods are probably best off querying more than one plugin and aggregating results
2009-04-22 19:26:18 +00:00
Sean Dague e0160e5640 add if exists to the drop table 2009-04-22 19:23:38 +00:00
Sean Dague b0ac6cd0e0 add cleardb to estate tests 2009-04-22 19:11:54 +00:00
Sean Dague 45b90ceef1 ensure we've got a clean data environment prior to running the region
tests
2009-04-22 19:00:40 +00:00
Justin Clarke Casey 2c81e41c8a * Fission OGS1UserServices into user service and OGS1 user data plugin components
* Make OGS1UserServices inherit from UserManagerBase
* This allows grid mode regions to use the same user data plugin infrastructure as grid servers and standalone OpenSims
2009-04-22 18:15:43 +00:00
Sean Dague 5ef6794165 make the asserts spit out messages about their test names 2009-04-13 21:04:50 +00:00
lbsa71 29355de6ee * Some more experimental work on distributed assets. Nothing hotwired yet.
* Introduced preprocess step in FetchAsset (Might revert this later)
  * Some minor CCC
  * Added actual implementation of GetUserProfile( uri ) and the corresponding handler to OGS1.
  * Introduced non-functioning GetUserUri( userProfile) awaiting user server wireup (this might move elsewhere)
2009-04-13 20:04:18 +00:00
Justin Clarke Casey bc515c3241 * Apply http://opensimulator.org/mantis/view.php?id=3439
* This corrects problems seen on some SQLite systems where the migration fails because the two argument substr() isn't implemented
* Thanks RemedyTomm!
2009-04-10 11:34:37 +00:00
Justin Clarke Casey 80ea563bcc * minor: correct some documentation in SQLiteAssetData.cs 2009-04-09 20:07:12 +00:00
Justin Clarke Casey 7f8552fe63 * Change SQLite asset UUID to dashed format to be consistent
* Remaining inconsistent uuids (non dashed) are in region store for sqlite and mysql
* Migration of these will happen at a later date, unless someone else wants to do it
2009-04-09 19:23:19 +00:00
Justin Clarke Casey 67333d48fc * Change UUIDs in SQLite user db to dashed format to match representations elsewhere 2009-04-09 19:01:52 +00:00
Justin Clarke Casey 39c6302972 * Improve inventory uuid conversions to make sure that we aren't converting anything that already contains a -
* Among other things, this means that if a migration is interrupted, it can simply be retried
2009-04-09 18:17:52 +00:00
Justin Clarke Casey b5ba5634fb * Migrate UUID representations in SQLite inventory store to dashed format
* This makes the representation consistent with that most commonly used in the other supported database layers
2009-04-09 16:56:01 +00:00
lbsa71 5572a00295 * Moved the DatabaseTestAttribute to Test.Common, and thus included ref to that in all db tests. *phew* 2009-04-09 16:40:02 +00:00
lbsa71 73ab6bd455 * Thank you, mpallari for a patch that updates NHibernate inventory base mapping.
This fixes mantis #3435
2009-04-09 07:49:16 +00:00
lbsa71 ed33878a0f * tagged some more database tests as such 2009-04-09 07:11:49 +00:00
lbsa71 a707fa7bea * Added custom DatabaseTestAttribute to help separating unit tests from component tests. 2009-04-09 06:42:15 +00:00
Sean Dague 65dcfdf031 SQLite doesn't work on ppc64, so ignore these tests if we are
on this platform
2009-04-08 20:16:23 +00:00
Justin Clarke Casey f3c7298fc5 * Make it possible to store creator strings in user inventory items as well as UUIDs
* All existing functionality should be unaffected.
* Database schemas have not been changed.
2009-04-08 17:50:57 +00:00
Homer Horwitz c44f4add8b Thanks StrawberryFride for a MSSQL patch to mirror r9011.
Fixes Mantis #3409
2009-04-05 18:05:55 +00:00
Homer Horwitz 97fa525f4e Adding migrations for MySQL and SQLite for removing the "old" cloud image.
The new one already in the Library will be reinserted automatically.
Fixes Mantis #964
2009-04-05 17:07:50 +00:00
lbsa71 958d764172 * Upped trunk version number to 0.6.4 as we just tagged 0.6.4-release 2009-04-01 19:44:46 +00:00
Adam Frisby 5225e40f9e * Removes some hard-coded magic numbers relating to RegionSize. We now use Constants.RegionSize as expected. (Working towards enlarged or smaller regionsizes that arent multiples of 256m)
* Adds minor functionality to MRM Scripting.
2009-04-01 05:58:07 +00:00
Melanie Thielker 62fcfe8924 Thank you, StrawberryFride, for a patch that adds offline inventory
functionality to the MSSQL module.
Fixes Mantis #3370
2009-03-31 11:32:30 +00:00
Teravus Ovares 52c482a7a7 * This updates LibOMV to the current release 0.6.0 on March 19 2009
* Important:  HttpServer.dll was changed to HttpServer_OpenSim.dll so that the HttpServer references do not conflict if you've copied the OpenMetaverse.Http.dll and requirements to the OpenSimulator bin folder.
This means that if you reference HttpServer.dll in any projects, you will need to change the reference to HttpServer_OpenSim.dll.   It still uses the Same HttpServer namespace though.
2009-03-27 22:13:09 +00:00
Melanie Thielker 412112acba Committing partial work on passing folders across instances. This may crash. 2009-03-23 00:11:34 +00:00
Melanie Thielker 16a6d60a21 Make offline gives work in SQLite standalones 2009-03-22 18:35:16 +00:00
Melanie Thielker 9b82b52096 MYSQL Only: Make items given while offline appear in inventory without
the need to clear cache.
2009-03-22 16:12:48 +00:00
Melanie Thielker 1121a214b9 Add a QueryItem method to the inventory subsystem. Currently implemented for
MySQL only, stubs for the others. This allows updating the cache with a single
item from the database.
2009-03-21 17:46:58 +00:00
Jeff Ames fb258c5ed9 Update svn properties, formatting cleanup. 2009-03-12 15:28:30 +00:00
lbsa71 33f511ee4b * Another stab at refactoring up the CustomiseResponse function. Two fixes:
* Sometimes, null is a valid return value to indicate 'none found'. doh.
  * Sometimes, the Grid server does not send simURI - this you need to reconstruct yourself. Euw.

(I believe) this solves mantis issue #3287
2009-03-12 10:50:59 +00:00
lbsa71 2133d35831 * Reverted r8750 to do another round of debugging on mantis #3287 2009-03-11 19:19:48 +00:00
Mike Mazur 8606d7d126 Remove chained tests in BasicGridTest.cs.
It's good practice to isolate unit tests so their outcome (pass/fail)
does not depend on whether another test has been run/passed/failed. A
method is used to populate the DB independently for each test, and a
TearDown method cleans up the database after each test.

Also adding extra comment in C-style comment test.
2009-03-11 00:33:34 +00:00
lbsa71 0df0258087 *** POTENTIAL BREAKAGE ***
* Finally got to the point where I could pull up the CustomiseResponse function. Major de-duplication.
* Introduced FromRegionInfo on RegionProfileData
* This revision needs both grid and standalone testing galore.

Work in progress!
2009-03-10 12:11:19 +00:00
lbsa71 1b34b94331 * Refactored out Create() methods to ensure proper transformation between RegionProfileData and RegionInfo
* Created ToRegionInfo method, still not using it pending peer review. 
* This is a preparatory commit for a subsequent login service refactoring.
2009-03-10 09:05:06 +00:00
Justin Clarke Casey ee73d72f1d * Apply http://opensimulator.org/mantis/view.php?id=3280
* Some small syntax and refactoring tweaks for asset and inventory MSSQL
* This means the MSSQL db plugin now requires SQL Server 2005
2009-03-09 18:04:23 +00:00
Mike Mazur a2f07ecd2e Implemented FetchAssetMetadataSet in DB backends.
This method fetches metadata for a subset of the entries in the assets
database. This functionality is used in the ForEach calls in the asset
storage providers in AssetInventoryServer. With this implemented,
frontends such as the BrowseFrontend should now work.

- MySQL: implemented, sanity tested
- SQLite: implemented, sanity tested
- MSSQL: implemented, not tested
- NHibernate: not implemented
2009-03-09 07:29:34 +00:00
lbsa71 5b5b784599 * Got rid of concrete GridDBService references 2009-02-26 11:50:49 +00:00
lbsa71 82efceb494 * renamed IRegionProfileService to IRegionProfileRouter to better reflect use (naming is a work in progress...)
* introduced new IRegionProfileService that is going to be _one_ profileService
* Had GridDBService inherit the IRegionProfileService

(preparing for re-wiring things and de-duplicating eventually)
2009-02-26 11:44:16 +00:00
Justin Clarke Casey 36e648a37a * minor: Remove most mono compiler warnings 2009-02-25 20:53:02 +00:00
lbsa71 41c883ea47 * Refactored SOP.FolderID weirdness by removing calls to empty setter. YEs, I do realize the setter has to be there for legacy reasons, but since the calls will never acually DO anyhting, I'm removing them.
* So, SOP.FolderID is actually a cruft field that should be removed.
2009-02-25 11:01:38 +00:00
Charles Krinke 8f55b9d735 Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
2009-02-22 20:52:55 +00:00
lbsa71 1cadad9ec6 * Applied a patch that: Added estate ban table to migration scripts and nhibernate mapping. Refactored property getters and setters for estate ban object to support NHibernate.
* Added estate ban table to migration scripts of all supported databases.
* Added nhibernate mapping for EstateBans property of EstateSettings
* Refactored property accessors for EstateBan object.
* Added comments for EstateBan properties.
* Ensured that NHibernate tests pass with NUnitGUI.
* Ensured that nant test target passes.  

This fixes mantis #3210. Thank you, tlaukkan!
2009-02-21 09:39:33 +00:00
idb 6119b02860 * Apply http://opensimulator.org/mantis/view.php?id=3185
* Fixes NHibernate problem where prim contents show as textures
* Thanks Tommil!
2009-02-20 22:56:40 +00:00
lbsa71 2e095f5727 * Upped VersionInfo to 0.6.3 and in the process, changed assemblyinfo to 0.6.3.* to better track down dll ref and overwrite problems. 2009-02-20 16:47:31 +00:00
Justin Clarke Casey acf112ac40 * Apply http://opensimulator.org/mantis/view.php?id=3195
* Access NHibernate Manager as read-only property rather than public field
* Thanks Tommil
2009-02-20 14:36:53 +00:00
Jeff Ames 7d4846462b Update svn properties, add copyright headers, minor formatting cleanup. 2009-02-20 02:33:54 +00:00
lbsa71 b99d9bdeb1 * Reverted the AssetServer fix, apparently something was dependent on IAssetDataPlugin being in OpenSim.Data 2009-02-19 19:32:53 +00:00
lbsa71 b5502ef3c3 * Extracted IAssetData and moved it to OpenSim.Framework to prepare to get rid of ugly CoreModules dependency on AssetServer.exe
* And yes, the IAssetDataPlugin is misnomed, which became apparent on extracting it.
2009-02-19 18:40:32 +00:00
Justin Clarke Casey 631e10f269 * Apply http://opensimulator.org/mantis/view.php?id=3151
* Fixes NHibernate overflow exception when saving some objects (under at least PostgreSQL 8.3)
* Thanks Tommil!
2009-02-19 18:31:45 +00:00
Justin Clarke Casey 0760956561 * Apply http://opensimulator.org/mantis/view.php?id=3142
* Changes varchar(36) columns to UUID type in MSSQL - this will be much more efficient
* ===As always, please, please backup your database before applying this patch===
* Thanks Ruud Lathrop (for the patch) and StrawberryFride (for the review)
2009-02-19 18:09:10 +00:00
Melanie Thielker 2d7c15c560 Fix estate ban list persistence in MySQL and reenable tests 2009-02-18 18:48:59 +00:00
Sean Dague 8d23d97084 remove legacy pre-migration code for mysql grid adapter, who knew this
was still in there.
2009-02-18 12:56:28 +00:00
Sean Dague c417a5b619 remove all the very old create and upgrade sql files, these were
outdated by migrations 6 months ago.
2009-02-17 19:06:23 +00:00
lbsa71 93465df5e3 * Moved the nifty MySQLEstateData connectionstring password-stripper out into the Util project 2009-02-17 14:12:57 +00:00
Mike Mazur 76c0935ec7 - remove the Metadata property from AssetBase and return all previous
properties as before
- prefix private variables with m_ in AssetBase.cs
- related to Mantis #3122, as mentioned in
  https://lists.berlios.de/pipermail/opensim-dev/2009-February/005088.html
- all services will likely need to be upgraded after this commit
2009-02-17 01:36:44 +00:00
Justin Clarke Casey 80759f708b * Apply http://opensimulator.org/mantis/view.php?id=3166
* Adds estate access list supports to NHibernate data module
* Thanks Tommil
2009-02-16 19:33:11 +00:00
Sean Dague c7a08752c0 line ending fixes and set native eol property 2009-02-16 19:23:53 +00:00
Mike Mazur ef19d32a39 - remove dependency on OpenSim.Grid.AssetServer.Plugins.Opensim in
OpenSim.Data.*.addin.xml, this is cruft left over from previous
  testing
- fix example SQLite connection string in
  AssetInventoryServer.ini.example
2009-02-16 02:28:00 +00:00
Mike Mazur 9e88cef033 AssetInventoryServer plugins can't be a dependency for the OpenSim.Data.MySQL addin. 2009-02-16 02:25:53 +00:00
Mike Mazur 8d30472551 Rename NewAssetServer AssetInventoryServer and fully qualify with
OpenSim.Grid.AssetInventoryServer.
2009-02-16 02:25:25 +00:00
Mike Mazur b3c0cea024 - add OpenSim.Grid.AssetServer.Plugins.OpenSim as a dependency for OpenSim.Data.*.addin.xml
- remove OpenSim.Grid.NewAssetServer.exe from bin/OpenSim.Data.addin.xml
- add prebuild.xml section for OpenSim.Grid.AssetServer.Plugins.OpenSim.dll
2009-02-16 02:25:15 +00:00
Charles Krinke 38b1f2dbfc Mantis 3164. Thank you kindly, TLaukkan (Tommil) for a patch that:
* Added tests for manager, user and group lists.
* Added test for ban list. The test had to be left as ignored as 
native MySQL throws exception when ban is saved.
* Added utility class to support parametrized unit tests for range checking.
2009-02-14 22:31:39 +00:00
Charles Krinke 3542630478 Remove the "?" that I inadvertently got into the first line
of EstateRegionLink.cs
2009-02-14 20:03:16 +00:00