aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-301-20/+21
|\
| * Revert "One more debug mantis #6625"Diva Canto2013-06-301-1/+0
| * Fixed previous debug messageDiva Canto2013-06-291-1/+1
| * One more debug mantis #6625Diva Canto2013-06-291-0/+1
| * More debug for mantis #6625. It looks like the home friends list is being fet...Diva Canto2013-06-291-20/+21
| * Prevent an exception if no offline messages were retrieved.Kevin Cozens2013-06-181-0/+3
* | Merge branch 'master' into careminsterMelanie2013-06-181-23/+23
|\ \ | |/
| * Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfi...Justin Clark-Casey (justincc)2013-06-151-14/+13
| * Correct build break in previous commit 9c530d7Justin Clark-Casey (justincc)2013-06-151-10/+7
| * refactor: In UserProfileModule, change classifiedCache and classifiedInterest...Justin Clark-Casey (justincc)2013-06-151-19/+23
* | 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-06-112-1/+14
|\ \ \ | | |/ | |/|
| * | Catch exception triggered by incoming avatars using legacy profilesBlueWall2013-06-081-1/+10
| * | SQLite support for UserProfilesBlueWall2013-06-071-0/+1
| * | Ensure selected module is the only active oneBlueWall2013-06-071-0/+3
* | | Merge branch 'master' into careminsterMelanie2013-06-072-4/+4
|\ \ \ | |/ /
| * | In LocalFriendshipTerminated, send the original client's agentId to the frien...Donnie Roberts2013-06-072-4/+4
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-061-10/+0
|\ \ \ | | |/ | |/|
| * | Fix bug where an agent that declined an inventory offer and subsequently empt...Justin Clark-Casey (justincc)2013-04-301-2/+8
| * | Make the kicked user's avie truly disappear when it's god-kicked.Diva Canto2013-04-251-2/+1
| * | Gods module cleanupMelanie2013-04-251-10/+0
* | | Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminsterMelanie2013-06-061-14/+18
|\ \ \ | | |/ | |/|
| * | Prevent processing for NpcBlueWall2013-06-051-1/+3
| * | Remove a couple of orphaned linesBlueWall2013-06-051-3/+0
| * | Make locking more uniformBlueWall2013-06-051-14/+19
* | | Merge branch 'master' into careminsterMelanie2013-06-042-9/+1335
|\ \ \ | |/ /
| * | Adding back the BasicProfileModuleBlueWall2013-05-312-73/+191
| * | UserProfilesBlueWall2013-05-302-176/+1386
| * | minor: fix warnings in GodsModule that were due to duplicate using statementsJustin Clark-Casey (justincc)2013-05-301-11/+7
| * | Protect one more update of the baked texture hashes.Mic Bowman2013-05-241-2/+5
| * | This is an experimental patch that adds support for comparing textureMic Bowman2013-05-241-45/+57
* | | Merge branch 'master' into careminsterMelanie2013-05-242-3/+3
|\ \ \ | |/ /
| * | To further help with tracking down the apperance of too much "Unknown User" i...Justin Clark-Casey (justincc)2013-05-212-3/+3
* | | Merge branch 'master' into careminsterMelanie2013-05-112-3/+3
|\ \ \ | |/ /
| * | remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-091-1/+1
| * | Fix issue where objects removed via llDie() would not disappear for users loo...Justin Clark-Casey (justincc)2013-05-091-2/+2
* | | Merge branch 'master' into careminsterMelanie2013-05-081-0/+59
|\ \ \ | |/ /
| * | Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-081-0/+59
* | | Merge branch 'master' into careminsterMelanie2013-04-302-86/+464
|\ \ \ | |/ /
| * | Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression testsJustin Clark-Casey (justincc)2013-04-292-5/+198
| * | Add regression test for inventory item give, reject and subsequent trash fold...Justin Clark-Casey (justincc)2013-04-291-0/+256
| * | Add regression test for offer, accept and subsequent receiver delete of an it...Justin Clark-Casey (justincc)2013-04-291-80/+3
| * | Fix bug where an agent that declined an inventory offer and subsequently empt...Justin Clark-Casey (justincc)2013-04-291-2/+8
* | | Merge branch 'master' into careminsterMelanie2013-04-251-2/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Make the kicked user's avie truly disappear when it's god-kicked.Diva Canto2013-04-241-2/+1
| * Commit Avination's God Kick feature.Melanie2013-04-251-62/+137
| * minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.Updat...Justin Clark-Casey (justincc)2013-04-021-2/+0
* | Merge branch 'master' into careminsterMelanie2013-03-301-6/+7
|\ \ | |/
| * refactor: move the append magic number processing for attachments back up int...Justin Clark-Casey (justincc)2013-03-291-6/+6