| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -2/+2 |
|\ |
|
| * | Fix a bug where changing shape parameters of a child prim in a linkset would ... | Justin Clark-Casey (justincc) | 2012-02-18 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2012-02-16 | 1 | -5/+5 |
|\ \
| |/ |
|
| * | In ObjectTortureTests, run garbage collector on Teardown and run scene loop u... | Justin Clark-Casey (justincc) | 2012-02-15 | 1 | -5/+5 |
* | | Merge branch 'master' into careminster | Melanie | 2012-02-09 | 1 | -2/+11 |
|\ \
| |/ |
|
| * | Stop a scene object from attempting to link with itself (which results in an ... | Justin Clark-Casey (justincc) | 2012-02-08 | 1 | -5/+11 |
* | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 1 | -17/+2 |
|\ \
| |/ |
|
| * | ObjectAddedToScene event should be fired when duplicating objects | Dan Lake | 2012-02-02 | 1 | -16/+0 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-01 | 1 | -25/+20 |
| |\ |
|
| * | | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localID | Dan Lake | 2012-01-19 | 1 | -1/+2 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-31 | 1 | -1/+18 |
|\ \ \
| | |/
| |/| |
|
| * | | Remove scene object null check on SceneGraph.AddSceneObject(). Complain expl... | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+7 |
| * | | Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scen... | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -0/+6 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 1 | -5/+7 |
|\ \ \
| |/ / |
|
| * | | lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if ... | Justin Clark-Casey (justincc) | 2012-01-30 | 1 | -5/+7 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 1 | -6/+0 |
|\ \ \
| |/ / |
|
| * | | Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreate... | Dan Lake | 2012-01-24 | 1 | -6/+0 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 1 | -12/+0 |
|\ \ \
| |/ / |
|
| * | | Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, OnObject... | Dan Lake | 2012-01-24 | 1 | -13/+0 |
| |/ |
|
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+0 |
|\ \
| |/ |
|
| * | Remove unused m_physicalPrim parameter from SOG.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-12-22 | 1 | -1/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 1 | -14/+0 |
|\ \
| |/ |
|
| * | Fix bug where objects could not be set to a new group if the group had been c... | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -14/+0 |
| * | Fix compile error from an earlier commit | Dan Lake | 2011-11-10 | 1 | -2/+0 |
| * | Prevent linking objects while they are deeded. On unlinking deeded objects, | Melanie | 2011-11-11 | 1 | -4/+19 |
| * | Replacing te linking code with the code from Avination. Link sets prims are now | Melanie | 2011-11-05 | 1 | -1/+1 |
* | | Prevent linking objects while they are deeded. On unlinking deeded objects, | Melanie | 2011-11-10 | 1 | -4/+17 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to | Dan Lake | 2011-11-03 | 1 | -1/+1 |
* | | 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 |
|\ \
| |/ |
|