aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | | |/ | |/|
| * | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th...Melanie2013-04-253-13/+8
| * | Change copyright notice on DynamicMenuModule to proper BSDMelanie2013-04-251-5/+26
| |/
* | Merge branch 'master' into careminsterMelanie2013-04-254-2/+406
|\ \ | |/
| * Recover a lost "virtual". Downstream projects need this.Diva Canto2013-04-251-1/+1
| * UUIDGatherer now includes UUIDs which reference texture assets used as materialsdahlia2013-04-241-0/+66
| * Make the kicked user's avie truly disappear when it's god-kicked.Diva Canto2013-04-241-2/+1
| * Adding the dynamic menu module which allows registering new menu options in c...Melanie2013-04-252-0/+339
| * Commit Avination's God Kick feature.Melanie2013-04-251-62/+137
| * Add Avination's support for parcel eject and freezeMelanie2013-04-252-15/+110
* | Merge branch 'master' into careminsterMelanie2013-04-2512-85/+365
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-04-2410-77/+358
| |\
| | * BulletSim: partial addition of BSShape class code preparing forRobert Adams2013-04-242-52/+191
| | * BulletSim: update DLLs and SOs to they have no dependencies on newerRobert Adams2013-04-243-0/+44
| | * BulletSim: improve avatar stair walking up. Add more parameters to control forceRobert Adams2013-04-235-25/+123
| * | Bug fix: compare tolower. This should fix the issue where HG visitors current...Diva Canto2013-04-241-1/+1
| |/
| * Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if ...Justin Clark-Casey (justincc)2013-04-231-2/+4
| * BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's c...Robert Adams2013-04-221-5/+2
| * Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-226-12/+22
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-2232-1018/+2237
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-213-12/+620
| |\ \ | | |/
| | * Materials persistence via SceneObjectPart.dynAttrs. This appears to work acro...dahlia2013-04-201-8/+154
| | * handle PUT verb for RenderMaterials Capdahlia2013-04-201-1/+5
| | * RenderMaterials POST Cap now return material entries when invoked with an OSD...dahlia2013-04-191-61/+108