aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-0439-1668/+1429
|\
| * Merge branch 'master' into bulletsim4Robert Adams2013-05-037-29/+69
| |\
| | * Fix possible race condition with local region cache if a region was added aft...Justin Clark-Casey (justincc)2013-05-031-15/+28
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-031-0/+6
| | |\
| | * | On startup, start scenes after we're set up all local scenes, rather than sta...Justin Clark-Casey (justincc)2013-05-036-14/+41
| * | | BulletSim: zero vehicle motion when changing vehicle type.Robert Adams2013-05-036-26/+18
| * | | BulletSim: prims with no cuts created with single convex hull shape.Robert Adams2013-05-024-2/+99
| * | | BulletSim: Rebuild physical body if physical shape changes for mesh and hull.Robert Adams2013-05-024-24/+73
| * | | Merge branch 'master' into bulletsim4Robert Adams2013-05-021-2/+9
| |\ \ \ | | | |/ | | |/|
| | * | Fix inventory issueBlueWall2013-05-011-0/+6
| | |/
| * | BulletSim: fix crash when mesh asset wasn't available when meshingRobert Adams2013-05-012-10/+19
| * | BulletSim: rework LinksetCompound to work with new BSShape system.Robert Adams2013-05-011-106/+40
| * | Merge branch 'master' into bulletsim4Robert Adams2013-05-0116-120/+586
| |\ \
| * | | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working...Robert Adams2013-04-305-17/+50
| * | | BulletSim: Add non-static BSShape.GetReference for getting another referenceRobert Adams2013-04-292-32/+102
| * | | BulletSim: LinksetCompound work to disable collision for root andRobert Adams2013-04-291-14/+30
| * | | BulletSim: remove trailing white space to make git happier. No functional cha...Robert Adams2013-04-2920-152/+152
| * | | BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_phys...Robert Adams2013-04-2911-282/+282
| * | | BulletSim: first cut at new linksetCompound shape building.Robert Adams2013-04-291-63/+27
| * | | BulletSim: fix crash when creating new hull.Robert Adams2013-04-291-13/+14
| * | | BulletSim: code for creating the avatar capsule shape.Robert Adams2013-04-291-0/+13
| * | | BulletSim: massive refactor of shape classes. Removed shape specific code fro...Robert Adams2013-04-2920-1050/+290
| * | | BulletSim: complete BSShape classes.Robert Adams2013-04-293-19/+316
* | | | Merge branch 'master' into careminsterMelanie2013-05-019-25/+41
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-015-19/+20
| |\ \ \ | | | |/ | | |/|
| | * | Add in-code exaplanation for the change in cancellation signalling in STP 2.2...Justin Clark-Casey (justincc)2013-05-011-2/+0
| | * | Update SmartThreadPool to latest version 2.2.3 with a major and minor change.Justin Clark-Casey (justincc)2013-05-015-19/+22
| * | | Fix the long standing bug of items being delivered to lost and found or trash...Melanie2013-05-011-2/+3
| |/ /
| * | Fix CAPS to work like they should - do not send caps to the viewer if they're...Melanie2013-04-303-4/+18
* | | Merge branch 'master' into careminsterMelanie2013-04-308-97/+548
|\ \ \ | |/ /
| * | BulletSim: fix error messages created while an avatar has no initialRobert Adams2013-04-301-0/+3
| * | minor: remove some mono compiler warnings in ServicesServerBaseJustin Clark-Casey (justincc)2013-04-291-5/+0
| * | minor: Eliminate warning in LLimageManagerTests by properly calling through t...Justin Clark-Casey (justincc)2013-04-291-0/+2
| * | Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression testsJustin Clark-Casey (justincc)2013-04-294-10/+262
| * | Add regression test for inventory item give, reject and subsequent trash fold...Justin Clark-Casey (justincc)2013-04-292-1/+259
| * | Add regression test for offer, accept and subsequent receiver delete of an it...Justin Clark-Casey (justincc)2013-04-292-80/+15
| * | Fix bug where an agent that declined an inventory offer and subsequently empt...Justin Clark-Casey (justincc)2013-04-291-2/+8
| |/
| * Some more pieces of Avination's ban system - if an avatar isn't allowed on anyMelanie2013-04-291-7/+88
* | Merge branch 'master' into careminsterMelanie2013-04-297-18/+81
|\ \ | |/
| * Fix wrong sql statement in offline im.Diva Canto2013-04-281-5/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-04-271-1/+1
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-04-272-1/+2
| | |\
| | * | Unbreak the sample money moduleMelanie2013-04-271-0/+2
| | * | Small oversight in EconomyDataRequest - this would have affected everyone NOT...Melanie2013-04-271-2/+0
| * | | Added an interface to an external ban service. With this commit, the interfac...Diva Canto2013-04-272-4/+69
| | |/ | |/|
| * | Better error reportingDiva Canto2013-04-271-0/+1
| * | Make method virtualDiva Canto2013-04-271-1/+1
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-04-254-18/+34
| |\
| * | Groups: make some methods protected.Diva Canto2013-04-251-7/+7
* | | Merge branch 'master' into careminsterMelanie2013-04-253-13/+8
|\ \ \ | | |/ | |/|
generated by cgit v1.1 at 2024-08-23 18:04:40 +0000