aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-04-213-12/+620
|\
| * Materials persistence via SceneObjectPart.dynAttrs. This appears to work acro...dahlia2013-04-201-8/+154
| * handle PUT verb for RenderMaterials Capdahlia2013-04-201-1/+5
| * RenderMaterials POST Cap now return material entries when invoked with an OSD...dahlia2013-04-191-61/+108
| * Materials-capable viewers send ImageUpdate packets when updating materials th...dahlia2013-04-191-11/+35
| * remove default parameter value that apparently mono cant handledahlia2013-04-181-1/+1
| * Initial experimental support for materials-capable viewers. This is in a very...dahlia2013-04-181-0/+382
| * amend previous commit, a line was left outdahlia2013-04-171-0/+1
| * Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential cras...dahlia2013-04-171-2/+6
| * Allow changes to TextureEntry to propagate to viewers when MaterialID changesdahlia2013-04-171-0/+2
* | Merge branch 'master' into careminsterMelanie2013-04-163-8/+14
|\ \ | |/
| * refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing Sto...Justin Clark-Casey (justincc)2013-04-163-8/+14
* | Merge branch 'master' into careminsterMelanie2013-04-1026-998/+1603
|\ \ | |/
| * BulletSim: fixing problems with llMoveToTarget. Not all fixed yet.Robert Adams2013-04-093-6/+18
| * BulletSim: some formatting changes.Robert Adams2013-04-091-10/+17
| * Another algorithm for AngularVerticalAttraction. This one Takes into account ...Vegaslon2013-04-091-0/+23
| * BulletSim: add Bullet HACD library invocation. Turned off by default as notRobert Adams2013-04-093-94/+183
| * BulletSim: fix problem where large sets of mega-regions weren't registeringRobert Adams2013-04-091-3/+3
| * minor: fix mono compiler warning in ScriptsHttpRequests.csJustin Clark-Casey (justincc)2013-04-101-1/+0
| * minor: remove mono compiler warnings in InventoryAccessModuleJustin Clark-Casey (justincc)2013-04-101-3/+2
| * minor: Make exceptions thrown by MySQLAssetData more consistent.Justin Clark-Casey (justincc)2013-04-101-10/+19
| * 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' 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