aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie2011-04-301-0/+3
|\ | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-0/+3
| |\
| | * Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.Justin Clark-Casey (justincc)2011-04-281-2/+5
| | | | | | | | | | | | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5444 Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct. This did not effect scripts.
| | * A stab at making CHANGED_OWNER workMelanie2011-04-011-5/+5
| | |
* | | Set the attachment data on scripted rez to allow toasters to work.Melanie2011-04-301-0/+3
|/ /
* | A stab at making CHANGED_OWNER workMelanie2011-04-011-5/+5
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-141-2/+6
|\ \ | |/
| * For objects loaded from an IAR, make sure the CreatorID points towards the ↵Justin Clark-Casey (justincc)2011-03-101-2/+6
| | | | | | | | | | | | | | | | | | OSP resolved ID if newer CreationData is not present. This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account. This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists. This operation might be expensive for sculpties where the sculpt texture is inlined with the object data. Will just have to see. This relies on the IAR streaming inventory data before asset data (as is currently the case). Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file). This is for IAR loading only. Tests updated to check this behaviour.
| * Fix script data not being reset as it should beMelanie2011-01-241-0/+4
| |
| * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2011-01-181-1/+1
| |
| * Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
| |
| * Fix direct item give permissionsMelanie2011-01-121-6/+16
| |
| * Partial permissions fix for boxed items.Melanie2011-01-121-0/+7
| |
| * Fix god mode perms adjustmentMelanie2011-01-121-0/+2
| |
* | Fix script data not being reset as it should beMelanie2011-01-241-0/+4
| |
* | Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
| |
* | Fix direct item give permissionsMelanie2011-01-121-6/+16
| |
* | Partial permissions fix for boxed items.Melanie2011-01-101-10/+8
| |
* | Preserve the script running flag when copying an object.Melanie2011-01-081-0/+34
| |
* | Fix a couple of security issuesMelanie2011-01-081-3/+9
| |
* | Fix god mode perms adjustmentMelanie2011-01-061-0/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-251-3/+6
|\ \ | |/
| * One more pass at object inventory. This time, fix SceneObjectPartInventory ↵Diva Canto2010-12-241-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 ↵Melanie2010-12-221-0/+2
| | | | | | | | in production!
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-1/+1
|\ \ | |/
| * What is the point of using different types to express the same damn thing?Melanie2010-12-211-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+1
|\ \ | |/
| * Another good catch. Update file name serial.Melanie2010-12-211-0/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+1
|\ \ | |/
| * Added a missed return. Thanks diva!Melanie2010-12-211-0/+1
| |
| * Fix up merge artifactsMelanie2010-12-211-10/+1
| |
| * Make prim inventories a bit more saneMelanie2010-12-211-41/+33
| |
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-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 extractMelanie2010-12-211-65/+64
| |
* | Make prim inventories a bit more saneMelanie2010-12-211-43/+33
| |
* | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-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 statesMelanie2010-09-281-0/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-271-47/+48
|\ \ | |/
| * Fix build breakMelanie2010-09-271-37/+38
| |
| * if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-271-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.Melanie2010-09-241-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-refactorMelanie2010-09-171-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/opensimJohn Hurliman2010-09-161-0/+27
| |\
| | * Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}Justin Clark-Casey (justincc)2010-09-171-22/+21
| | |
| | * JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-161-0/+28
| | |
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman2010-09-161-4/+1
| |/ | | | | | | MapAndArray collection
* | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-161-0/+28
| |
* | Don't fart when deserializing a prim with no ParentGroup set yetmeta72010-09-151-1/+5
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-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.
| * MergedJohn Hurliman2010-09-121-1/+1
| |\