aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Remove a merge artefaci in IsActive handling and restore commented out correc...Melanie2012-08-031-2/+1
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-032-5/+7
|\ \ \ \ \ | |/ / / /
| * | | | minor change avoiding a null referenceUbitUmarov2012-08-031-2/+4
| * | | | clientview IsActive use is broken. Suspend it's use keeping it true ( toUbitUmarov2012-08-031-3/+3
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-032-0/+10
|\ \ \ \ \ | |/ / / /
| * | | | Make sure the position of a loggin-in agent is within region boundaries sinceMelanie2012-08-031-0/+9
| * | | | Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
| |/ / /
* | | | merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster...ubit2012-08-0294-1292/+3427
|\ \ \ \ | |/ / /
| * | | 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 'avination' into careminsterMelanie2012-07-295-5/+62
| |\ \ \ \
| * \ \ \ \ 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
| | | * | | BulletSim: fix line endings in newly added files (Is it DOS or is it UNIX? On...Robert Adams2012-07-252-301/+301
| | | * | | BulletSim: add parameters for setting linkset constraint factorsRobert Adams2012-07-252-17/+32
| | | * | | BulletSim: small change to use the pointer to the bullet object for zeroing f...Robert Adams2012-07-251-6/+5