| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix a missing locking call | Melanie | 2011-10-25 | 1 | -0/+1 |
| | | |||||
| * | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+4 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to ↵ | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | reflect what it actually does This also makes it consistent with some other methods that send data to the client. | ||||
| | * | Only bother to create an inventory xfer file if there are any items in a ↵ | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -2/+2 |
| | | | | | | | | | prim inventory | ||||
| | * | Shuffle order of code in invnetory connector GetFolderContent() calls to ↵ | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -1/+1 |
| | | | | | | | | | avoid a possible race condition | ||||
| * | | Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+11 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | If a prim inventory becomes empty through deletion, send an empty xfer file ↵ | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -20/+43 |
| | | | | | | | | | | | | | | | | | | | name rather than one that references a metadata file containing only the folder object. If we do this, then viewer 3 crashes when we try and rez a script directly in an attachment's prim inventory. Sending an empty file name was already being done if the prim's inventory had never been touched. Now we always do that if there are no items in that inventory. Hopefully addresses the remaining point in http://opensimulator.org/mantis/view.php?id=5644 | ||||
| * | | Bring us up to date. | Tom | 2011-09-14 | 1 | -0/+5 |
| |\ \ | |/ | |||||
| | * | Stop attempts to rewear already worn items from removing and reattaching. | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | Viewer 2/3 will sometimes attempt to rewear attachments, even though they have already been attached during the main login process. This change ignores those attempts. This stops script failures during login, as the rewearing was racing with the script startup code. It might also help with attachments being abnormally put into deleted state. Hopefully resolves some more of http://opensimulator.org/mantis/view.php?id=5644 | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -4/+7 |
| |\ \ | |/ | |||||
| | * | Remove pointless cluttering SOP.ParentGroup != null checks. | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -4/+6 |
| | | | | | | | | | | | The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database. At all other times it's not possible for a SOP not to have a SOG parent. | ||||
| | * | refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid ↵ | Justin Clark-Casey (justincc) | 2011-08-27 | 1 | -1/+1 |
| | | | | | | | | | pointless duplication of identical values | ||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-04-30 | 1 | -0/+3 |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -0/+3 |
| | |\ \ | | |/ | |||||
| | | * | Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim. | Justin Clark-Casey (justincc) | 2011-04-28 | 1 | -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 work | Melanie | 2011-04-01 | 1 | -5/+5 |
| | | | | |||||
| * | | | Set the attachment data on scripted rez to allow toasters to work. | Melanie | 2011-04-30 | 1 | -0/+3 |
| |/ / | |||||
| * | | A stab at making CHANGED_OWNER work | Melanie | 2011-04-01 | 1 | -5/+5 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-14 | 1 | -2/+6 |
| |\ \ | |/ | |||||
| | * | For objects loaded from an IAR, make sure the CreatorID points towards the ↵ | Justin Clark-Casey (justincc) | 2011-03-10 | 1 | -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 be | Melanie | 2011-01-24 | 1 | -0/+4 |
| | | | |||||
| | * | minor: resolve some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 1 | -1/+1 |
| | | | |||||
| | * | 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-12 | 1 | -0/+7 |
| | | | |||||
| | * | Fix god mode perms adjustment | Melanie | 2011-01-12 | 1 | -0/+2 |
| | | | |||||
| * | | Fix script data not being reset as it should be | Melanie | 2011-01-24 | 1 | -0/+4 |
| | | | |||||
| * | | 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 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |