Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into vehicles | Melanie | 2009-10-12 | 1 | -4/+11 |
|\ | |||||
| * | * comment out the velocity test, using updates every 500 ms as set in ↵ | Teravus Ovares (Dan Olivares) | 2009-10-10 | 1 | -2/+4 |
| | | | | | | | | | | | | | | ScenePresence.AddToPhysicalScene. * This causes time to be counted in ODECharacter and, when a collision occurs, the physics scene will report the collisions only if the the difference of last time it reported the collisions from now was more then the set ms. * This is cool because the time accrues while collisions are not taking place and when they do take place again, you get an immediate update. | ||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-10-10 | 1 | -1/+1 |
| |\ | |||||
| | * | Adjust velocity threshold for triggering flailing. Thanks to KittoFlora for ↵ | dahlia | 2009-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | researching this. | ||||
| * | | * Make ODECharacter respect the scene's requested collision update time | Teravus Ovares (Dan Olivares) | 2009-10-10 | 1 | -1/+1 |
| |/ | | | | | | | * Set the Scene collision update time to 500 ms | ||||
| * | * Fix incorrect math on the Velocity check in PhysicsCollisionUpdate. This ↵ | Teravus Ovares (Dan Olivares) | 2009-10-10 | 1 | -1/+1 |
| | | | | | | | | may reduce avatar flailing. | ||||
| * | * Move the 'On Collision Update Movement Animation' routine to above the ↵ | Teravus Ovares (Dan Olivares) | 2009-10-10 | 1 | -3/+8 |
| | | | | | | | | 'm_invulnerable' test. It doesn't fix anything but it should really be there anyway. | ||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-08 | 3 | -6/+9 |
|\ \ | |/ | |||||
| * | Merge branch 'master' into htb-throttle | Melanie | 2009-10-07 | 1 | -1/+2 |
| |\ | |||||
| | * | A small change in FetchInventoryDescendantsCAPS. | Diva Canto | 2009-10-06 | 1 | -1/+2 |
| | | | |||||
| | * | Uncommented log message on CAPs FetchInventoryDescendants | Diva Canto | 2009-10-06 | 1 | -3/+3 |
| | | | |||||
| * | | Uncommented log message on CAPs FetchInventoryDescendants | Diva Canto | 2009-10-07 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into htb-throttle | Melanie | 2009-10-07 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | * One more debug message on FetchInventoryDescendants | Diva Canto | 2009-10-06 | 1 | -0/+1 |
| | | | | | | | | | | | | * More streams close on finally | ||||
| | * | Revert "Rewrote parts of the code that were double-locking different ↵ | Melanie | 2009-10-07 | 2 | -43/+29 |
| | | | | | | | | | | | | | | | | | | objects. This is about half of the code base reviewed." This reverts commit e992ca025571a891333a57012c2cd4419b6581e5. | ||||
| * | | Revert "Merging in diva's locking fixes" | Melanie | 2009-10-07 | 2 | -43/+29 |
| | | | | | | | | | | | | This reverts commit 832cc685138b2244529f10b54b373c34adb4a633. | ||||
| * | | Merging in diva's locking fixes | John Hurliman | 2009-10-06 | 2 | -29/+43 |
| |\ \ | | |/ | |||||
| | * | Rewrote parts of the code that were double-locking different objects. This ↵ | Diva Canto | 2009-10-06 | 2 | -29/+43 |
| | | | | | | | | | | | | is about half of the code base reviewed. | ||||
| * | | Added a debug line for nebadon | John Hurliman | 2009-10-06 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵ | John Hurliman | 2009-10-06 | 1 | -0/+16 |
| |\ \ | | |/ | | | | | | | htb-throttle | ||||
| * | | Fixing a few compile errors in the previous commit | John Hurliman | 2009-10-06 | 1 | -2/+0 |
| | | | |||||
* | | | Merge branch 'master' into vehicles | Melanie | 2009-10-06 | 1 | -0/+16 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-06 | 1 | -6/+6 |
| |\ \ | |||||
| | * | | Commenting the DEBUG code that I added yesterday, because it's causing mono ↵ | Diva Canto | 2009-10-06 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | to fail with https://bugzilla.novell.com/show_bug.cgi?id=538854 | ||||
| * | | | Lock the heartbeat against multiple invocations. May prevent deadlocks and/or | Melanie | 2009-10-06 | 1 | -0/+10 |
| |/ / | | | | | | | | | | runaway thread use | ||||
| * | | Correction on the DEBUG code. | Diva Canto | 2009-10-05 | 1 | -4/+3 |
| | | | |||||
| * | | #if DEBBUG code for monitoring the ThreadPool. | Diva Canto | 2009-10-05 | 1 | -0/+7 |
| |/ | |||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-05 | 3 | -5/+6 |
|\ \ | |/ | |||||
| * | disable physics actors for flexible prims | dahlia | 2009-10-04 | 1 | -3/+4 |
| | | |||||
| * | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-04 | 2 | -2/+2 |
| |\ | |||||
| | * | * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵ | John Hurliman | 2009-10-02 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework) * Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization? | ||||
* | | | Merge branch 'master' into vehicles | Melanie | 2009-10-02 | 2 | -129/+32 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 2 | -15/+15 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 35 | -749/+503 |
| |\ \ \ | | |_|/ | |/| | | |||||
| * | | | * Change the signature of the agent set appearance callback to prevent ↵ | John Hurliman | 2009-09-30 | 1 | -7/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes * Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures * Properly handle appearance updates that do not have a TextureEntry set | ||||
| * | | | Remove predecode-j2k and it's assoaciated logic | Melanie | 2009-09-30 | 1 | -122/+0 |
| | | | | |||||
| * | | | Attempting to improve the robustness of texture decoding by always ignoring ↵ | John Hurliman | 2009-09-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory * Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K * Renamed IJ2KDecoder and J2KDecoder member names to follow standard naming conventions * Removed j2kDecodeCache cruft and replaced it with the OpenSim cache system * Rewrote the default layer boundary algorithm to use percentages instead of an exponent * Switched from an infinite in-memory cache to an expiring cache (10 minute timeout) * Slightly quieted logging errors for failed texture decodes | ||||
* | | | | Merge branch 'master' into vehicles | Melanie | 2009-10-02 | 3 | -27/+34 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | - cleaning up LandData/ILandObject capitalization issues | dr scofield (aka dirk husemann) | 2009-10-02 | 2 | -15/+15 |
| | |/ | |/| | | | | | | | - adding LandDataSerializer to OAR mechanics | ||||
| * | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-02 | 1 | -12/+19 |
| |\ \ | |||||
| | * | | Added messages to assertions in the failing tests, so that we know which ↵ | Diva Canto | 2009-10-01 | 1 | -12/+19 |
| | | | | | | | | | | | | | | | | ones are failing. | ||||
| * | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵ | Melanie | 2009-10-02 | 3 | -36/+16 |
| |/ / | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0. | ||||
* | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵ | Melanie | 2009-10-02 | 3 | -36/+16 |
| | | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0. | ||||
* | | | Merge branch 'master' into vehicles | Melanie | 2009-10-01 | 35 | -738/+487 |
|\ \ \ | |/ / | |||||
| * | | Removed an innefficent List.Contains lookup from UpdateQueue | James J Greensky | 2009-09-30 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | | | Changed the underlying data structure used to detected duplicate in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a List to a Dictionary. | ||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-09-30 | 8 | -13/+13 |
| |\ \ | |||||
| | * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 8 | -13/+13 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-09-30 | 32 | -829/+616 |
| |\ \ \ | | |/ / | |||||
| | * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 27 | -124/+124 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim | dr scofield (aka dirk husemann) | 2009-09-29 | 2 | -0/+22 |
| | |\ \ |