Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-18 | 1 | -4/+6 |
|\ | |||||
| * | Merge branch 'master' into test-merge0418 | Mic Bowman | 2011-04-18 | 1 | -7/+14 |
| |\ | |||||
| * | | First pass at moving object property requests into a queue similar | Mic Bowman | 2011-04-12 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | to the entity update queue. The number of property packets can become significant when selecting/deselecting large numbers of objects. This is experimental code. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -7/+14 |
|\ \ \ | | |/ | |/| | |||||
| * | | simplify coalesced object tests by using existing scene object set up utils | Justin Clark-Casey (justincc) | 2011-04-14 | 1 | -7/+14 |
| |/ | | | | | | | this change makes it possible to set an absolute position on a group before it is put into a scene. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-08 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Signal prim count taint if the AbsolutePosition of a scene object changes. | Justin Clark-Casey (justincc) | 2011-04-06 | 1 | -0/+2 |
| | | | | | | | | | | This updates prim counts correctly if an object is moved by something other than an avatar (e.g. scripts, region modules) Create TestMoveOwnerObject() regression test for this case. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Change some text to make the autoreturn mechanism more obvious, and align ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -2/+4 |
| | | | | | | | | with the fact that it's one word rather than two. | ||||
* | | Flag root prim changes for persistence | Tom | 2011-03-27 | 1 | -1/+1 |
| | | |||||
* | | Upgrade terse to full update on root rotation change. Not entirely sure why, ↵ | Tom | 2011-03-27 | 1 | -1/+1 |
| | | | | | | | | but it seems that the terse update causes the first prim to rotate improperly on occasion (only temporary, it's fixed by the full update on deselect, but this will prevent confusion.) | ||||
* | | Fix issues with UpdateRootRotation and also increase efficiency | Tom | 2011-03-27 | 1 | -7/+8 |
| | | |||||
* | | Corrections for Avatar Auto-pilot target; add llStopMoveToTarget() for ↵ | Kitto Flora | 2011-02-04 | 1 | -2/+11 |
| | | | | | | | | Avatar-attached. | ||||
* | | Taint SOGs the right way | Melanie | 2011-01-10 | 1 | -1/+5 |
| | | |||||
* | | Fix linking link sets to rotated prims. | Melanie | 2010-12-26 | 1 | -3/+4 |
| | | |||||
* | | Make sure the material is set on physical prims | Melanie | 2010-12-15 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 1 | -2/+13 |
|\ \ | |/ | | | | | Also prevent god takes from ending up in Lost and Found | ||||
| * | Only force prim persistence before delete if the prim is the result of an ↵ | Justin Clark-Casey (justincc) | 2010-12-03 | 1 | -2/+13 |
| | | | | | | | | | | | | unpersisted delink This considerably improves delete performance for objects with large linksets | ||||
* | | Prevent an overlength button label from producing a debug dump and aborting | Melanie | 2010-11-24 | 1 | -1/+1 |
| | | | | | | | | the script. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-23 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Let CHANGED_SCALE also trigger when editing prims and linksets with the ↵ | Marck | 2010-11-22 | 1 | -0/+2 |
| | | | | | | | | | | | | viewer's edit tools. This event used to trigger only when the scale was changed with a script. | ||||
| * | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -2/+4 |
| | | | | | | | | | | | | | | 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 autoreturn to not return zero objects | Melanie | 2010-10-07 | 1 | -6/+2 |
| | | |||||
| * | Plumb the path for multiple object deletes | Melanie | 2010-10-06 | 1 | -2/+6 |
| | | |||||
* | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -2/+4 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Prevent temp-on-rez prims from being persisted | Melanie | 2010-11-08 | 1 | -0/+3 |
| | | |||||
* | | Fix creation of a duplicate physics actor on chained drag-copy operations, | Melanie | 2010-11-04 | 1 | -17/+0 |
| | | | | | | | | the main cause for "ghost prims" | ||||
* | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 1 | -5/+1 |
| | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | ||||
* | | Implement taking of coalesced objects. | Melanie | 2010-10-07 | 1 | -5/+2 |
| | | | | | | | | | | | | | | WARNING!!!!! You can TAKE them, but you can't REZ them again. Only the first of the contained objects will rez, the rest is inaccessible until rezzing them is implemented. Also, rotations are not explicitly stored. This MAY work. Or not. | ||||
* | | Plumb the path for multiple object deletes | Melanie | 2010-10-06 | 1 | -2/+6 |
| | | |||||
* | | Fix a potential key collision | Melanie | 2010-09-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Add UUID to physics prim name parameter so that diagnostic messages can be ↵ | Justin Clark-Casey (justincc) | 2010-09-25 | 1 | -1/+1 |
| | | | | | | | | | | | | made more useful. If a separate UUID parameter is better for the future then this can be added later on. | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-09-21 | 1 | -1/+1 |
|\ \ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Fix a merge artefact that broke script state persistence in XAttachments | Melanie | 2010-09-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 1 | -2/+6 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ↵ | Justin Clark-Casey (justincc) | 2010-09-21 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | scene, remove the old uuid reference from m_parts as well as adding the new one. The separate remove and set operations is SOG.set_UUID() are both locked under m_parts.SyncRoot since they are logically atomic (though this isn't such an issue if the SOG isn't part of a scene) Added unit test for this behaviour. Also changed the second m_parts.AddOrReplace() to m_parts.Add(). As the old reference is now removed we never end up replacing an identical uuid. And if we replace a uuid that's already there (from a child part) then this is an error. | ||||
* | | Remove the now unused partslock | root | 2010-09-17 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -899/+561 |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Fixed a regression in SOG.Copy() | John Hurliman | 2010-09-16 | 1 | -1/+1 |
| | | |||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -818/+591 |
| | | | | | | | | MapAndArray collection | ||||
* | | Removing debug | root | 2010-09-16 | 1 | -1/+0 |
| | | |||||
* | | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 1 | -0/+1 |
| | | |||||
* | | Some small bug fixes | root | 2010-09-16 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-16 | 1 | -11/+8 |
|\ \ | |/ | |||||
| * | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve ↵ | Justin Clark-Casey (justincc) | 2010-09-15 | 1 | -1/+1 |
| | | | | | | | | code readability | ||||
| * | Instead of locking SOG.Children when a group is being removed from the ↵ | Justin Clark-Casey (justincc) | 2010-09-15 | 1 | -15/+17 |
| | | | | | | | | | | | | | | | | scene, iterate over an unlocked list instead Previously, deadlock was possible because deleting a group took a SOG.Children lock then an m_entityUpdates.SyncRoot lock in LLClientView At the same time, a thread starting from LLClientView.ProcessEntityUpdates() could take an m_entityUpdates.SyncRoot lock then later attempt to take a SOG.Children lock in PermissionsModule.GenerateClientFlags() and later on Taking a children list in SOG appears to be a better solution than changing PermissionsModule to not relook up the prim. Going the permission modules root would require that all downstream modules not take a SOG.Children lock either | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-09-14 | 1 | -3/+3 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 1 | -3/+3 |
| |\ \ | | |/ | |||||
| | * | Comment out SOG storing debug log message | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -3/+3 |
| | | | | | | | | | | | | This can get very spammy with regularly changing objects. Please uncomment if required. |