aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
| | * | 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
| | * | 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-2513-2/+13
| * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-2526-29/+27
| * | Add MemoryWatchdog class missing from git master a1e9964Justin Clark-Casey (justincc)2012-07-251-0/+129
| * | Correct churn stat from MB/s from KB/sJustin Clark-Casey (justincc)2012-07-251-1/+1
| * | Add experimental "OpenSim object memory churn" statistics to output of region...Justin Clark-Casey (justincc)2012-07-255-63/+72
| * | Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-258-18/+87
* | | Merge branch 'master' into careminsterMelanie2012-07-257-138/+370
|\ \ \ | |/ /
| * | Rename "image queues clear" console command to "clear image queues"Justin Clark-Casey (justincc)2012-07-241-12/+6
| * | Add information about each column to "show queues" region console command help.Justin Clark-Casey (justincc)2012-07-241-2/+9
| * | Extend region console "show queues" command to show already collected time si...Justin Clark-Casey (justincc)2012-07-242-19/+26
| * | Remove bad using statement in AttachmentsModuleTests.Justin Clark-Casey (justincc)2012-07-241-2/+1
| * | extend regression TestRezScriptedAttachmentFromInventory() to check actual st...Justin Clark-Casey (justincc)2012-07-241-3/+19
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-243-96/+265
| |\ \
| | * | BulletSim: change how prim mass is saved so it is always calculated but zero ...Robert Adams2012-07-231-20/+23