aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge branch 'ubitwork' into avinationMelanie2012-08-298-151/+565
| | |\ \
| | * | | Make llCollisionSprite not throw anymoreMelanie2012-08-251-1/+2
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-303-4/+8
|\ \ \ \ \ | |/ / / /
| * | | | move keyframemotion.copy from sop.copy to sog.copy, where there isUbitUmarov2012-08-303-4/+8
| | |_|/ | |/| |
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-303-35/+38
|\ \ \ \ | |/ / /
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-08-302-12/+128
| |\ \ \ | | | |/ | | |/|
| * | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacingUbitUmarov2012-08-303-35/+38
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-302-12/+128
|\ \ \ \ | | |/ / | |/| |
| * | | Fix issue with the quit packet being stuck int he queue and a one packet delay.Melanie2012-08-291-2/+8
| * | | Remove Justin's addition to avoid sending incoming packets to inactive clientsMelanie2012-08-291-9/+9
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-08-297-137/+435
| |\ \ \ | | |/ /
| * | | Add a queue with two priority levels. This is a drop in replacement forMelanie2012-08-281-2/+111
| * | | Fix a nullref while object is being createdMelanie2012-08-281-1/+2
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-294-65/+117
|\ \ \ \ | | |/ / | |/| |
| * | | A few more changes to keyframesUbitUmarov2012-08-294-65/+117
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-291-115/+165
|\ \ \ \ | |/ / /
| * | | [Potentially broken] keyframes changes.. since it's there, use timer forUbitUmarov2012-08-291-115/+165
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-288-117/+313
|\ \ \ \ | |/ / /
| * | | [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-288-115/+311
| |/ /
| * | fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internalUbitUmarov2012-08-261-2/+2
| |/
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-2514-66/+189
|\ \ | |/
| * Merge branch 'ubitwork' into avinationMelanie2012-08-246-5/+9
| |\
| | * let setLinkPrimParams terminate even if there are no more parts.UbitUmarov2012-08-161-2/+3
| * | Remove debug spamMelanie2012-08-241-2/+2
| * | Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-243-51/+107
| * | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-233-3/+39
| * | Make terrain save every 1000 frames instead of every 50. Database load is a s...Melanie2012-08-221-1/+1
| * | Fix group return stuffMelanie2012-08-211-1/+1
| * | Allow updates sent for right pec to go to the clientMelanie2012-08-211-1/+1
| * | Implement seeing busy status in LSLMelanie2012-08-211-0/+7
| * | Cause a persistence save if prim flags changeMelanie2012-08-211-0/+2
| * | Add Camera Offsets to serializationMelanie2012-08-211-0/+14
| * | Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
| * | Make the console output from the reigon console hookableMelanie2012-08-182-0/+11
| * | Fix a typoMelanie2012-08-181-1/+1
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-165-3/+6
|\ \ \ | | |/ | |/|
| * | fix vs2010 buildUbitUmarov2012-08-165-3/+6
| |/
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-1660-791/+2092
|\ \ | |/
| * Merge branch 'master' into careminsterMelanie2012-08-1614-223/+466
| |\
| | * Do a proper null check to avoid the overloaded operator == trapMelanie2012-08-161-1/+1
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-1513-222/+465
| | |\
| | | * Don't enable the thread watchdog until all regions are ready.Justin Clark-Casey (justincc)2012-08-152-7/+33
| | | * adding ATTACH_*_PEC constantsSignpostMarv2012-08-151-0/+2
| | | * BulletSim: add hinge constraint.Robert Adams2012-08-153-6/+126
| | | * BulletSim: add locking to constraintCollection and rename some of the public ...Robert Adams2012-08-152-147/+197
| | | * BulletSim: clean up detail logging by adding many more debug log statements a...Robert Adams2012-08-155-34/+44
| | | * BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. M...Robert Adams2012-08-151-15/+15
| | | * BulletSim: fix problem of a null reference exception on shutdown if there wer...Robert Adams2012-08-151-12/+13
| | | * BulletSim: Refactor BSConstraintCollection to add a new RemoveAndDestroyConst...Robert Adams2012-08-151-4/+12
| | | * BulletSim: add BSConstraint.RecomputConstraintVariables for the recomputation...Robert Adams2012-08-151-0/+17