| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 11 | -58/+163 |
| |\ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-07 | 1 | -2/+2 |
| | |\ | |||||
| | | * | minor: comment out some excessive test logging | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -1/+1 |
| | | | | |||||
| | | * | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 6 | -42/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 6 | -42/+58 |
| | |/ | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | Add test that checks correct persistence when an unlink is quickly followed ↵ | Justin Clark-Casey (justincc) | 2010-09-06 | 1 | -9/+40 |
| | | | | | | | | | | | | | by deletion of a linked part This test is temporarily not running since it currently fails due to a bug in this area | ||||
| | * | Make console backup command do a forced backup rather than non-forced | Justin Clark-Casey (justincc) | 2010-09-06 | 2 | -6/+1 |
| | | | | | | | | | Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally | ||||
| | * | extend TestNewSceneObjectLinkPersistence() to check for presence of non-root ↵ | Justin Clark-Casey (justincc) | 2010-09-06 | 1 | -2/+3 |
| | | | | | | | | | linked prim | ||||
| | * | Add test to check persistence of newly added pre-linked objects | Justin Clark-Casey (justincc) | 2010-09-06 | 7 | -21/+78 |
| | | | | | | | | | | | Added a MockRegionDataPlugin to do in-memory persistence for tests since adding this to OpenSim.Data.Null.NullDataStore doesn't seem appropriate NullDataStore can do nothing because OpenSim only ever retrieve region objects from the database on startup. Adding an in-memory store here would be unecessary overhead. | ||||
| | * | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because | Melanie Thielker | 2010-09-06 | 1 | -1/+25 |
| | | | | | | | | | modules need to see it (Search!) even if it comes in via CAPS | ||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2010-09-06 | 6 | -29/+91 |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | Don't turn off the sale settings on child prims when linking, and on copy | Melanie Thielker | 2010-09-06 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | of prims anymore. The behavior now matches SL and can be used to link vendor prims for transport | ||||
| | * | | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because | Melanie Thielker | 2010-09-06 | 1 | -1/+25 |
| | | | | | | | | | | | | | modules need to see it (Search!) even if it comes in via CAPS | ||||
| | * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 2 | -18/+43 |
| | |\ \ | | |/ | |||||
| | | * | Logout the presence if client IP verification fails. | Diva Canto | 2010-09-04 | 1 | -0/+2 |
| | | | | |||||
| | | * | 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. | ||||
| | * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 1 | -0/+21 |
| | |\ \ | | |/ | |||||
| | | * | Fix an issue with rezzing scripted objects. | Melanie Thielker | 2010-09-03 | 1 | -2/+2 |
| | | | | |||||
| | | * | Remove commented code and the comment, as the change has proven out | Melanie Thielker | 2010-09-02 | 1 | -3/+0 |
| | | | | |||||
| | | * | Experimentally comment the sending of unbaked avatars | Melanie Thielker | 2010-09-02 | 1 | -1/+3 |
| | | | | |||||
| | | * | refactor: move SOG.AttachToAgent() into AttachmentsModule | Justin Clark-Casey (justincc) | 2010-09-01 | 1 | -71/+0 |
| | | | | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-01 | 3 | -3/+3 |
| | | |\ | |||||
| | | | * | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | script state enum to reflect recent changes. | ||||
| | | * | | Add ScenePresence.GetAttachments(uint attachmentPoint) | Justin Clark-Casey (justincc) | 2010-08-31 | 1 | -0/+21 |
| | | |/ | |||||
| | * | | Fix an issue with rezzing scripted objects. | Melanie Thielker | 2010-09-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | Falling animation fix, comment out instrumentation. | Kitto Flora | 2010-09-06 | 2 | -40/+61 |
| |/ / | |||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2010-09-02 | 4 | -19/+7 |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | Remove commented code and the comment, as the change has proven out | Melanie Thielker | 2010-09-02 | 1 | -3/+0 |
| | | | | |||||
| | * | | Experimentally comment the sending of unbaked avatars | Melanie Thielker | 2010-09-02 | 1 | -1/+3 |
| | | | | |||||
| | * | | 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. | ||||
| | * | | Prevent Meta7 plants from being treated like dropped attachments and removed | Melanie Thielker | 2010-09-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | from the sim. | ||||
| | * | | Improve sim health reporting. Output error message if heartbeat thread is ↵ | Melanie Thielker | 2010-09-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | restarted by scene. This may help to find out why this recovery mechanism isn't working. | ||||
| | * | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-08-31 | 1 | -2/+3 |
| | |\ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | script state enum to reflect recent changes. | ||||
| * | | | | Fixes to JUMP system. | Kitto Flora | 2010-09-02 | 2 | -54/+163 |
| | |/ / |/| | | |||||
| * | | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-30 | 12 | -340/+600 |
| |\ \ \ | |/ / | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 10 | -173/+103 |
| | |\ \ | | |/ | |||||
| | | * | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 5 | -75/+84 |
| | | | | |||||
| | | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -3/+4 |
| | | | | |||||
| | | * | 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 | ||||
| | | * | refactor: break out attachment position change code in ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -24/+13 |
| | | | | | | | | | | | | | | | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions. | ||||
| | | * | Remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-26 | 7 | -36/+7 |
| | | | | |||||
| | | * | Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim() | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -2/+16 |
| | | | | | | | | | | | | | By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations. | ||||
| | * | | Fix a horrible bug in SG, where iteration of scene objects is carried | Melanie Thielker | 2010-08-26 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | out in a fashion that causes the delegate to be invoked once per child prim for a given group. | ||||
| | * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 6 | -167/+253 |
| | |\ \ | | |/ | | | | | | | This was rather conflicted. Please test linking. | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 2 | -27/+38 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| | | * | | replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | always 0 (and any other number would cause an error anyway) | ||||
| | | * | | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 6 | -136/+205 |
| | | | | | | | | | | | | | | | | | conditions in linking and unlinking | ||||
| | | * | | If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID | Justin Clark-Casey (justincc) | 2010-08-25 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |