Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -17/+20 |
| | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | ||||
* | Lock the iteration over the inventory items when saving script states | Melanie | 2010-09-28 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -47/+48 |
|\ | |||||
| * | Fix build break | Melanie | 2010-09-27 | 1 | -37/+38 |
| | | |||||
| * | if you can't edit a prim's inventory, you don't need to see the asset ids. | Melanie | 2010-09-27 | 1 | -3/+11 |
| | | | | | | | | | | | | Prevents stealing IDs of animations, sounds and textures from prim inventories. Prevents copybot from gathering the wearable UUIDs needed for pirating things from vendors. | ||||
* | | if you can't edit a prim's inventory, you don't need to see the asset ids. | Melanie | 2010-09-24 | 1 | -1/+8 |
| | | | | | | | | | | | | Prevents stealing IDs of animations, sounds and textures from prim inventories. Prevents copybot from gathering the wearable UUIDs needed for pirating things from vendors. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -4/+1 |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-16 | 1 | -0/+27 |
| |\ | |||||
| | * | Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {} | Justin Clark-Casey (justincc) | 2010-09-17 | 1 | -22/+21 |
| | | | |||||
| | * | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 1 | -0/+28 |
| | | | |||||
| * | | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -4/+1 |
| |/ | | | | | | | MapAndArray collection | ||||
* | | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 1 | -0/+28 |
| | | |||||
* | | Don't fart when deserializing a prim with no ParentGroup set yet | meta7 | 2010-09-15 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -3/+3 |
|\ \ | |/ | | | | | | | 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 | 1 | -1/+1 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -1/+1 |
| | | | |||||
| * | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 1 | -1/+1 |
| |/ | | | | | | | | | * 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 | ||||
| * | Fixed the naming mess around data connectors for simulation data | John Hurliman | 2010-09-11 | 1 | -1/+1 |
| | | |||||
| * | If a scene object part UUID is changed (only possible when not in a scene), ↵ | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -0/+3 |
| | | | | | | | | then adjust the inventory items to point to the new uuid as well | ||||
| * | Fix an issue with rezzing scripted objects. | Melanie Thielker | 2010-09-03 | 1 | -2/+2 |
| | | |||||
* | | Fix an issue with rezzing scripted objects. | Melanie Thielker | 2010-09-03 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | Remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 1 | -2/+67 |
|\ \ | |/ | | | | | This was rather conflicted. Please test linking. | ||||
| * | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+4 |
| | | | | | | | | conditions in linking and unlinking | ||||
| * | refactor: Push item retrieval and fixing part of Scene.RezObject() down into ↵ | Justin Clark-Casey (justincc) | 2010-08-25 | 1 | -2/+64 |
| | | | | | | | | SceneObjectPartInventory | ||||
* | | Remove posting region restart event from SOP, as it's now in XMRe | Melanie Thielker | 2010-08-06 | 1 | -16/+0 |
| | | |||||
* | | Implement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants ↵ | Tom | 2010-08-06 | 1 | -0/+16 |
| | | | | | | | | which had the wrong values (checked using LSL in SL). This addresses mantis #217 and mantis #53. | ||||
* | | Resync with master | Melanie | 2010-07-20 | 1 | -7/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | Restore lines that have been removed due to previous merge conflict. | Diva Canto | 2010-07-20 | 1 | -2/+6 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 1 | -4/+0 |
|\ \ | |/ | |||||
| * | Remove a merge artefact | Melanie | 2010-07-20 | 1 | -4/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 1 | -11/+29 |
|\ \ | |/ | |||||
| * | Fix a few permissions vulnerability. Owners could cause permissions | Melanie Thielker | 2010-07-20 | 1 | -5/+5 |
| | | | | | | | | escalation on items contained in prims using a hacked viewer | ||||
| * | Relaxed the ultra-conservative lock on m_items. Needs testing under linux ↵ | Diva Canto | 2010-07-20 | 1 | -219/+188 |
| | | | | | | | | and stress. | ||||
| * | Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests ↵ | Diva Canto | 2010-07-19 | 1 | -1/+0 |
| | | | | | | | | indicate that this is what causes deadlock. More tests needed. | ||||
| * | re-add the sleep lost in the revert. | Melanie | 2010-07-19 | 1 | -0/+2 |
| | | |||||
| * | Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage" | Melanie | 2010-07-19 | 1 | -12/+10 |
| | | | | | | | | This reverts commit c404c5fb5405eac24cc8b7cd402eb8d8fb0ff0cf. | ||||
| * | Revamp the permissions propagation. This MAY mess up. Please test. | Melanie | 2010-07-13 | 1 | -1/+0 |
| | | | | | | | | | | | | | | 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. | ||||
| * | Revert "stop exceptions in setting and getting state from propogating since ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -31/+8 |
| | | | | | | | | | | | | they aren't fatal to operations" This reverts commit 94cb6fc916e1bd039f2b59214e68a0b3c4847445. | ||||
| * | stop exceptions in setting and getting state from propogating since they ↵ | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -8/+31 |
| | | | | | | | | | | | | aren't fatal to operations this will hopefully stop "save oar" from failing if a script asset is corrupt | ||||
* | | Fix a few permissions vulnerability. Owners could cause permissions | Melanie Thielker | 2010-07-15 | 1 | -6/+0 |
| | | | | | | | | escalation on items contained in prims using a hacked viewer | ||||
* | | Revamp the permissions propagation. This MAY mess up. Please test. | Melanie Thielker | 2010-07-13 | 1 | -1/+0 |
| | | | | | | | | | | | | | | 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. | ||||
* | | And another conflict | Melanie | 2010-06-24 | 1 | -17/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-24 | 1 | -1/+20 |
|\ \ | |/ | |||||
| * | Thank you, Snoopy, for a patch to reduce sim script startup CPU usage | Melanie | 2010-06-23 | 1 | -10/+12 |
| | | |||||
| * | Don't filre CHANGED_INVENTORY if a prim comes in from storage | Melanie | 2010-06-12 | 1 | -1/+1 |
| | | |||||
| * | Fix a bug in owner change notification | Melanie | 2010-05-03 | 1 | -1/+3 |
| | | |||||
* | | Don't filre CHANGED_INVENTORY if a prim comes in from storage | Melanie | 2010-06-12 | 1 | -1/+1 |
| | |