aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
* Merge branch 'master' into careminsterMelanie2012-08-019-26/+53
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-011-0/+3
| |\
| | * Fix a bug in pCampbot grabbing behaviour where an exception would be thrown i...Justin Clark-Casey (justincc)2012-08-011-0/+3
| * | Create the ability for physics modules to request assets on demand byMelanie2012-08-013-0/+22
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-013-12/+14
| |\
| | * BulletSim: fix problem where resizing a primary shape (cube or sphere) would ...Robert Adams2012-07-312-5/+3
| | * BulletSim: change boolean parameters in the shape data from int's to float's ...Robert Adams2012-07-312-7/+11
| * | Look up the NPC module when the SensorRepeat class is created, rather than on...Justin Clark-Casey (justincc)2012-08-011-5/+6
| |/
| * Change exception log messages in XInventoryService connector to error rather ...Justin Clark-Casey (justincc)2012-08-011-9/+8
* | Merge branch 'master' into careminsterMelanie2012-08-0112-70/+288
|\ \ | |/
| * Resolve a deadlock between INPCModule and SensorRepeat by replacing the Senso...Justin Clark-Casey (justincc)2012-07-311-35/+43
| * Fix bug in SoundModule.TriggerSound() where every sound update to an avatar w...Justin Clark-Casey (justincc)2012-07-311-3/+6
| * Adds support to ScriptModuleComms for region modules to exportMic Bowman2012-07-313-2/+74
| * BulletSim: add parameters and API calls for setting ERP and CFM.Robert Adams2012-07-316-29/+164
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-301-1/+11
| |\
| * | If we're fetching active gestures via the XInventoryServiceConnector, then pr...Justin Clark-Casey (justincc)2012-07-301-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-08-012-4/+12
|\ \ \
| * \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-07-311-1/+3
| |\ \ \
| | * | | Correct StandUp position and rotationMelanie2012-07-301-1/+3
| * | | | Reverse a senseless change in the prioritizer. Why I would want avatars to re...Melanie2012-07-311-3/+9
| |/ / /
* | | | Merge branch 'avination' into careminsterMelanie2012-07-295-5/+62
|\ \ \ \ | |/ / /
| * | | Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-4/+10
| * | | Fix an exception while outputting a log messageMelanie2012-07-291-1/+1
| * | | When controls are released by script, don't drop the permission toMelanie2012-07-291-2/+0
| * | | See that if controls are taken, those are released before taking new onesMelanie2012-07-291-0/+3
| * | | Bump number of URLs to 15000 per regionMelanie2012-07-291-1/+1
| * | | Implement the linefeed URL hack for ShoutCast and other servicesMelanie2012-07-271-0/+53
| * | | Change the stair fudge factor so steps of 0.5m can be climbled to match inwor...Melanie2012-07-271-2/+2
| * | | Allow load and save of IAR without a password. The password must still beMelanie2012-07-241-0/+3
* | | | Merge branch 'master' into careminsterMelanie2012-07-291-4/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-1/+11
| | |/ | |/|
* | | Fix some merge issues and a functional issue in the scene managerMelanie2012-07-281-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-07-2861-632/+1628
|\ \ \ | |/ /
| * | LSL/OSSL lacks Math.Min & Math.Max implementations.SignpostMarv2012-07-283-0/+54
| * | Avoid a race condition between the scene shutdown thread and the update threa...Justin Clark-Casey (justincc)2012-07-271-3/+5
| * | making first run more resilient to bad input (loop until good input, rather t...SignpostMarv2012-07-271-7/+19
| * | Remove the LandGeom checks in OdeScene - these are pointless since LandGeom i...Justin Clark-Casey (justincc)2012-07-271-4/+2
| * | minor: Comment out unused MemoryWatchdog.m_churnRatePerMillisecond - this is ...Justin Clark-Casey (justincc)2012-07-271-1/+1
| * | Remove duplicated IScenePresence.PresenceType. This is already in ISceneAgen...Justin Clark-Casey (justincc)2012-07-271-2/+0
| * | Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-272-3/+0
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-276-235/+427
| |\ \
| | * | BulletSim: fix a recursive loop when fetching the mass of the root of a linkset.Robert Adams2012-07-262-4/+4
| | * | BulletSim: refactor all the linkset logic out of the prim classRobert Adams2012-07-264-235/+409
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2012-07-262-25/+49
| | |\ \
| | * | | Add check so Ode does not try to simulate after it has been Dispose()'ed. Fix...Robert Adams2012-07-261-0/+9
| | * | | Add a Dispose() of the physics engine when a scene is being shutdown.Robert Adams2012-07-261-0/+9
| * | | | Fix issue where RegionCombinerModule was not removing regions from its dictio...Justin Clark-Casey (justincc)2012-07-271-0/+2
| | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-265-276/+778
| |\ \ \ | | |/ /
| | * | BulletSim: remove unused, commented out code in BSConstraintRobert Adams2012-07-251-8/+0
generated by cgit v1.1 at 2024-12-16 07:19:08 +0000