aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-12-1636-507/+1125
|\
| * Make WebStatsModule properly handle scenes added or removed after initial sta...Justin Clark-Casey (justincc)2012-12-151-14/+31
| * minor: If the physics module tells us that an object has gone out of bounds, ...Justin Clark-Casey (justincc)2012-12-151-2/+5
| * minor: Add commented out log lines to ScenePresenceAnimator for future debug ...Justin Clark-Casey (justincc)2012-12-141-1/+10
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-12-1412-301/+433
| |\
| | * BulletSim: Add more to the TODO list. Clean up and improve some comments.Robert Adams2012-12-132-10/+9
| | * Return the last set targetVelocity rather than the current velocity as the de...Robert Adams2012-12-131-5/+8
| | * BulletSim: fix problem with continuious rebuilding of physical linksets. This...Robert Adams2012-12-133-79/+88
| | * BulletSim: correct line endings in new BulletSimData.cs file.Robert Adams2012-12-131-282/+282
| | * BulletSim: Add 'BulletSimData' which separates structures createdRobert Adams2012-12-137-205/+308
| | * BulletSim: remove extra linkset rebuilds.Robert Adams2012-12-131-18/+36
| * | Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, ...Justin Clark-Casey (justincc)2012-12-142-2/+42
| |/
| * minor: add some more detail to the logging if an LLClientView fails to proces...Justin Clark-Casey (justincc)2012-12-131-2/+4
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-12-131-30/+6
| |\
| | * Simplify sit code a bit by determining correct animation in HandleSit instead...Dan Lake2012-12-131-30/+6
| * | Add WaitForEventCompletionOnScriptStop [XEngine] config param to OpenSimDefau...Justin Clark-Casey (justincc)2012-12-131-10/+24
| |/
| * Fix formattingBlueWall2012-12-131-21/+24
| * Fix module pathname handling for WindowsBlueWall (James Hughes)2012-12-131-16/+22
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-12-1212-93/+228
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-12-137-71/+109
| | |\
| | | * BulletSim: fix problem of avatar's floating off the ground after unsitting. R...Robert Adams2012-12-124-24/+27
| | | * BulletSim: non-functional commenting and reorganization of material attribute...Robert Adams2012-12-122-33/+49
| | | * BulletSim: updates and rearrangement of the TODO list.Robert Adams2012-12-121-14/+33
| | * | Fix sounds so that they play from inventory after teleport rather than only o...Justin Clark-Casey (justincc)2012-12-131-2/+2
| | |/
| | * Log situations where workitem event threads are aborted on stop request becau...Justin Clark-Casey (justincc)2012-12-121-3/+3
| | * Add "debug script log" command to allow setting a numeric debug level on indi...Justin Clark-Casey (justincc)2012-12-124-17/+113
| | * Add asset id to "show script" and "show scripts" command output to make it ea...Justin Clark-Casey (justincc)2012-12-121-0/+1
| * | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-12-1218-111/+353
| |\ \ | | |/
| | * BulletSim: do not return the current velocity for targetVelocity.Robert Adams2012-12-121-0/+11
| | * BulletSim: fix crash caused by the creation of a linkset child that is under ...Robert Adams2012-12-111-4/+4
| | * BulletSim: protect character property setting to remove crash from taints set...Robert Adams2012-12-112-21/+42
| | * BulletSim: protect prim property setting to remove crash from taints setting ...Robert Adams2012-12-113-20/+45
| | * BulletSim: modify LIMIT_MOTOR_UP to limit BOAT types to be at water rather th...Robert Adams2012-12-111-2/+2
| | * BulletSim: add ini file and command line parameters to controlRobert Adams2012-12-114-8/+22
| | * BulletSim: set mass for single prim linksets when going physical. This fixes ...Robert Adams2012-12-111-1/+8
| | * BulletSim: comment out some chatty debug logging. Rearrange some code in BSDy...Robert Adams2012-12-102-5/+7
| | * BulletSim: Fix crash on the destruction of physical linksets.Robert Adams2012-12-1012-38/+155
| | * BulletSim: some comments about rebuilding linksets (having to recompute and r...Robert Adams2012-12-091-3/+6
| | * BulletSim: adjust friction and restitution based on material type.Robert Adams2012-12-092-5/+17
| | * HGAssetMapper: Get wasn't really working. It's true that some assets are copi...Diva Canto2012-12-091-3/+35
| | * Switched the order by which foreign inventory and foreign assets are brought ...Diva Canto2012-12-091-6/+4
| * | Hide some console output when initializing addin repositoryBlueWall2012-12-112-0/+29
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-12-094-17/+17
| |\
| * | UserManagementModule: search the local cache for names too.Diva Canto2012-12-092-1/+11
* | | Merge branch 'master' into careminsterMelanie2012-12-0916-93/+1317
|\ \ \ | | |/ | |/|
| * | Restrict IPresenceData.VerifyAgentBlueWall2012-12-094-17/+17
| |/
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-12-085-91/+111
| |\
| | * BulletSim: set material properties for static objects. Move Linkset.MakeStati...Robert Adams2012-12-082-11/+24
| | * BulletSim: fix small problem with setting size/scale of native shapes which c...Robert Adams2012-12-081-6/+9
| | * BulletSim: update comments and add more to TODO list.Robert Adams2012-12-082-4/+10