Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 12 | -15/+72 |
|\ | |||||
| * | * One more item for CSharpSqlite | Teravus Ovares (Dan Olivares) | 2010-09-23 | 1 | -3/+10 |
| | | | | | | | | | | | | | | * 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. | ||||
| * | * Add CSharpSqlite to prebuild | Teravus Ovares (Dan Olivares) | 2010-09-23 | 12 | -12/+62 |
| | | | | | | | | | | | | | | | | | | | | * 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Improve the explanative text of migration failures | Justin Clark-Casey (justincc) | 2010-09-18 | 1 | -3/+3 |
| | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 5 | -12/+12 |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 5 | -12/+12 |
| | | | | | | | | MapAndArray collection | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 20 | -106/+254 |
|\ \ | |/ | | | | | | | 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. | ||||
| * | Merged | John Hurliman | 2010-09-12 | 10 | -65/+170 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 8 | -61/+58 |
| | | | |||||
| | * | Add copyright headers. | Jeff Ames | 2010-09-12 | 4 | -4/+112 |
| | | | |||||
| * | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 8 | -0/+73 |
| |/ | | | | | | | | | * 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 | ||||
| * | Changed all string references of "IRegionDataStore" to "ISimulationDataStore" | John Hurliman | 2010-09-11 | 3 | -5/+0 |
| | | |||||
| * | Fixed the naming mess around data connectors for simulation data | John Hurliman | 2010-09-11 | 6 | -11/+11 |
| | | |||||
| * | Re-enabled asset last access time logging in MySQL | John Hurliman | 2010-09-11 | 1 | -3/+0 |
| | | |||||
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 2 | -22/+0 |
| | | |||||
| * | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 1 | -0/+2 |
|\ \ | |||||
| * | | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -0/+2 |
| |/ | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 4 | -14/+4 |
| | | | | | | | | on IDwellModule | ||||
* | | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 4 | -14/+4 |
| | | | | | | | | on IDwellModule | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 3 | -14/+14 |
|\ \ | |/ | |||||
| * | Fix sqlite migration problems by moving migrations in 019_RegionStore.sql ↵ | Justin Clark-Casey (justincc) | 2010-09-01 | 3 | -14/+14 |
| | | | | | | | | | | | | 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 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 4 | -4/+48 |
|\ \ | |/ | |||||
| * | Fix a casting operation to use ToString() | Melanie | 2010-08-30 | 1 | -1/+1 |
| | | |||||
| * | Implements parcel media setting persistence and packet / CAPS handling | Jonathan Freedman | 2010-08-30 | 4 | -4/+48 |
| | | | | | | | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 2 | -3/+2 |
|\ \ | |/ | | | | | This was rather conflicted. Please test linking. | ||||
| * | Remove parts locking from data classes since these are using a copy of the ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 4 | -168/+155 |
| | | | | | | | | scene object | ||||
| * | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 4 | -155/+167 |
| | | | | | | | | conditions in linking and unlinking | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 3 | -14/+0 |
|\ \ | |/ | |||||
| * | Add automated test at the opensim 'api' level to check that a given item ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 3 | -14/+0 |
| | | | | | | | | | | | | goes to the correct directory Also removes some mono compiler warnings | ||||
| * | Skip conversion if fields that are null in the database. This may | Melanie Thielker | 2010-08-19 | 1 | -0/+4 |
| | | | | | | | | uncover errors elsewhere. | ||||
* | | Skip conversion if fields that are null in the database. This may | Melanie Thielker | 2010-08-19 | 1 | -0/+4 |
| | | | | | | | | uncover errors elsewhere. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 5 | -11/+11 |
|\ \ | |/ | |||||
| * | Fix SQLite database plugin for UserAccountData queries with a single word. | Marck | 2010-08-15 | 1 | -1/+1 |
| | | |||||
| * | refactor: Use SOP.Flags rather than SOP.ObjectFlags | Justin Clark-Casey (justincc) | 2010-08-13 | 4 | -10/+10 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-10 | 2 | -3/+5 |
|\ \ | |/ | |||||
| * | Enforce DB limits on region name to 32 chars, or else (not good). Removed a ↵ | Diva Canto | 2010-08-10 | 1 | -0/+3 |
| | | | | | | | | piece of code from Hyperlinker that didn't work anyway. Shortened the hyperlink region name. | ||||
| * | Even if all data migratios are up to date, still print the current revision ↵ | Justin Clark-Casey (justincc) | 2010-08-09 | 1 | -3/+2 |
| | | | | | | | | to the log | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-08 | 1 | -2/+5 |
|\ \ | |/ | |||||
| * | Add distance sort for null, too | Melanie | 2010-08-08 | 1 | -2/+5 |
| | | |||||
| * | Thank you, Marck00, for a patch that implemented region distance sorting | Melanie Thielker | 2010-08-08 | 3 | -4/+31 |
| | | | | | | | | for fallback regions. Applied with changes. | ||||
* | | Thank you, Marck00, for a patch that implemented region distance sorting | Melanie Thielker | 2010-08-08 | 3 | -4/+31 |
| | | | | | | | | for fallback regions. Applied with changes. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 6 | -17/+69 |
|\ \ | |/ | |||||
| * | Merge branch 'moap' | Justin Clark-Casey (justincc) | 2010-08-06 | 6 | -17/+69 |
| |\ | |||||
| | * | fix mysql/mssql prim serialization problem | Justin Clark-Casey (justincc) | 2010-08-04 | 2 | -12/+4 |
| | | | |||||
| | * | Implement MediaUrl persistence for MySQL and MsSQL | Justin Clark-Casey (justincc) | 2010-08-03 | 2 | -6/+18 |
| | | | | | | | | | | | | Not sure how I forgot this. This may resolve problems with media textures not persisting over restart for these databases. | ||||
| | * | get rid of PrimitiveBaseShape.MediaRaw staging post | Justin Clark-Casey (justincc) | 2010-08-03 | 3 | -9/+15 |
| | | | | | | | | | | | | | | | 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 | ||||
| | * | add mssql support for media on a prim | Justin Clark-Casey (justincc) | 2010-07-26 | 2 | -4/+15 |
| | | | | | | | | | | | | compiles but not tested. please test and correct if necessary! | ||||
| | * | add mysql support for media on a prim | Justin Clark-Casey (justincc) | 2010-07-26 | 2 | -3/+14 |
| | | |