aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-011-1/+3
|\
| * Remove testing cruft that is blocking the new protocols. Unit tests noMelanie Thielker2015-10-311-0/+2
| * let silly tests override version on local connectionsUbitUmarov2015-10-311-1/+1
* | Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-1/+0
|\ \ | |/
| * Deleted OpenSim.Framework.Communications. Moved its two remaining files to Op...Diva Canto2015-09-041-1/+0
* | seems to compile ( tests comented out)UbitUmarov2015-09-021-28/+0
* | bad merge?UbitUmarov2015-09-012-34/+158
|\ \ | |/ |/|
| * remove messing with KeyframeMotion on attachUbitUmarov2014-09-091-2/+2
| * drop attachments with original physical proprietiesUbitUmarov2014-09-091-21/+6
| * on drop send full update on root prim, terse on others ( as sl ). FixUbitUmarov2014-09-081-2/+5
| * change attachment drop, to make object Phanton. THis is not as SL, butUbitUmarov2014-09-081-8/+12
| * *NEEDS more testing* on attachment drop: fix adding prims to physicsUbitUmarov2014-09-081-4/+31
| * remove debug msgs at attachments deRezUbitUmarov2014-08-031-7/+1
| * buggUbitUmarov2014-08-031-11/+15
| * dont get script states for NPCs on deRezUbitUmarov2014-08-031-8/+11
| * replace debug msgs by othersUbitUmarov2014-08-031-1/+12
| * Fix duplicate attach message being sent to objects picked up from the groundMelanie Thielker2014-07-201-1/+4
| * Merge branch 'master' into careminsterMelanie2013-11-231-1/+1
| |\
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it sho...teravus2013-10-051-1/+2
| * | Merge branch 'master' into careminsterMelanie2013-10-042-2/+18
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-08-172-19/+4
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-08-131-1/+112
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-071-3/+15
| |\ \ \ \ \
| * | | | | | Make atachment state load work againMelanie2013-08-021-1/+1
| * | | | | | Merge branch 'master' into careminsterMelanie2013-08-011-15/+87
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-291-0/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-241-2/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-06-111-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Make objects attached from the ground appear in inventory again. Fixes a numberMelanie2013-06-081-1/+1
| * | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-05-112-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-03-301-6/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-292-21/+20
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-292-21/+18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminsterMelanie2013-03-291-54/+145
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-291-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-222-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix merge artefactsMelanie2013-03-192-6/+6
| * | | | | | | | | | | | | | | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminsterMelanie2013-03-192-143/+351
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-081-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2013-03-062-30/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Limit each attachment point to 5 items as per specMelanie2013-03-051-3/+13
| | * | | | | | | | | | | | | | | | | | | Multiattach, part 1Melanie2013-03-052-30/+20
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-03-051-144/+165
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-041-10/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-10-311-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-031-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-09-292-25/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-09-242-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-08-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-07-16 17:21:32 +0000