aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2014-01-281-2/+2
|\
| * Materials module: a) Store materials as assets; b) Finalized it (removed the ...Oren Hurvitz2014-01-201-2/+2
* | Intermediate commit. Sill errors.Melanie2014-01-051-2/+2
|\ \ | |/
| * Fix issue with editing notes for other avatarsBlueWall2013-12-161-2/+2
| * Committing the Avination Scene Presence and related texture codeMelanie2013-12-112-90/+474
* | Revert "Add support for user preferences (im via email)"Melanie2013-12-071-67/+0
* | Merge branch 'master' into careminsterMelanie2013-12-071-0/+67
|\ \ | |/
| * Add support for user preferences (im via email)BlueWall2013-12-061-0/+67
* | Merge branch 'master' into careminsterMelanie2013-11-232-3/+3
|\ \ | |/
| * minor: Use default(UUID) in rez attachment failure error logging rather than ...Justin Clark-Casey (justincc)2013-11-151-1/+1
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-2/+2
* | Merge branch 'master' into careminsterMelanie2013-11-031-2/+10
|\ \ | |/
| * * Refactorteravus2013-10-071-2/+2
| * * Added a Basic DOS protection container/base object for the most common HTTP...teravus2013-10-071-2/+10
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-10-061-1/+2
|\ \
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it sho...teravus2013-10-051-1/+2
* | | Merge branch 'master' into careminsterMelanie2013-10-061-0/+36
|\ \ \ | |/ / |/| / | |/
| * Added SimulatorFeatures/OpenSimExtras: say-range, whisper-range, shout-range,...Diva Canto2013-10-041-0/+37
* | Merge branch 'master' into careminsterMelanie2013-10-045-7/+35
|\ \ | |/
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ...Justin Clark-Casey (justincc)2013-09-272-2/+2
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-221-1/+17
| * minor: Recomment out log message uncommented in previous cbdfe969Justin Clark-Casey (justincc)2013-09-211-4/+4
| * When giving items between avatars in different simulators, only add the item ...Oren Hurvitz2013-09-211-9/+44
| * minor: Add prefix to log message in LureModuleJustin Clark-Casey (justincc)2013-09-211-1/+1
* | Merge branch 'avination-current' into careminsterMelanie2013-09-161-0/+2
|\ \
| * | * Fix a null ref that causes a stack unwind when crossing borders. Less stac...teravus2013-08-241-0/+2
| * | Make attachment state load work againMelanie2013-08-011-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-09-072-18/+17
|\ \ \ | | |/ | |/|
| * | Remove test that gives issue on Windows, just let the try/catch do the work.BlueWall2013-09-021-5/+1
| * | Fix bug where users teleporting to non-neighbour regions could continue to he...Justin Clark-Casey (justincc)2013-09-021-6/+9
* | | Merge branch 'master' into careminsterMelanie2013-09-012-17/+27
|\ \ \ | |/ /
| * | Profiles: Clean up some log entries caused when visiting HG avatar is using l...BlueWall2013-08-291-16/+26
| * | Fix a printing of exception error in InventoryArchiveModule that onlyRobert Adams2013-08-231-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-08-173-38/+20
|\ \ \ | |/ /
| * | Remove mono compiler warnings from UserProfilesModuleJustin Clark-Casey (justincc)2013-08-171-19/+16
| * | minor: remove mono compiler warning from AttachmentsModuleJustin Clark-Casey (justincc)2013-08-171-2/+1
| * | Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() regressio...Justin Clark-Casey (justincc)2013-08-171-2/+2
| * | refactor: Make AttachmentModulesTests.TestSameSimulatorNeighbouringRegionsTel...Justin Clark-Casey (justincc)2013-08-161-1/+1
| * | minor: remove unused entity transfer config in teleport v2 attachments testJustin Clark-Casey (justincc)2013-08-141-1/+0
* | | Merge branch 'master' into careminsterMelanie2013-08-131-1/+112
|\ \ \ | |/ /
| * | Create TestSameSimulatorNeighbouringRegionsTeleportV2() regression test for V...Justin Clark-Casey (justincc)2013-08-121-1/+112
* | | Merge branch 'master' into careminsterMelanie2013-08-071-3/+15
|\ \ \ | |/ /
| * | Move experimental attachments throttling further down the chain so that multi...Justin Clark-Casey (justincc)2013-08-021-16/+15
* | | Make atachment state load work againMelanie2013-08-021-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-08-011-15/+87
|\ \ \ | |/ /
| * | Add experimental "debug attachments throttle <ms>" setting (command line) and...Justin Clark-Casey (justincc)2013-08-011-15/+87
* | | Merge branch 'master' into careminsterMelanie2013-07-292-2/+11
|\ \ \ | |/ /
| * | Several major improvements to group (V2) chat. Specifically: handle join/drop...Diva Canto2013-07-271-2/+2
| * | Fix regression tests relating to agent transfer by making simulator use last ...Justin Clark-Casey (justincc)2013-07-261-0/+9
* | | Merge branch 'master' into careminsterMelanie2013-07-241-2/+4
|\ \ \ | |/ /