Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | 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 | ||||
* | 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 | ||||
* | 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 | ||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | 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. | ||||
* | What is the point of using different types to express the same damn thing? | Melanie | 2010-12-21 | 1 | -1/+1 |
| | |||||
* | Another good catch. Update file name serial. | 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. | ||||
* | 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. | ||||
* | 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 | ||||
* | 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 |
| | |||||
* | Remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -2/+1 |
| | |||||
* | 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 | ||||
* | Restore lines that have been removed due to previous merge conflict. | Diva Canto | 2010-07-20 | 1 | -2/+6 |
| | |||||
* | Remove a merge artefact | Melanie | 2010-07-20 | 1 | -4/+0 |
| | |||||
* | 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 | ||||
* | 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 |
| |