aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix very recently introduced race condition where a CreateNewItem outracing a...Justin Clark-Casey (justincc)2012-09-271-19/+18
* Comment out old m_storeLocal from AssetXferUploader.Justin Clark-Casey (justincc)2012-09-271-6/+6
* Insert transaction ID into AssetXferUploader constructor rather than at Uploa...Justin Clark-Casey (justincc)2012-09-272-36/+49
* Move UDP update task item code to AssetXferUploader to match existing create ...Justin Clark-Casey (justincc)2012-09-273-50/+52
* Fix occasional race condition failure when creating new clothing/body parts i...Justin Clark-Casey (justincc)2012-09-273-110/+93
* Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminsterMelanie2012-09-271-2/+0
|\
| * Deleted extraneous debug messageDiva Canto2012-09-251-2/+0
* | Merge branch 'master' into careminsterMelanie2012-09-2410-115/+468
|\ \ | |/
| * HG Rez object: warn the user if the item or asset cannot be found.Diva Canto2012-09-221-2/+7
| * Guard against inventory get failures.Diva Canto2012-09-221-0/+3
| * This fixes HG attachments' missing assets (textures, etc).Diva Canto2012-09-211-0/+28
| * Moved the small HGUuidGatherer class to the file where its parent class is. N...Diva Canto2012-09-212-74/+2
| * Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already do...Diva Canto2012-09-211-18/+24
| * Minor: may avoid crashes of sims that still don't have this configuration sec...Diva Canto2012-09-211-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-211-2/+2
| |\
| | * Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't b...Justin Clark-Casey (justincc)2012-09-211-2/+2
| * | HG 2.0: added asset import/export policies at the sim too.Diva Canto2012-09-211-8/+15
| * | Minor: change the return value of unsuccessful posts to string.Empty.Diva Canto2012-09-211-1/+1
| |/
| * More HG2.0: Added permission policies in HGAsset Service based on asset types...Diva Canto2012-09-201-15/+19
| * Correctly override and call base OpenSimTestCase.SetUp() method in GridConnec...Justin Clark-Casey (justincc)2012-09-193-6/+11
| * Moving ScriptModuleComms into the CoreModules tree.Mic Bowman2012-09-171-0/+367
* | Merge branch 'master' into careminsterMelanie2012-09-171-31/+59
|\ \ | |/
| * HG2.0: Generalized the allowed HG appearances to be more than 1.Diva Canto2012-09-161-31/+59
* | Merge branch 'avination' into careminsterMelanie2012-09-161-2/+2
|\ \
| * | Wait longer for arrival cofirmation to aid tps into laggy regionsMelanie2012-09-141-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-09-1617-774/+2011
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-1512-760/+1826
| |\ \
| | * | Add basic asset connector tests to check behaviour for normal, local and temp...Justin Clark-Casey (justincc)2012-09-152-2/+141
| | * | For FlotsamAssetCache, always update access times of cached scene assets befo...Justin Clark-Casey (justincc)2012-09-151-20/+17
| | * | Added unit tests for multi-region OARsOren Hurvitz2012-09-141-58/+326
| | * | Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the ...Justin Clark-Casey (justincc)2012-09-143-9/+9
| | * | Support multi-region OAR filesOren Hurvitz2012-09-148-395/+1057
| * | | More on HG2.0: added the possibility of controlling the appearance that avies...Diva Canto2012-09-152-2/+171
| |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-131-1/+1
| |\ \
| | * | correcting a typo that causes c# express to complain about xml comment contai...SignpostMarv2012-09-131-1/+1
| * | | Restarting to work on HGSuitcaseInventoryService: added the ability for the o...Diva Canto2012-09-131-0/+2
| |/ /
| * | minor: Comment out friends notification log spam for now.Justin Clark-Casey (justincc)2012-09-121-3/+3
* | | Merge branch 'avination' into careminsterMelanie2012-09-104-144/+215
|\ \ \ | | |/ | |/|
| * | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IMMelanie2012-09-091-0/+3
| * | stop sending duplicated parcelProprieties at loginUbitUmarov2012-09-071-18/+39
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-041-0/+6
| |\ \
| | * | let avatar keep flying in tps to same region. (still bad for otherUbitUmarov2012-09-041-0/+6
| * | | Remove debug spamMelanie2012-09-041-6/+6
| * | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-041-94/+110
| |/ /
| * | try to reduce potencial recursive lockingUbitUmarov2012-09-011-26/+51
* | | Merge branch 'master' into careminsterMelanie2012-09-103-2/+4
|\ \ \ | | |/ | |/|
| * | Adjust namespce of FlotsamCacheBlueWall2012-09-092-2/+1
| * | Revert "Move addin information to CoreModulePlugin.addin.xml"BlueWall2012-09-093-3/+6
* | | Merge branch 'master' into careminsterMelanie2012-09-0711-51/+230
|\ \ \ | |/ /
| * | Move addin information to CoreModulePlugin.addin.xmlBlueWall2012-09-073-6/+3