| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-11-02 | 1 | -2/+2 |
|\ |
|
| * | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -2/+2 |
| |\ |
|
| | * | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. | Dan Lake | 2011-11-02 | 1 | -1/+1 |
* | | | Fix link order when linking sets to sets | Melanie | 2011-11-02 | 1 | -1/+7 |
|/ / |
|
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-30 | 1 | -22/+16 |
|\ \
| |/ |
|
| * | Remove the SyncRoot locking from Scene which was only being done around the m... | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -22/+16 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 1 | -1/+15 |
|\ \
| |/ |
|
| * | Added new ForEachRootScenePresence to Scene since almost every delegate passe... | Dan Lake | 2011-10-27 | 1 | -1/+15 |
* | | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+6 |
|\ \
| |/ |
|
| * | Instead of adding stat agentMS in all kinds of places, calculate it instead i... | Justin Clark-Casey (justincc) | 2011-10-06 | 1 | -0/+6 |
* | | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+5 |
|\ \
| |/ |
|
| * | Make reported sim fps more accurate, in line with frame time ms | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -0/+5 |
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -18/+36 |
|\ \
| |/ |
|
| * | Stop attempts to rewear already worn items from removing and reattaching. | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -2/+2 |
| * | Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID ... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -2/+23 |
| * | stop the duplicate remove of the root part ids from the full part and local p... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -2/+0 |
| * | In SG.AddSceneObject(), stop unnecessarily adding the root part to object ind... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -7/+5 |
| * | stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is... | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -5/+2 |
| * | minor: if the script engine fails to find a prim for a script, also print out... | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -0/+4 |
* | | First set of merge fixes | Tom | 2011-09-07 | 1 | -8/+7 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -42/+50 |
|\ \
| |/ |
|
| * | Eliminate pointless checks of SOG.RootPart != null | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -1/+1 |
| * | Remove pointless cluttering SOP.ParentGroup != null checks. | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -19/+10 |
| * | refactor: migrate DropObject handling fully into AttachmentsModule from Scene | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -7/+0 |
| * | Related to #4689 - Adding missing null check for SceneObjectPart | Makopoppo | 2011-08-27 | 1 | -4/+10 |
| * | Don't try to save changed attachment states when an NPC with attachments is r... | Justin Clark-Casey (justincc) | 2011-08-18 | 1 | -2/+3 |
| * | refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for consis... | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -2/+2 |
| * | Rename UpdatePrimRotation() to UpdatePrimGroupRotation() since this is what i... | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -3/+3 |
| * | Stop undo of just the root prim position in the linkset from shifting the who... | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -1/+0 |
| * | fix undo when resizing of non-root individual prims in a linkset | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -1/+1 |
| * | Make various tweaks to undo code in an effort to get things working better. | Justin Clark-Casey (justincc) | 2011-07-18 | 1 | -0/+1 |
| * | Replace ifs in SOG.GroupResize() with Math.Min() | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -0/+1 |
| * | refactor: Push all part resize code down into SceneObjectPart.Resize() | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -4/+5 |
| * | add test for resizing one part in a group | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -1/+1 |
| * | remove the need to supply SceneObjectGroup.GroupResize() with a localId. | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -1/+1 |
| * | refactor: Make arguments to SceneGraph.UpdatePrimFlags() more readable | Justin Clark-Casey (justincc) | 2011-07-11 | 1 | -6/+11 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-11 | 1 | -1/+10 |
|\ \
| |/ |
|
| * | minor: add method doc to make it clear that click action is fired when the cl... | Justin Clark-Casey (justincc) | 2011-06-10 | 1 | -1/+10 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-22 | 1 | -9/+58 |
|\ \
| |/ |
|
| * | refactor Scene.RezObject() to use AddNewSceneObject() rather than copy/pastin... | Justin Clark-Casey (justincc) | 2011-05-21 | 1 | -8/+9 |
| * | implement Scene.GetSceneObjectGroup(string name) to match the equivalent GetS... | Justin Clark-Casey (justincc) | 2011-05-20 | 1 | -1/+30 |
| * | implement Scene.GetSceneObjectGroup(UUID fullID) using existing index | Justin Clark-Casey (justincc) | 2011-05-20 | 1 | -0/+16 |
| * | add test for rezzing an object from a prim item | Justin Clark-Casey (justincc) | 2011-05-20 | 1 | -0/+3 |
| * | Implement agent limits | Melanie | 2011-04-21 | 1 | -0/+5 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | Add coalesced scene objects class and serializer. This is currently only use... | Justin Clark-Casey (justincc) | 2011-04-13 | 1 | -0/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-08 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Fix bug where on duplication, the root part local id was continually used in ... | Justin Clark-Casey (justincc) | 2011-04-06 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 1 | -39/+86 |
|\ \
| |/ |
|
| * | When an object is duplicated, add it to the full/local id SOG indexes as well... | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+29 |