Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Restrict inventory items added in a transaction to folder belonging | Melanie | 2010-09-27 | 1 | -0/+6 |
| | | | | to the connected client. | ||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 1 | -10/+0 |
|\ | |||||
| * | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 1 | -10/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -6/+2 |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -6/+2 |
| | | | | | | | | MapAndArray collection | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -6/+7 |
|\ \ | |/ | | | | | | | 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. | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -6/+6 |
| | | |||||
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 1 | -1/+2 |
| | | |||||
| * | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion. This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart). However, DeRezObjects() deleted to user inventory, which is required by llDie() or direct region module unlink and deletion. Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path. Uncommented TestDelinkPersistence() since this now passes. Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 1 | -6/+1 |
|\ \ | |||||
| * | | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -6/+1 |
| |/ | | | | | | | | | | | | | | | | | | | Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion. This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart). However, DeRezObjects() deleted to user inventory, which is not required by llDie() or direct region module unlink and deletion. Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path. Uncommented TestDelinkPersistence() since this now passes. Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 1 | -18/+41 |
|\ \ | |/ | |||||
| * | Move code that allows llGiveInvetory() to move item into appropriate system ↵ | Justin Clark-Casey (justincc) | 2010-09-04 | 1 | -8/+40 |
| | | | | | | | | | | | | | | folder up from connectors into Scene.Inventory.cs This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors. Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway. | ||||
| * | Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item) | Justin Clark-Casey (justincc) | 2010-09-04 | 1 | -8/+27 |
| | | | | | | | | The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated. | ||||
| * | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | | script state enum to reflect recent changes. | ||||
* | | Remove the annoying "Script saved" popups when saving scripts in task | Melanie Thielker | 2010-09-02 | 1 | -13/+1 |
| | | | | | | | | | | | | | | inventory. They cause spam when using recompile scripts in selection and are redundant because that message is also shown in the script window message pane. These popups were a legacy from when we couldn't drive the message pane and their finest hour has now come. | ||||
* | | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | | script state enum to reflect recent changes. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 1 | -57/+12 |
|\ \ | |/ | |||||
| * | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -10/+12 |
| | | |||||
| * | refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -47/+0 |
| | | | | | | | | since this appears to relate solely to attachments | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 1 | -60/+18 |
|\ \ | |/ | | | | | 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 | -8/+13 |
| | | | | | | | | 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 | -53/+6 |
| | | | | | | | | SceneObjectPartInventory | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 1 | -72/+56 |
|\ \ | |/ | |||||
| * | Split out actual scene object insertion code from Scene.Inventory.RezObject ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -24/+9 |
| | | | | | | | | | | | | | | | | and move into SceneGraph.AddNewSceneObject() The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages. This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module This code does not touch direct rez by a user | ||||
| * | refactor: make RezObject() more readable | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -69/+68 |
| | | |||||
| * | Add automated test at the opensim 'api' level to check that a given item ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -1/+1 |
| | | | | | | | | | | | | goes to the correct directory Also removes some mono compiler warnings | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 1 | -3/+9 |
|\ \ | |/ | |||||
| * | minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -1/+5 |
| | | |||||
| * | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-19 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: Correct string format in "Can't find linkset root prim" message | Justin Clark-Casey (justincc) | 2010-08-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 1 | -5/+6 |
|\ \ | |/ | |||||
| * | refactor: move binary statistics logging from scene into separate region module | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -4/+5 |
| | | |||||
| * | refactor: move Scene.PerformObjectBuy into BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -1/+1 |
| | | |||||
| * | When a god uses mass permission setting, the V bit is cleared from next | Melanie Thielker | 2010-07-20 | 1 | -4/+7 |
| | | | | | | | | | | perms, rendering the item unmoveable for the next owenr. Make god mods conform to the rules, too. | ||||
| * | prevent hacked viewers from being able to delete arbitrary items from any | Melanie Thielker | 2010-07-20 | 1 | -3/+18 |
| | | | | | | | | | | prim. Allow friends with perms and shared group members to move or copy things out of prims | ||||
| * | Fix a few permissions vulnerability. Owners could cause permissions | Melanie Thielker | 2010-07-20 | 1 | -3/+32 |
| | | | | | | | | escalation on items contained in prims using a hacked viewer | ||||
* | | Implement CreateNewOutfitAttachments. This addresses mantis #199. | Tom | 2010-08-06 | 1 | -0/+20 |
| | | |||||
* | | When a god uses mass permission setting, the V bit is cleared from next | Melanie Thielker | 2010-07-20 | 1 | -4/+7 |
| | | | | | | | | | | perms, rendering the item unmoveable for the next owenr. Make god mods conform to the rules, too. | ||||
* | | If the client requests that an object be deleted, and the SOG/SOP is null ↵ | Tom Grimshaw | 2010-07-18 | 1 | -0/+8 |
| | | | | | | | | and/or is marked as deleted, just send the KillObject | ||||
* | | prevent hacked viewers from being able to delete arbitrary items from any | Melanie Thielker | 2010-07-15 | 1 | -3/+18 |
| | | | | | | | | | | prim. Allow friends with perms and shared group members to move or copy things out of prims | ||||
* | | Fix a few permissions vulnerability. Owners could cause permissions | Melanie Thielker | 2010-07-15 | 1 | -3/+32 |
| | | | | | | | | escalation on items contained in prims using a hacked viewer | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-14 | 1 | -1/+7 |
|\ \ | |/ | |||||
| * | Fixes mantis #4870. | Diva Canto | 2010-07-14 | 1 | -1/+7 |
| | | |||||
| * | Fix a permissions issue | Melanie Thielker | 2010-07-14 | 1 | -4/+11 |
| | | |||||
| * | Revert "More on mantis #4869. This fixes the problem of objects showing up ↵ | Melanie | 2010-07-14 | 1 | -7/+0 |
| | | | | | | | | | | | | as no copy when they are copy-able. It works, but I have no idea what I'm doing." Cuauses a permission escalation. do NOT USE the preceding commit | ||||
| * | Removed left-over debug messages. | Diva Canto | 2010-07-14 | 1 | -3/+1 |
| | | |||||
| * | More on mantis #4869. This fixes the problem of objects showing up as no ↵ | Diva Canto | 2010-07-14 | 1 | -0/+9 |
| | | | | | | | | copy when they are copy-able. It works, but I have no idea what I'm doing. | ||||
| * | Revamp the permissions propagation. This MAY mess up. Please test. | Melanie | 2010-07-13 | 1 | -35/+99 |
| | | | | | | | | | | | | | | 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. |