| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | * | Provide an option to allow remote calls to the CreateUser method on the UserA... | Justin Clark-Casey (justincc) | 2011-10-18 | 3 | -7/+73 |
| * | | Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+6 |
| |\ \
| |/ |
|
| | * | Temporarily put in log lines to record time taken to set terrain in OdeScene. | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -0/+6 |
| * | | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+10 |
| |\ \
| |/ |
|
| | * | Store scene identifier passed in to OdeScene for later debug messages | Justin Clark-Casey (justincc) | 2011-10-18 | 2 | -2/+10 |
| * | | Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge | Melanie | 2011-10-25 | 1 | -16/+13 |
| |\ \
| |/ |
|
| | * | Don't bother taking OdeLock during OdeScene construction, since there can be ... | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -16/+13 |
| * | | Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmerge | Melanie | 2011-10-25 | 1 | -18/+13 |
| |\ \
| |/ |
|
| | * | Remove unnecessary lock of OdeLock in OdePrim.changeadd() | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -18/+13 |
| * | | Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmerge | Melanie | 2011-10-25 | 2 | -1/+3 |
| |\ \
| |/ |
|
| | * | minor: method doc to explain a lock of OdeLock | Justin Clark-Casey (justincc) | 2011-10-18 | 2 | -1/+3 |
| * | | Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge | Melanie | 2011-10-25 | 4 | -97/+81 |
| |\ \
| |/ |
|
| | * | Remove the unused CollisionLocker from ODE | Justin Clark-Casey (justincc) | 2011-10-18 | 4 | -97/+81 |
| * | | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge | Melanie | 2011-10-25 | 2 | -6/+11 |
| |\ \
| |/ |
|
| | * | Allow an avatar to be explicitly named to the "debug packet" command | Justin Clark-Casey (justincc) | 2011-10-17 | 2 | -6/+11 |
| * | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 6 | -28/+16 |
| |\ \
| |/ |
|
| | * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter w... | Justin Clark-Casey (justincc) | 2011-10-17 | 6 | -28/+16 |
| * | | Merge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+17 |
| |\ \
| |/ |
|
| | * | Add avatar names to debug packet output | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -2/+2 |
| * | | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge | Melanie | 2011-10-25 | 3 | -13/+14 |
| |\ \
| |/ |
|
| | * | refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSit... | Justin Clark-Casey (justincc) | 2011-10-17 | 3 | -11/+10 |
| * | | Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ \
| |/ |
|
| | * | rename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more und... | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+1 |
| * | | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 6 | -2/+48 |
| |\ \
| |/ |
|
| | * | Implement osNpcStand(<npc-id>) | Justin Clark-Casey (justincc) | 2011-10-17 | 6 | -2/+48 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+0 |
| | |\ |
|
| * | \ | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 11 | -15/+74 |
| |\ \ \
| |/ / |
|
| | * | | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 10 | -5/+75 |
| * | | | Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+0 |
| |\ \ \
| | |/
| |/| |
|
| | * | | Bug fix on the bug fix on UserAccountService.cs | Diva Canto | 2011-10-16 | 1 | -1/+0 |
| | |/ |
|
| * | | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+3 |
| |\ \
| |/ |
|
| | * | Guard HGAssetService against uninitialized variables and null arguments. | Diva Canto | 2011-10-15 | 1 | -0/+3 |
| * | | Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
| |\ \
| |/ |
|
| | * | improve method doc on Scene.OtherRegionUp() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+4 |
| * | | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 6 | -17/+8 |
| |\ \
| |/ |
|
| | * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t... | Justin Clark-Casey (justincc) | 2011-10-15 | 6 | -17/+8 |
| * | | Merge | Melanie | 2011-10-25 | 2 | -3/+1 |
| * | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 7 | -45/+24 |
| |\ \
| |/ |
|
| | * | fetch physical_prim switch from [Startup] config from inside scene, as is don... | Justin Clark-Casey (justincc) | 2011-10-15 | 7 | -48/+23 |
| * | | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge | Melanie | 2011-10-25 | 3 | -7/+7 |
| |\ \
| |/ |
|
| | * | remove now redundant m_physical_prim flag from SOP.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 3 | -7/+7 |
| * | | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge | Melanie | 2011-10-25 | 2 | -1/+12 |
| |\ \
| |/ |
|
| | * | Restore [Startup] physical_prim flag which can stop any prims being subject t... | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -1/+12 |
| * | | Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+0 |
| |\ \
| |/ |
|
| | * | remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+0 |
| * | | Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmerge | Melanie | 2011-10-25 | 1 | -27/+21 |
| |\ \
| |/ |
|
| | * | refactor: Remove redundant code in SOP.UpdatePrimFlags() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -27/+21 |
| * | | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge | Melanie | 2011-10-25 | 3 | -11/+19 |
| |\ \
| |/ |
|
| | * | factor common code out into SOP.RemoveFromPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 3 | -11/+19 |
| * | | Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmerge | Melanie | 2011-10-25 | 2 | -53/+36 |
| |\ \
| |/ |
|
