aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* And another conflictMelanie2010-06-241-17/+0
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-241-1/+20
|\
| * Thank you, Snoopy, for a patch to reduce sim script startup CPU usageMelanie2010-06-231-10/+12
| |
| * Don't filre CHANGED_INVENTORY if a prim comes in from storageMelanie2010-06-121-1/+1
| |
| * Fix a bug in owner change notificationMelanie2010-05-031-1/+3
| |
* | Don't filre CHANGED_INVENTORY if a prim comes in from storageMelanie2010-06-121-1/+1
| |
* | Fix another ReaderWriterLockSlim issueTom Grimshaw2010-05-101-1/+1
| |
* | Fix a bug in owner change notificationMelanie Thielker2010-05-031-1/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-031-2/+4
|\ \ | |/
| * Defer sending of CHANGED_OWNER to make it work on rezzed objects andMelanie2010-05-031-3/+4
| | | | | | | | attachments in addition to objects sold in place
| * Fix build break.Melanie2010-04-271-17/+17
| |
| * Add a parameter to prim inventory update to prevent event firingMelanie2010-04-271-18/+25
| |
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-191-29/+48
| |\
| * | Make the "notecard saved" text appear in the saver rather than the notecard ↵Justin Clark-Casey (justincc)2010-04-191-10/+0
| | | | | | | | | | | | | | | | | | | | | owner, if the notecard is saved by a permitted group member This means moving the alert up to a place where the IClientAPI is available. One can also argue that such client messages shouldn't be sent directly from the scene data model
* | | Add a parameter to prim inventory update to prevent event firingMelanie Thielker2010-04-271-1/+7
| | |
* | | Make scripted attachment states work. Finally. Also replace two monitor locksMelanie Thielker2010-04-251-13/+28
| | | | | | | | | | | | with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
* | | Remove debug output, the culprit has been identifiedMelanie Thielker2010-04-231-6/+0
| | |
* | | Fix a nullref in attachment handling. Add some debug to find the attachmentMelanie Thielker2010-04-231-0/+6
| | | | | | | | | | | | state issue
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-191-32/+29
|\ \ \ | | |/ | |/|
| * | Make script asset fetches synchronous. Script instantiation synchronizationMelanie2010-04-191-28/+24
| | | | | | | | | | | | will not work if the instance is not created when the method returns.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-191-2/+34
|\ \ \ | |/ /
| * | All scripts are now created suspended and are only unsuspended when the objectMelanie2010-04-191-1/+24
| |/ | | | | | | | | | | is fully rezzed and all scripts in it are instantiated. This ensures that link messages will not be lost on rez/region crossing and makes heavily scripted objects reliable.
| * Partially implement share with group option for object inventory itemsJustin Clark-Casey (justincc)2010-04-051-1/+9
| | | | | | | | | | | | If serverside permissions are off then this works as expected. Previously, it was impossible for more than one person to edit such items even if permissions were off. If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active. However, if the group for the object is later set then the contained item is still not editable. This may be linked to a wider bug where the object is still not modifiable by the group anyway
* | Merge branch 'master' into careminster-presence-refactorMelanie Thielker2010-04-191-6/+65
|\ \
| * | This GetScriptErrors() change allows initial XEngine to run in backgroundMike Rieker2010-04-181-6/+65
| | | | | | | | | | | | | | | thread. It should block only for the case of being called by CapsUpdateTaskInventoryScriptAsset().
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-131-8/+68
|\ \ \ | |/ /
| * | guarantee that a script engine's GetScriptErrors() will not be calledMike Rieker2010-04-101-8/+68
| | | | | | | | | | | | | | | until after its OnRezScript() returns so that script compile error messages can be retrieved
| * | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-061-4/+2
| |\ \
* | \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-03-061-1/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵Justin Clark-Casey (justincc)2010-03-041-1/+0
| | | | | | | | | | | | | | | | modules can use it
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-031-5/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| | This brings careminster on the level of master. To be tested
| * | Merge branch 'master' into presence-refactorMelanie2010-02-221-3/+3
| |\ \ | | |/ | | | | | | This brings presence-refactor up to master again
| | * Formatting cleanup.Jeff Ames2010-02-151-3/+3
| | |
| * | Merge branch 'master' into presence-refactorMelanie2010-02-081-92/+173
| |\ \ | | |/ | | | | | | | | | This was a large, heavily conflicted merge and things MAY have got broken. Please check!
| | * minor: remove a couple of mono warningsJustin Clark-Casey (justincc)2010-02-031-2/+0
| | |
| * | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.Diva Canto2010-01-111-1/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2010-02-021-1/+25
|\ \ \
| * | | Revert "improve locking of m_items in SceneObjectPartInventory"Melanie2010-02-021-133/+85
| | |/ | |/| | | | | | | This reverts commit 968b9e160d70568fbdea5b190d1386e9431316e3.
| * | improve locking of m_items in SceneObjectPartInventoryJustin Clark-Casey (justincc)2010-01-291-85/+133
| | |
| * | Add method to get all items with the same name from a particular primJustin Clark-Casey (justincc)2010-01-291-1/+25
| | | | | | | | | | | | Extend load oar test to check loading of a sound item
* | | Some merge fixupsMelanie2010-01-261-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2010-01-261-3/+14
|\ \ \ | |/ /
| * | Fix a problem where llDie() calls were sometimes leaving dead objects behind.Justin Clark-Casey (justincc)2010-01-251-5/+16
| |/ | | | | | | | | | | | | | | | | | | When an object was deleted, the remove script instance call was aggregating the scripting events as normal. This would queue a full update of the prim before the viewer was notifed of the deletion of that prim (QuitPacket) On some occasions, the QuitPacket would be sent before the full update was dequeued and sent. In principle, you would think that a viewer would ignore updates for deleted prims. But it appears that in the Linden viewer (1.23.5), a prim update that arrives after the prim was deleted instead makes the deleted prim persist in the viewer. Such prims have no properties and cannot be removed from the viewer except by a relog. This change stops the prim event aggregation call if it's being deleted anyway, hence removing the spurious viewer-confusing update.
| * Add a data path for error messagesroot2009-12-221-0/+22
| | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com>
* | Add a data path for error messagesroot2009-12-221-0/+22
| |
* | Merge branch 'master' into careminsterMelanie2009-12-211-0/+1
|\ \ | |/
| * When a script has been loaded, remove it's state entry, so recompilingMelanie2009-12-211-0/+1
| | | | | | | | doesn't pick up the old state again.
* | Merge branch 'master' into careminsterMelanie2009-12-211-7/+48
|\ \ | |/
| * Script State Fix: Part 2Melanie2009-12-211-7/+48
| | | | | | | | | | | | Change the reader to wrap old-style definitions in new style wrappers. Change importer to not check irrelevant data that can't be reconstructed This removes the last bit of knowledge of XEngine's .state files from core.
* | Fix to existing ReaderWriterLockSlim implementationsCasperW2009-12-061-1/+2
| |
generated by cgit v1.1 at 2024-12-29 16:00:53 +0000