aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteAssetData.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-281-5/+23
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Add asset name and description truncation warnings to SQLite database plugin ↵Justin Clark-Casey (justincc)2013-02-271-5/+23
| | | | | | | | for consistency.
* | Merge branch 'master' into careminsterMelanie2012-11-151-6/+8
|\ \ | |/
| * More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where ↵Justin Clark-Casey (justincc)2012-11-141-6/+8
| | | | | | | | | | | | possible. Not doing SQLiteInventoryStore since this is no longer used and should disappear in the future.
* | Merge branch 'master' into careminsterMelanie2012-02-211-0/+3
|\ \ | |/ | | | | Conflicts:
| * Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-211-0/+3
| |
* | Resolve merge commits, stage 1Tom2011-09-041-2/+6
|\ \ | |/
| * refactor: Pull up Assembly of the SQLite classes as a protected property, so ↵Marck2011-07-161-2/+6
| | | | | | | | that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is a refactor similar to commit 9923a2ff1002d722ccebea8bf4d71718ed4e2a03 for MySQL -- no functional changes.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-251-1/+6
|\ \ | |/
| * * Add CSharpSqlite to prebuildTeravus Ovares (Dan Olivares)2010-09-231-1/+6
| | | | | | | | | | | | | | | | | | | | * 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.
* | Provide the interface for StoreAsset to report success or failureTom Grimshaw2010-06-281-1/+3
|/
* Revert one of the previous patches' hunks. The new code looked better, butMelanie2010-05-201-3/+10
| | | | was less efficient.
* Added CreatorID to SQLite asset dataAlexRa2010-05-191-15/+27
|
* A bit of harmless refactoring in SQLiteAssetData.csAlexRa2010-05-191-10/+3
|
* Yey for unit tests. The previous commit had a couple of bugs on SQL ↵Diva Canto2010-05-091-1/+1
| | | | statements. Fixed here.
* * Fixed spamming the assets table with map tiles. The tile image ID is now ↵Diva Canto2010-05-091-3/+7
| | | | | | 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.
* Add Delete handler to SQLite (NG)Melanie2010-05-091-15/+16
|
* Implement the "delete" path for assets. Adds a new option to allow remote ↵Melanie2010-05-091-0/+5
| | | | asset deletion in robust handler.
* rename SQLiteNG to SQLite and SQLite to SQLiteLegacyJustin Clark-Casey (justincc)2010-04-301-3/+3
| | | | | | | 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.
* minor: add some documentation around the asset udp request path and replace ↵Justin Clark-Casey (justincc)2010-04-141-1/+1
| | | | some magic numbers with libomv enums
* Changed asset CreatorID to a stringJohn Hurliman2010-02-221-1/+1
|
* * Adds CreatorID to asset metadata. This is just the plumbing to support ↵John Hurliman2010-02-221-1/+2
| | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
* minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-02-031-1/+1
|
* minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-11-121-16/+16
|
* Changing the AssetBase constructors to avoid initializing assets with an ↵John Hurliman2009-11-051-4/+5
| | | | unknown asset type, and log an error if it ever does happen
* Switched log level of an annoying message in SQLite to Debug, and commented ↵Diva Canto2009-10-011-2/+2
| | | | it too.
* * Switching IAssetData to follow the new naming schema, removing the ↵Kunnis2009-08-191-28/+19
| | | | separate insert and update methods.
* * Fixed MySQL/MySQLAssetData.cs to properly do updates * Removed an extra ↵Kunnis2009-08-161-1/+1
| | | | 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
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-011-1/+1
| | | | LICENSE.txt.
* * Change default sqlite asset db back to Asset.db instead of AssetStorage.dbJustin Clarke Casey2009-05-151-2/+2
| | | | | | | * 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
* * Some more experimental work on distributed assets. Nothing hotwired yet.lbsa712009-04-131-1/+1
| | | | | | | | | * 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)
* * minor: correct some documentation in SQLiteAssetData.csJustin Clarke Casey2009-04-091-8/+2
|
* * Change SQLite asset UUID to dashed format to be consistentJustin Clarke Casey2009-04-091-6/+6
| | | | | | | * 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
* Implemented FetchAssetMetadataSet in DB backends.Mike Mazur2009-03-091-0/+50
| | | | | | | | | | | | | 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
* - remove the Metadata property from AssetBase and return all previousMike Mazur2009-02-171-23/+23
| | | | | | | | | 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
* * optimized usings.lbsa712009-02-121-1/+1
|
* - add OpenSim.Framework.AssetMetadata class. AssetBase is now composed of itMike Mazur2009-02-041-23/+23
| | | | | - trim trailing whitespace
* Work in progress on SECS stuff. Have been holding it off until after 0.6 ↵Tedd Hansen2008-11-081-2/+2
| | | | release. Still messy as hell and doesn't really work yet. Will undergo dramatic changes. AND MOST IMPORTANTLY: Will be conformed to work in coop with todays DNE and XEngine, hopefully one day providing a common interface for all components.
* - Add Dispose method to IRegionDataStoreHomer Horwitz2008-09-181-1/+8
| | | | | | | | - Add necessary dummy Dispose-methods where they are missing - Implement the SQLite Dispose-methods (currently only used for unit tests, in the next commit)
* * This is the fabled LibOMV update with all of the libOMV types from JHurlimanTeravus Ovares2008-09-061-5/+5
| | | | | | | * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
* we are now past change 6000, so getting rid of the pre-MigrationSean Dague2008-08-271-81/+0
| | | | | | upgrade cruft
* Formatting cleanup.Jeff Ames2008-08-181-9/+9
|
* Update svn properties. Formatting cleanup. Remove a compiler warning.Jeff Ames2008-07-231-3/+5
|
* add some locks back into the sqlite asset path, as something changedSean Dague2008-07-181-49/+56
| | | | | | | that is causing a lot of out of order execution on asset fetches on multi region sims.
* * remove unused CommitAssets() hook for nowJustin Clarke Casey2008-07-071-13/+0
|
* * Drop InvType from the assets table since it is no longer usedJustin Clarke Casey2008-07-021-8/+4
| | | | | | | | * Migration should be automatic on sqlite and mysql * Migration is not automatic on mssql, you will need to drop the invType column manually * Migration should be fine, but as for any db change, I would recommend making sure you have backups before moving past this revision
* last round of warning squashing. calling it a day now.Dr Scofield2008-06-271-23/+23
|
* Mantis#1591. Thank you graciously, Sempuki for a patch that:Charles Krinke2008-06-271-0/+2
| | | | | | | | | | Currently module loading is done ad-hoc. I propose creating a simple loader class that leverages Mono.Addins (and perhaps the new .NET addins when they become available in mono). Attached is a basic patch for review that compiles into HEAD, but doesn't yet replace any existing ad-hoc loaders.
* Apply patch from bug #1605 -- Documentation for Data/SQLite. Thanks ↵Jeff Ames2008-06-261-3/+65
| | | | kerunix_Flan!
* check in working migration code fore SQLite. This Sean Dague2008-06-111-3/+21
| | | | | | | | is now using migrations instead of the old model to create tables. Tested for existing old tables, and for creating new ones.