Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| | | | ||||||
| | * | relocate serialization code from SQLiteRegionData to MoapModule using load ↵ | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -53/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | Put a wrapper around the media texture region serialization | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -15/+43 | |
| | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | add missing regionstore migration file for new fields. D'oh! | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -0/+6 | |
| | | | | | | | | | | | | this should enable persistence now | |||||
| | * | fix bug where prim persistence would fail if media had never been set | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -6/+9 | |
| | | | ||||||
| | * | fix problem persisting when only one face had a media texture | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -2/+8 | |
| | | | ||||||
| | * | Implement media texture persistence over server restarts for sqlite | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -4/+32 | |
| | | | | | | | | | | | | This is currently persisting media as an OSDArray serialized to LLSD XML. | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-01 | 4 | -37/+39 | |
|\ \ \ | |/ / | ||||||
| * | | White space from previous commit. | Diva Canto | 2010-07-31 | 4 | -85/+85 | |
| | | | ||||||
| * | | Implemented console command "show hyperlinks". | Marck | 2010-07-31 | 4 | -85/+87 | |
| |/ | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 1 | -9/+0 | |
|\ \ | |/ | ||||||
| * | Removed a few obsolete mono addin references. Mantis #4854 | Diva Canto | 2010-07-14 | 1 | -9/+0 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-14 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | comment out obsolete assert that 'item has been passed to another user since ↵ | Justin Clark-Casey (justincc) | 2010-07-14 | 1 | -1/+1 | |
| | | | | | | | | it was last set' perms flag was set when a prim item was added to a scene object | |||||
| * | Revamp the permissions propagation. This MAY mess up. Please test. | Melanie | 2010-07-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | 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. | |||||
* | | Revamp the permissions propagation. This MAY mess up. Please test. | Melanie Thielker | 2010-07-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | 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. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-11 | 2 | -4/+4 | |
|\ \ | |/ | ||||||
| * | Hopefully fixes mantis #4852 | Diva Canto | 2010-07-08 | 2 | -4/+4 | |
| | | ||||||
* | | Provide the interface for StoreAsset to report success or failure | Tom Grimshaw | 2010-06-28 | 6 | -6/+14 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-27 | 3 | -7/+20 | |
|\ \ | |/ | ||||||
| * | Same patch as before but for SQLite. | Diva Canto | 2010-06-27 | 1 | -0/+8 | |
| | | ||||||
| * | Added checks to XInventory DB layer to truncate names and descriptions. | Diva Canto | 2010-06-27 | 1 | -1/+9 | |
| | | ||||||
| * | minor: fix spelling mistake interupt -> interrupt in migrations | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -6/+3 | |
| | | | | | | | | This is for mantis 4783 | |||||
| * | Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql" | Melanie | 2010-06-19 | 1 | -7/+0 | |
| | | | | | | | | | | | | Didn't do what it said on the package! This reverts commit 8643db3ef0c4dca709d85fc37240a18fd9049520. | |||||
| * | This is a HACK! Downright nasty. For some reason, the devs of the mysql | Melanie | 2010-06-19 | 1 | -0/+7 | |
| | | | | | | | | | | connector have decided that their vision of timeouts is the only valid one. This uses reflection to show them the finger. Please test. | |||||
| * | Revert "Set command timeout to infinity on migrations" | Melanie | 2010-06-17 | 1 | -1/+0 | |
| | | | | | | | | This reverts commit 51d30fd34a950e0cd71d61ce0666a6d1e90bf233. | |||||
| * | Set command timeout to infinity on migrations | Melanie | 2010-06-17 | 1 | -0/+1 | |
| | |