aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-2712-19/+147
|\
| * Use GridUser properly for foreign users.Diva Canto2012-09-265-8/+35
| * Show the user's home url too on the console command.Diva Canto2012-09-261-4/+3
| * Not really a change, just added a reminder to fix something here.Diva Canto2012-09-261-0/+3
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-254-234/+248
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-251-35/+65
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-09-254-191/+364
| | | |\
| | | * | Format OpenSim.ini.exampleBlueWall2012-09-251-35/+65
| * | | | TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-257-5/+104
| * | | | Oops, that should be inside the curly bracket.Diva Canto2012-09-251-3/+3
* | | | | Merge commit 'ddd9384b3901f532243c1e8018334385b84290d1' into careminsterMelanie2012-09-270-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix very recently introduced race condition where a CreateNewItem outracing a...Justin Clark-Casey (justincc)2012-09-251-19/+18
| | |_|/ | |/| |
| * | | Comment out old m_storeLocal from AssetXferUploader.Justin Clark-Casey (justincc)2012-09-251-6/+6
| * | | Insert transaction ID into AssetXferUploader constructor rather than at Uploa...Justin Clark-Casey (justincc)2012-09-252-36/+49
| * | | Move UDP update task item code to AssetXferUploader to match existing create ...Justin Clark-Casey (justincc)2012-09-253-64/+52
| * | | Fix occasional race condition failure when creating new clothing/body parts i...Justin Clark-Casey (justincc)2012-09-253-110/+94
* | | | 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
* | | | Format OpenSim.ini.exampleBlueWall2012-09-271-35/+65
* | | | 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-272-4/+190
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-251-2/+190
| |\ \ \ | | |/ /
| | * | Documenting object-related eventsSignpostMarv2012-09-241-0/+43
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-249-27/+269
| | |\ \ | | | |/
| | * | Documenting LSL script-related eventsSignpostMarv2012-09-241-2/+147
| * | | Deleted extraneous debug messageDiva Canto2012-09-251-2/+0
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-09-24108-455/+13520
|\ \ \ | |/ /
| * | 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
| * | Make BaseHttpServer throws say something useful.Diva Canto2012-09-221-2/+2
| * | HG 2.0: User Agent Service now can also control where the local users can go....Diva Canto2012-09-223-4/+136
| * | More HG 2.0: access control at the Gatekeeper. \o/Diva Canto2012-09-213-9/+76
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-212-74/+52
| |\ \ | | |/
| | * Remove deprecated parameters for region_id.Michelle Argus2012-09-221-74/+0
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-223-74/+38
| | |\
| | * | Documenting non-LSL script-related eventsSignpostMarv2012-09-221-0/+52
| * | | This fixes HG attachments' missing assets (textures, etc).Diva Canto2012-09-212-10/+45
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-212-8/+150
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-223-19/+28
| | |\
| | * | Fix llListFindList() returning no match when there is a match with a script c...Justin Clark-Casey (justincc)2012-09-222-8/+150
| * | | Moved the small HGUuidGatherer class to the file where its parent class is. N...Diva Canto2012-09-213-74/+38
| | |/ | |/|
| * | 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-212-1/+4
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-218-180/+210
| |\
| | * minor: Make slow outgoing request log messages consistent with other log mess...Justin Clark-Casey (justincc)2012-09-211-7/+7
| | * Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't b...Justin Clark-Casey (justincc)2012-09-212-9/+6
| | * Simplify UuidGatherer by performing asset fetch synchronously rather than usi...Justin Clark-Casey (justincc)2012-09-211-40/+44
| | * Comment out the long unused afaik HTTP agent handlers.Justin Clark-Casey (justincc)2012-09-215-106/+112