Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into vehicles | Melanie | 2009-10-02 | 17 | -1234/+785 |
|\ | |||||
| * | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 18 | -365/+404 |
| |\ | |||||
| * \ | Merge branch 'diva-textures-osgrid' into diva-textures | Melanie | 2009-10-02 | 3 | -59/+19 |
| |\ \ | |||||
| | * | | * Changed the flush logic to drop packets in non-transactional streams, and ↵ | John Hurliman | 2009-10-02 | 3 | -59/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | to not fire any "put more data in the queues" callbacks * Minor tweaks to code formatting to make the callback chain for packet queuing easier to follow | ||||
| * | | | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 189 | -4858/+4101 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | Restore the missing image handling to the image manager. The missing | Melanie | 2009-10-02 | 3 | -71/+92 |
| | | | | | | | | | | | | | | | | image packet crashes Hippo without a message. | ||||
| * | | | Merge branch 'diva-textures-osgrid' into texturetest | Melanie | 2009-10-02 | 1 | -7/+28 |
| |\ \ \ | |||||
| | * | | | Locking the priority queue to see if it gets pass that exception. | Diva Canto | 2009-10-01 | 1 | -7/+28 |
| | | | | | |||||
| * | | | | Change texture sending to be driven by the queue empty event from the | Melanie | 2009-10-02 | 4 | -90/+60 |
| |/ / / | | | | | | | | | | | | | packet queue, rather than a timer | ||||
| * | | | Removing console debug spew | John Hurliman | 2009-10-01 | 1 | -7/+7 |
| | | | | |||||
| * | | | Merge branch 'diva-textures-osgrid' of ↵ | John Hurliman | 2009-10-01 | 3 | -2/+93 |
| |\ \ \ | | | | | | | | | | | | | | | | ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid | ||||
| | * | | | Add a method to determine the count of packets in a throttle | Melanie | 2009-10-01 | 3 | -0/+27 |
| | | | | | |||||
| | * | | | Add OnQueueEmpty event to the packet layers. No user functinality yet | Melanie | 2009-10-01 | 3 | -2/+66 |
| | | | | | |||||
| * | | | | * Rewrote LLImageManager to use a real priority queue and hold minimal state | John Hurliman | 2009-10-01 | 3 | -449/+331 |
| |/ / / | | | | | | | | | | | | | | | | | * Rewrote the logic in J2KImage.RunUpdate() * Added a default avatar texture (I made it myself) | ||||
| * | | | Fixing LLClientView memory leak | James J Greensky | 2009-10-01 | 4 | -8/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing LLClientView memory leak by disposing of all timers utilized in LLClientView as they contain references to the callback method. This required the use of the Terminate and Close infrastructure that was already in place but was not being utilized. | ||||
| * | | | Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there. | Diva Canto | 2009-09-30 | 1 | -0/+14 |
| | | | | |||||
| * | | | * Change the signature of the agent set appearance callback to prevent ↵ | John Hurliman | 2009-09-30 | 4 | -26/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Prevent null data being sent to the decoder | Melanie | 2009-09-30 | 1 | -2/+5 |
| | | | | |||||
| * | | | Add RebakeAvatarTexturesPacket to the client view | Melanie | 2009-09-30 | 4 | -0/+22 |
| | | | | |||||
| * | | | Remove predecode-j2k and it's assoaciated logic | Melanie | 2009-09-30 | 2 | -142/+0 |
| | | | | |||||
| * | | | Squelch the debug noise from diva's patch | Melanie | 2009-09-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Attempting to improve the robustness of texture decoding by always ignoring ↵ | John Hurliman | 2009-09-30 | 5 | -534/+165 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Revert "Attempting to improve the robustness of texture decoding by always ↵ | Melanie | 2009-09-30 | 1 | -68/+168 |
| | | | | | | | | | | | | | | | | | | | | | | | | ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug" This reverts commit 22cc31135e2989df28e0756eb3b03f85530d5555. | ||||
| * | | | Attempting to improve the robustness of texture decoding by always ignoring ↵ | John Hurliman | 2009-09-30 | 1 | -168/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | This releases the texture assets from LLImageManager cache, and re-requests ↵ | Diva Canto | 2009-09-30 | 2 | -12/+48 |
| | | | | | | | | | | | | | | | | them later if the client asks for them again. Needs more testing in texture-rich sims. | ||||
* | | | | Merge branch 'master' into vehicles | Melanie | 2009-10-02 | 21 | -382/+477 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | reducing script engine log spam | dr scofield (aka dirk husemann) | 2009-10-02 | 1 | -4/+4 |
| | | | | |||||
| * | | | - cleaning up LandData/ILandObject capitalization issues | dr scofield (aka dirk husemann) | 2009-10-02 | 17 | -361/+400 |
| | |/ | |/| | | | | | | | - adding LandDataSerializer to OAR mechanics | ||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Adam Frisby | 2009-10-02 | 6 | -46/+28 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-02 | 1 | -12/+19 |
| | |\ \ | |||||
| | * | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵ | Melanie | 2009-10-02 | 6 | -46/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0. | ||||
| * | | | | * Attempting to fix a issue with console commands & the estate module. Again. | Adam Frisby | 2009-10-02 | 1 | -4/+52 |
| | |/ / | |/| | | |||||
| * | | | 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 | 6 | -46/+27 |
| | | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0. | ||||
* | | | Fix a merge conflict | Melanie | 2009-10-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into vehicles | Melanie | 2009-10-01 | 180 | -4620/+1662 |
|\ \ \ | |/ / | |||||
| * | | 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 | 26 | -37/+37 |
| |\ \ | |||||
| | * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 26 | -37/+37 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-09-30 | 187 | -4967/+4246 |
| |\ \ \ | | |/ / | |||||
| | * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 134 | -525/+525 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-09-30 | 2 | -1/+4 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-29 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | * | | | Minor bug fixes. | Diva Canto | 2009-09-29 | 2 | -1/+4 |
| | | | | | | |||||
| | * | | | | Change command help text to show .ini in place of .xml when creating regions | Melanie | 2009-09-30 | 1 | -2/+2 |
| | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim | dr scofield (aka dirk husemann) | 2009-09-29 | 3 | -1/+42 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-29 | 1 | -4/+7 |
| | | |\ \ | |||||
| | | * | | | A little hack to see if this fixes the problems with ~20% of SOG's becoming ↵ | Diva Canto | 2009-09-29 | 3 | -1/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | phantom after an import to megaregions. | ||||
| | * | | | | This fix addresses the problem where phantom objects do not | Alan M Webb | 2009-09-29 | 1 | -1/+1 |
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | always behave like they are phantom, and llVolumeDetect seems to operate in a random fashion. Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net> | ||||
| | * | | | Given the perverse way that strided works, if | Alan M Webb | 2009-09-29 | 1 | -4/+7 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is only one element in the range, it must also coincide with the specified stride. The existing code assumes that the stride starts at start ( which is the expected and most useful behavior). Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net> |