aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into vehiclesMelanie2009-10-121-56/+54
|\
| * Fixed tree crossing. This will alleviateDiva Canto2009-10-111-56/+54
| | | | | | | | http://opensimulator.org/mantis/view.php?id=4163
* | Merge branch 'master' into vehiclesMelanie2009-10-121-4/+11
|\ \ | |/
| * * comment out the velocity test, using updates every 500 ms as set in ↵Teravus Ovares (Dan Olivares)2009-10-101-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/opensimTeravus Ovares (Dan Olivares)2009-10-101-1/+1
| |\
| | * Adjust velocity threshold for triggering flailing. Thanks to KittoFlora for ↵dahlia2009-10-101-1/+1
| | | | | | | | | | | | researching this.
| * | * Make ODECharacter respect the scene's requested collision update timeTeravus Ovares (Dan Olivares)2009-10-101-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-101-1/+1
| | | | | | | | may reduce avatar flailing.
| * * Move the 'On Collision Update Movement Animation' routine to above the ↵Teravus Ovares (Dan Olivares)2009-10-101-3/+8
| | | | | | | | 'm_invulnerable' test. It doesn't fix anything but it should really be there anyway.
* | Merge branch 'master' into vehiclesMelanie2009-10-083-6/+9
|\ \ | |/
| * Merge branch 'master' into htb-throttleMelanie2009-10-071-1/+2
| |\
| | * A small change in FetchInventoryDescendantsCAPS.Diva Canto2009-10-061-1/+2
| | |
| | * Uncommented log message on CAPs FetchInventoryDescendantsDiva Canto2009-10-061-3/+3
| | |
| * | Uncommented log message on CAPs FetchInventoryDescendantsDiva Canto2009-10-071-3/+3
| | |
| * | Merge branch 'master' into htb-throttleMelanie2009-10-071-0/+1
| |\ \ | | |/
| | * * One more debug message on FetchInventoryDescendantsDiva Canto2009-10-061-0/+1
| | | | | | | | | | | | * More streams close on finally
| | * Revert "Rewrote parts of the code that were double-locking different ↵Melanie2009-10-072-43/+29
| | | | | | | | | | | | | | | | | | objects. This is about half of the code base reviewed." This reverts commit e992ca025571a891333a57012c2cd4419b6581e5.
| * | Revert "Merging in diva's locking fixes"Melanie2009-10-072-43/+29
| | | | | | | | | | | | This reverts commit 832cc685138b2244529f10b54b373c34adb4a633.
| * | Merging in diva's locking fixesJohn Hurliman2009-10-062-29/+43
| |\ \ | | |/
| | * Rewrote parts of the code that were double-locking different objects. This ↵Diva Canto2009-10-062-29/+43
| | | | | | | | | | | | is about half of the code base reviewed.
| * | Added a debug line for nebadonJohn Hurliman2009-10-061-0/+3
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵John Hurliman2009-10-061-0/+16
| |\ \ | | |/ | | | | | | htb-throttle
| * | Fixing a few compile errors in the previous commitJohn Hurliman2009-10-061-2/+0
| | |
* | | Merge branch 'master' into vehiclesMelanie2009-10-061-0/+16
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-061-6/+6
| |\ \
| | * | Commenting the DEBUG code that I added yesterday, because it's causing mono ↵Diva Canto2009-10-061-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | to fail with https://bugzilla.novell.com/show_bug.cgi?id=538854
| * | | Lock the heartbeat against multiple invocations. May prevent deadlocks and/orMelanie2009-10-061-0/+10
| |/ / | | | | | | | | | runaway thread use
| * | Correction on the DEBUG code.Diva Canto2009-10-051-4/+3
| | |
| * | #if DEBBUG code for monitoring the ThreadPool.Diva Canto2009-10-051-0/+7
| |/
* | Merge branch 'master' into vehiclesMelanie2009-10-053-5/+6
|\ \ | |/
| * disable physics actors for flexible primsdahlia2009-10-041-3/+4
| |
| * Merge branch 'diva-textures-osgrid'Melanie2009-10-042-2/+2
| |\
| | * * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵John Hurliman2009-10-022-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 vehiclesMelanie2009-10-022-129/+32
|\ \ \ | |/ /
| * | Merge branch 'master' into diva-texturesMelanie2009-10-022-15/+15
| |\ \
| * \ \ Merge branch 'master' into diva-texturesMelanie2009-10-0235-749/+503
| |\ \ \ | | |_|/ | |/| |
| * | | * Change the signature of the agent set appearance callback to prevent ↵John Hurliman2009-09-301-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 logicMelanie2009-09-301-122/+0
| | | |
| * | | Attempting to improve the robustness of texture decoding by always ignoring ↵John Hurliman2009-09-301-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 vehiclesMelanie2009-10-023-27/+34
|\ \ \ \ | | |_|/ | |/| |
| * | | - cleaning up LandData/ILandObject capitalization issuesdr scofield (aka dirk husemann)2009-10-022-15/+15
| | |/ | |/| | | | | | | - adding LandDataSerializer to OAR mechanics
| * | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-021-12/+19
| |\ \
| | * | Added messages to assertions in the failing tests, so that we know which ↵Diva Canto2009-10-011-12/+19
| | | | | | | | | | | | | | | | ones are failing.
| * | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵Melanie2009-10-023-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 ↵Melanie2009-10-023-36/+16
| | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
* | | Merge branch 'master' into vehiclesMelanie2009-10-0135-738/+487
|\ \ \ | |/ /
| * | Removed an innefficent List.Contains lookup from UpdateQueueJames J Greensky2009-09-301-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/opensimJohn Hurliman2009-09-308-13/+13
| |\ \
| | * | Formatting cleanup.Jeff Ames2009-10-018-13/+13
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-3032-829/+616
| |\ \ \ | | |/ /
generated by cgit v1.1 at 2024-10-30 01:25:56 +0000