aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-04-0213-203/+567
| | |\
| | | * BulletSim: stop an avatar from moving if standing on a stationaryRobert Adams2013-03-311-1/+8
| | | * BulletSim: not quite functional axis lock code.Robert Adams2013-03-315-35/+43
| | | * BulletSim: start the renaming of local variables to m_ form to match the Open...Robert Adams2013-03-311-23/+23
| | | * BulletSim: fix line endings in BSActor*Robert Adams2013-03-312-291/+302
| | | * BulletSim: convert BSDynamic to a BSActor and change BSPrim to setRobert Adams2013-03-315-112/+149
| | | * BulletSim: Add physical 'actors' that operate on the physical object.Robert Adams2013-03-314-74/+311
| | * | Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is eithe...Justin Clark-Casey (justincc)2013-04-021-6/+6
* | | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-226-12/+22
* | | | Add the set object owner floater templateMelanie2013-04-221-0/+8
|/ / /
* | | Merge branch 'master' into careminsterMelanie2013-03-310-0/+0
|\ \ \ | | |/ | |/|
| * | Export permission, part two. Setting export perms for textures and clothing w...Melanie2013-03-313-10/+74
| |/
* | Merge branch 'master' into careminsterMelanie2013-03-312-44/+34
|\ \ | |/
| * In the flotasm asset cache, if we get a request for a file that we're activel...Justin Clark-Casey (justincc)2013-03-301-25/+27
| * refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to Infor...Justin Clark-Casey (justincc)2013-03-301-9/+9
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-3131-396/+1089
|\ \
| * \ 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
| * | Merge branch 'master' into careminsterMelanie2013-03-297-85/+216
| |\ \ | | |/
| | * Added missing functionality (mainly custom headers) to llHTTPRequest.Kevin Cozens2013-03-295-65/+196
| | * Check viewer 2/3 attachment calls against avatar appearance attachment data r...Justin Clark-Casey (justincc)2013-03-293-26/+23
| * | Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminsterMelanie2013-03-293-1/+33
| |\ \ | | |/
| | * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scrip...Justin Clark-Casey (justincc)2013-03-294-2/+31
| * | Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminsterMelanie2013-03-291-1/+1
| |\ \ | | |/
| | * Revert "Try eliminating the pause before auto-reteleporting for a megaregion ...Justin Clark-Casey (justincc)2013-03-291-1/+1
| * | Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminsterMelanie2013-03-291-0/+3
| |\ \ | | |/
| | * Add Location (relative), Rotation (Relative) and Rotation (World) to "show pa...Justin Clark-Casey (justincc)2013-03-291-0/+3
| * | Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminsterMelanie2013-03-291-1/+1
| |\ \ | | |/
| | * Try eliminating the pause before auto-reteleporting for a megaregion now that...Justin Clark-Casey (justincc)2013-03-291-1/+1
| * | Merge branch 'master' into careminsterMelanie2013-03-291-21/+0
| |\ \ | | |/
| | * Eliminate code which tries to restart attachment scripts in ScenePresence.Mak...Justin Clark-Casey (justincc)2013-03-291-18/+0
| * | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-294-24/+23
| |\ \ | | |/
| | * Stop attempts to update/add existing attachments in user inventory when telep...Justin Clark-Casey (justincc)2013-03-284-24/+25
| * | Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminsterMelanie2013-03-291-54/+145
| |\ \ | | |/
| | * Add "debug attachments" console command to allow highly verbose attachment lo...Justin Clark-Casey (justincc)2013-03-281-61/+109
| * | Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminsterMelanie2013-03-291-5/+0
| |\ \ | | |/
| | * minor: remove some mono compiler warnings from EntityTransferModuleJustin Clark-Casey (justincc)2013-03-281-5/+0
| * | Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminsterMelanie2013-03-291-27/+27
| |\ \ | | |/
| | * minor: comment out unused Scene.AgentCrossing() to reduce code complexityJustin Clark-Casey (justincc)2013-03-281-27/+27
| * | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-293-11/+19
| |\ \ | | |/
| | * If the viewer has already rezzed any attachments itself, then ignore the simu...Justin Clark-Casey (justincc)2013-03-283-11/+19
| * | Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminsterMelanie2013-03-291-2/+2
| |\ \ | | |/
| | * Fix regression tests by making a new NPC always trigger simulator side attach...Justin Clark-Casey (justincc)2013-03-281-2/+2
| * | Merge commit 'e97567e22740b7161ae1c0fe45c2dcec3abbfd4b' into careminsterMelanie2013-03-290-0/+0
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-285-43/+64
| | |\
| * | \ Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-293-45/+39
| |\ \ \ | | |/ /
| | * | Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with...Justin Clark-Casey (justincc)2013-03-283-39/+32
| * | | Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminsterMelanie2013-03-295-43/+64
| |\ \ \ | | | |/ | | |/|
| | * | BulletSim: fix race condition when creating very large mega-regions.Robert Adams2013-03-285-22/+35
| | * | BulletSim: tweaks to terrain boundry computation. No functional changes.Robert Adams2013-03-281-21/+29
| | |/