aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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-282-40/+3
* | | Add master's new binariesMelanie2012-07-284-0/+0
* | | Merge branch 'master' into careminsterMelanie2012-07-2870-658/+1740
|\ \ \ | |/ /
| * | 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
| * | adding asset cache and map tile directories to .gitignoreSignpostMarv2012-07-271-0/+2
| * | Remove the LandGeom checks in OdeScene - these are pointless since LandGeom i...Justin Clark-Casey (justincc)2012-07-271-4/+2
| * | Update OpenMetaverse libraries at commit 6212cbd, this time built on Windowsjustincc2012-07-275-0/+0
| * | 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
| * | Replace libopenmetaverse commit 6212cbd with the same libraries but this time...Justin Clark-Casey (justincc)2012-07-274-0/+0
| * | Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-272-3/+0
| * | Update libopenmetaverse to commit 6212cbd (Wed Jul 25 20:11:47 2012)Justin Clark-Casey (justincc)2012-07-274-0/+0
| * | Add autoclean for scripted useBlueWall2012-07-261-0/+13
| * | Add target switchesBlueWall2012-07-261-0/+11
| * | add clean task to reuprebuild.shBlueWall2012-07-261-2/+16
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-277-237/+429
| |\ \
| | * | 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-265-237/+411
| | * | 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-2610-276/+784
| |\ \ \ | | |/ /
| | * | BulletSim: update BulletSim DLLs and SOsRobert Adams2012-07-254-0/+0
| | * | 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-253-17/+38
| | * | BulletSim: small change to use the pointer to the bullet object for zeroing f...Robert Adams2012-07-251-6/+5
| | * | BulletSim: Redo parameter specification so only one place hasRobert Adams2012-07-251-248/+378
| | * | BulletSim: Add C# classes for storing and tracking constraints.Robert Adams2012-07-252-0/+301
| | * | BulletSim: Move constraint tracking from C++ code to C# codeRobert Adams2012-07-252-18/+83
| * | | When copying items, copy the item description field instead of the asset desc...Justin Clark-Casey (justincc)2012-07-262-25/+49
| |/ /
| * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring wi...Justin Clark-Casey (justincc)2012-07-2514-28/+42