aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 02...Justin Clark-Casey (justincc)2013-04-091-1/+1
| | * minor: Log an exception if we aren't able to delete a script state file rathe...Justin Clark-Casey (justincc)2013-04-091-1/+6
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-04-0913-828/+1258
| | |\
| | | * BulletSim: moving comments around. No functional change.Robert Adams2013-04-083-10/+11
| | | * BulletSim: clean up actor code so routines use the same coding pattern.Robert Adams2013-04-0810-123/+137
| | | * BulletSim: complete movement of physical object action code out of theRobert Adams2013-04-0811-636/+1078
| | | * Optimize the number of Simian calls to get the initial presenceMic Bowman2013-04-071-110/+83
| | * | If OpenSimulator is writing a PID file and finds the file already present on ...Justin Clark-Casey (justincc)2013-04-091-0/+5
| | |/
| | * Fix taking (and rezzing) of coalesced objects in the non-root subregions of m...Justin Clark-Casey (justincc)2013-04-064-53/+76
| | * When rezzing a coalesced object, check adjust position of all components.Justin Clark-Casey (justincc)2013-04-061-20/+27
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-2221-253/+557
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2013-04-051-1/+1
| |\ \ | | |/
| | * * In between the fog, a moment of clarity. This fixes mantis 6570teravus2013-04-041-1/+1
| * | Merge branch 'master' into careminsterMelanie2013-04-041-1/+1
| |\ \ | | |/
| | * Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last u...Justin Clark-Casey (justincc)2013-04-041-1/+1
| | * refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more simply...Justin Clark-Casey (justincc)2013-04-041-10/+4
| | * Fix bug where outstanding llHTTPRequests for scripts were not being aborted w...Justin Clark-Casey (justincc)2013-04-043-32/+76
| * | 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
| | |/
* | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-226-12/+22
|/ /
* | 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
| |\ \ | | |/