| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 1 | -7/+14 |
|\ |
|
| * | 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 | -0/+2 |
| * | refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim... | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -4/+10 |
| * | Stop generating client flags when we send out full object updates. | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -3/+2 |
* | | Fix hit testing link sets properly. Fix raycasting for LSL. | Melanie | 2011-12-17 | 1 | -6/+6 |
* | | Merge branch 'master' into careminster | Melanie | 2011-12-14 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | Just adding a comment to SendFullUpdatToClient | Dan Lake | 2011-12-13 | 1 | -0/+2 |
* | | Fix phantom and temp flags not taking | Melanie | 2011-12-06 | 1 | -2/+2 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 1 | -24/+0 |
|\ \
| |/ |
|
| * | Remove SceneViewer from ScenePresence to reduce quadruple queueing of | Dan Lake | 2011-11-11 | 1 | -24/+0 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -1/+6 |
|\ \
| |/ |
|
| * | Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant propert... | Dan Lake | 2011-11-10 | 1 | -1/+6 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -10/+15 |
|\ \
| |/ |
|
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-10 | 1 | -1/+1 |
| |\ |
|
| * | | When updating SOG, a physics taint should not override a full update with a t... | Dan Lake | 2011-11-10 | 1 | -10/+15 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | minor: Correct misleading method doc on SOG.UpdateRootRotation() | Justin Clark-Casey (justincc) | 2011-11-09 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 1 | -1/+0 |
|\ \
| |/ |
|
| * | Don't rotate child prims, if only the root prim is rotated. | nebadon | 2011-11-05 | 1 | -2/+2 |
| * | Replacing te linking code with the code from Avination. Link sets prims are now | Melanie | 2011-11-05 | 1 | -35/+11 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Rename ForEachAvatar back to ForEachScenePresence. The other changes | Dan Lake | 2011-11-03 | 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 | -4/+4 |
|\ \ |
|
| * \ | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -4/+4 |
| |\ \
| | |/ |
|
| | * | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. | Dan Lake | 2011-11-02 | 1 | -3/+3 |
* | | | Fix link order when linking sets to sets | Melanie | 2011-11-02 | 1 | -39/+11 |
|/ / |
|
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-30 | 1 | -19/+14 |
|\ \
| |/ |
|
| * | Remove completely unused SOG.Rotation parameter | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -8/+0 |
| * | set grp.RootPart.GroupPosition for code consistency (and readability) rather ... | Justin Clark-Casey (justincc) | 2011-10-28 | 1 | -5/+0 |
| * | Add missing doc to rotation/position methods in SOG | Justin Clark-Casey (justincc) | 2011-10-28 | 1 | -5/+5 |
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
|\ \
| |/ |
|
* | | Merge | Melanie | 2011-10-25 | 1 | -1/+1 |
* | | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | remove now redundant m_physical_prim flag from SOP.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -2/+2 |
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-12 | 1 | -20/+17 |
|\ \ |
|
| * \ | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge | Melanie | 2011-10-11 | 1 | -7/+0 |
| |\ \
| | |/ |
|
| | * | Remove unimplementated UpdateMovement() methods from SOG, SOP. | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -7/+0 |
| * | | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+8 |
| |\ \
| | |/ |
|
| | * | Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ar... | Snoopy Pfeffer | 2011-09-25 | 1 | -1/+5 |
| * | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ \
| | |/ |
|
| | * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -1/+1 |
| * | | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge | Melanie | 2011-10-11 | 1 | -12/+8 |
| |\ \
| | |/ |
|
| | * | refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -12/+8 |
* | | | Merge branch 'careminster-presence-refactor' into bigmerge | Melanie | 2011-10-06 | 1 | -2/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix physics proxy position when linking and rotating the root prim only | Melanie | 2011-10-06 | 1 | -2/+6 |
* | | | Merge fixes, and fix the build | Tom | 2011-09-14 | 1 | -105/+61 |
* | | | First set of merge fixes | Tom | 2011-09-07 | 1 | -61/+26 |