aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminsterMelanie2013-04-042-14/+3
|\
| * minor: Stop falsely logging that a teleport was being aborted on client logou...Justin Clark-Casey (justincc)2013-04-031-3/+1
| * Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent val...Justin Clark-Casey (justincc)2013-04-031-11/+2
* | Merge branch 'master' into careminsterMelanie2013-04-021-5/+6
|\ \ | |/
| * Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than...Justin Clark-Casey (justincc)2013-04-031-5/+6
* | Merge branch 'master' into careminsterMelanie2013-04-021-1/+1
|\ \ | |/
| * fix minor race condition in SOP.SitTargetPositionLL where inconsistency could...Justin Clark-Casey (justincc)2013-04-031-1/+1
* | Merge branch 'master' into careminsterMelanie2013-04-0218-231/+545
|\ \ | |/
| * minor: Make SOP.UpdateOffset() more consistent by checking against the same o...Justin Clark-Casey (justincc)2013-04-031-7/+7
| * Fix minor race condition where SOP.GetGeometricCenter() and GetCenterOfMass()...Justin Clark-Casey (justincc)2013-04-021-4/+4
| * BulletSim: create axis lock constraint with proper orientation andRobert Adams2013-04-021-4/+2
| * BulletSim: update unmanaged API for HACD parameter passing. Bullet HACDRobert Adams2013-04-013-6/+20
| * BulletSim: rearrange mega-region terrain code to make the thread flowRobert Adams2013-04-011-15/+18
| * Use Output instead of OutputFormat in appropriate places of XEngine status re...Justin Clark-Casey (justincc)2013-04-021-2/+2
| * minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.Updat...Justin Clark-Casey (justincc)2013-04-021-2/+0
| * Fix what appears to be a bug in HGUserManagementModule where it enables on th...Justin Clark-Casey (justincc)2013-04-021-2/+1
| * 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
| | * Export permission, part two. Setting export perms for textures and clothing w...Melanie2013-03-313-10/+74
| * | Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is eithe...Justin Clark-Casey (justincc)2013-04-021-6/+6
| |/
* | 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-294-65/+195
| | * 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