Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix slam bits being lost when editing perms in prim inventory | Melanie | 2011-01-14 | 1 | -1/+0 |
| | |||||
* | Fix direct item give permissions | Melanie | 2011-01-12 | 1 | -6/+16 |
| | |||||
* | Partial permissions fix for boxed items. | Melanie | 2011-01-10 | 1 | -10/+8 |
| | |||||
* | Preserve the script running flag when copying an object. | Melanie | 2011-01-08 | 1 | -0/+34 |
| | |||||
* | Fix a couple of security issues | Melanie | 2011-01-08 | 1 | -3/+9 |
| | |||||
* | Fix god mode perms adjustment | Melanie | 2011-01-06 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-25 | 1 | -3/+6 |
|\ | |||||
| * | One more pass at object inventory. This time, fix SceneObjectPartInventory ↵ | Diva Canto | 2010-12-24 | 1 | -68/+68 |
| | | | | | | | | so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's. | ||||
* | | Fix up some locking issues in task inventory. Don't use any prior versions ↵ | Melanie | 2010-12-22 | 1 | -0/+2 |
| | | | | | | | | in production! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | What is the point of using different types to express the same damn thing? | Melanie | 2010-12-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Another good catch. Update file name serial. | Melanie | 2010-12-21 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Added a missed return. Thanks diva! | Melanie | 2010-12-21 | 1 | -0/+1 |
| | | |||||
| * | Fix up merge artifacts | Melanie | 2010-12-21 | 1 | -10/+1 |
| | | |||||
| * | Make prim inventories a bit more sane | Melanie | 2010-12-21 | 1 | -41/+33 |
| | | |||||
| * | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -19/+21 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Restore CM loking after core extract | Melanie | 2010-12-21 | 1 | -65/+64 |
| | | |||||
* | | Make prim inventories a bit more sane | Melanie | 2010-12-21 | 1 | -43/+33 |
| | | |||||
* | | 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 |
|\ \ | |/ |