aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitworkmaster'Melanie Thielker2014-07-205-13/+11
|\
| * replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-205-13/+11
* | Fix duplicate attach message being sent to objects picked up from the groundMelanie Thielker2014-07-201-1/+4
|/
* Fix coalesced objects not showing up as "piles" of prims (AVN only bug)Melanie Thielker2014-07-201-4/+4
* Fix taking objectsMelanie Thielker2014-07-191-1/+1
* Merge branch 'avination-current'Melanie Thielker2014-07-1917-1515/+694
|\
| * revert to capsule representation of avatar colliderUbitUmarov2014-07-191-297/+28
| * reduce avatar hover in basic ode pluginUbitUmarov2014-07-181-1/+1
| * fix Xengine script instance loadUbitUmarov2014-07-181-7/+6
| * Merge branch 'avination-current' into ubitworkUbitUmarov2014-07-1628-163/+297
| |\
| | * Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...UbitUmarov2014-07-1613-70/+132
| | |\
| | * \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...UbitUmarov2013-09-1919-93/+165
| | |\ \
| * | \ \ Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-081-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...UbitUmarov2013-06-081-1/+1
| | |\ \ \
| * | | | | try to suspend and resume keyframes on copy to inventory to take copyUbitUmarov2013-06-061-1/+12
| * | | | | Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-061-15/+64
| |\ \ \ \ \ | | |/ / / /
| | * | | | keyframe: add more locks, change timming stop, added Suspend and resumeUbitUmarov2013-06-061-15/+64
| * | | | | Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-063-18/+43
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch 'avination-current' into ubitworkUbitUmarov2013-05-312-5/+5
| |\ \ \ \ \
| * | | | | | retouch prim stopped condition testUbitUmarov2013-05-291-3/+3
| * | | | | | removed spurius ref to ode.dll from odeapiUbitUmarov2013-05-291-1/+1
| * | | | | | correction to previus comment: all parameters but gravity modifier haveUbitUmarov2013-05-291-1/+0
| * | | | | | let gravity modifier, friction, restitution and density changes be appliedUbitUmarov2013-05-292-6/+65
| * | | | | | make sure friction slip parameters are zero ( or other value ) and notUbitUmarov2013-05-291-3/+3
| * | | | | | missing fileUbitUmarov2013-05-291-0/+5
| * | | | | | missing filesUbitUmarov2013-05-292-5/+6
| * | | | | | *** DANGER TESTING **** changed prims mesh generation hopefully removingUbitUmarov2013-05-299-1178/+503
* | | | | | | fix attachmentsUbitUmarov2014-07-191-7/+9
* | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-21271-15605/+31206
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2014-01-2840-1474/+1840
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-284-24/+75
| | |\ \ \ \ \ \ \
| | | * | | | | | | Added osGetRegionSize(), which returns the region size in meters and recogniz...Oren Hurvitz2014-01-283-0/+29
| | | * | | | | | | Convert tabs to spaces from previous commit 8c2b41b01Justin Clark-Casey (justincc)2014-01-281-27/+27
| | | * | | | | | | Make inidirectory files supercede distro filesDev Random2014-01-271-27/+49
| | * | | | | | | | Reinsert attachments list taking code in SP.MakeRootAgent()Justin Clark-Casey (justincc)2014-01-271-14/+30
| | * | | | | | | | refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which occu...Justin Clark-Casey (justincc)2014-01-271-2/+1
| | * | | | | | | | Re-enabled NPCModuleTests.TestCreate()Justin Clark-Casey (justincc)2014-01-271-3/+1
| | * | | | | | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-241-21/+19
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | minor: remove long unused state queue from "show queues" console reportsJustin Clark-Casey (justincc)2014-01-241-5/+3
| | | * | | | | | | minor: correct the usage statement on the "show image queues" console command...Justin Clark-Casey (justincc)2014-01-241-1/+1
| | | * | | | | | | Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) fro...Justin Clark-Casey (justincc)2014-01-241-15/+15
| | * | | | | | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-244-320/+362
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Properly dispose of drawing objects to reduce/stop memory leakage on generati...Justin Clark-Casey (justincc)2014-01-244-319/+343
| | | * | | | | | | Add "generate map" console command to allow manual regeneration and storage o...Justin Clark-Casey (justincc)2014-01-232-1/+19
| | * | | | | | | | Adds a configuration option to cannibalize bandwidth from theMic Bowman2014-01-202-0/+20
| | * | | | | | | | Add back code to UuidGatherer to retrieve UUIDs for materials stored in DynAt...dahlia2014-01-201-0/+73
| | * | | | | | | | rather than converting existing materials to assets, just retrieve them and m...dahlia2014-01-201-32/+12
| | * | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2014-01-208-22/+441
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2014-01-204-3/+281
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Clean up orphaned json stores. This can happen when an object isMic Bowman2014-01-204-3/+281