aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'master' into ubitworkmasterUbitUmarov2014-09-094-1/+52
| |\ \ | | |/
| | * make PERMISSION_OVERRIDE_ANIMATIONS implicit for attachmentsMelanie Thielker2014-09-091-1/+2
| | * Plumb llSetAnimationOverrideMelanie Thielker2014-09-094-0/+50
| * | limit number of prims on physical objects. Not all cases covered stillUbitUmarov2014-09-081-0/+11
| |/
| * Merge branch 'ubitworkmaster'Melanie Thielker2014-08-111-1/+10
| |\
| | * make sensors detect sitting avatars also by the distance to the root primUbitUmarov2014-08-101-1/+10
| * | LSL llListFindList fix: check types as well as content. Items must be same typeMelanie Thielker2014-08-101-2/+10
| |/
| * change how sounds work. May be bad.. needs testingUbitUmarov2014-07-271-5/+6
| * Remove some already commented linesMelanie Thielker2014-07-201-11/+0
| * Fix LSL portions of sit positioningMelanie Thielker2014-07-201-36/+12
| * replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-201-1/+1
| * Merge branch 'avination-current'Melanie Thielker2014-07-191-7/+6
| |\
| | * fix Xengine script instance loadUbitUmarov2014-07-181-7/+6
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2130-8521/+11543
| |\ \
| | * \ Merge branch 'master' into careminsterMelanie2014-01-284-12/+68
| | |\ \
| | * \ \ Merge branch 'master' into careminsterMelanie2014-01-281-0/+1
| | |\ \ \
| | * \ \ \ Intermediate commit. Sill errors.Melanie2014-01-054-8639/+10029
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-12-072-7784/+8165
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-235-8235/+8866
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-086-7472/+7710
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-11-031-27/+22
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-10-061-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of careminster:/var/git/careminsterteravus2013-10-044-242/+407
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | * Fix a null ref that causes a stack unwind when crossing borders. Less stac...teravus2013-09-162-12/+47
| | * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-10-064-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-10-044-242/+407
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-09-162-11/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-08-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-072-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-291-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-07-182-6/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-131-2/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-133-12/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-184-8/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'avination-current' into careminsterMelanie2013-06-231-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-184-15/+93
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-112-13/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-111-22/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-112-2/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-06-065-19/+77
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-041-139/+187
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-241-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-161-30/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-014-9/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-04-101-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-04-021-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'Melanie Thielker2014-06-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Differentiate between requests only the owner should be able to do and thoseMelanie Thielker2014-04-262-6/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix a null ref that causes a stack unwind when crossing borders. Less stac...teravus2013-08-242-11/+46
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Forward the reason to the scriptMelanie2013-06-131-1/+1