Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into vehicles | Melanie | 2009-10-05 | 20 | -358/+323 |
|\ | |||||
| * | * KeepAlive set to false in expect_user and log_off. | Diva Canto | 2009-10-04 | 1 | -4/+9 |
| | | | | | | | | * Check for null SP in PermissionsModule. | ||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-10-04 | 1 | -7/+4 |
| |\ | |||||
| | * | * MySQL data tests now pass by fixing a bad fix for a bad cast on the asset ↵ | John Hurliman | 2009-10-04 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | | | Local member in MySQLAssetData * First pass at applying the using(){} pattern to IDisposable objects. Always use the using pattern on IDisposable objects whenever possible, do not manually call .Close() or .Dispose() unless there is no other way to write the code. This pass mostly covers OpenSim.Data.MySQL, and should have no functional change (tests still pass) | ||||
| * | | Reduced locking. | Diva Canto | 2009-10-04 | 1 | -8/+10 |
| |/ | |||||
| * | Guarding a line that is sometimes throwing a null pointer exception. | Diva Canto | 2009-10-04 | 1 | -5/+6 |
| | | |||||
| * | Stream needs to be closed before the file can be moved... | Diva Canto | 2009-10-04 | 1 | -5/+6 |
| | | |||||
| * | Make sure to close the file streams on the FlotsamCache, even if something ↵ | Diva Canto | 2009-10-04 | 1 | -4/+12 |
| | | | | | | | | fails. | ||||
| * | Trying to avoid the null pointer exception in J2KImage, RunUpdate. | Diva Canto | 2009-10-04 | 1 | -1/+9 |
| | | |||||
| * | flexible extrusion shape defaults to linear | dahlia | 2009-10-04 | 1 | -1/+1 |
| | | |||||
| * | disable physics actors for flexible prims | dahlia | 2009-10-04 | 1 | -3/+4 |
| | | |||||
| * | Exclude sculpt proxies from mesh caching | dahlia | 2009-10-04 | 1 | -6/+23 |
| | | |||||
| * | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-04 | 13 | -24/+24 |
| |\ | |||||
| | * | * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵ | John Hurliman | 2009-10-02 | 13 | -24/+24 |
| | | | | | | | | | | | | | | | | | | 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? | ||||
| * | | Fix my build break | Melanie | 2009-10-03 | 1 | -2/+2 |
| | | | |||||
| * | | Small permissions tweak | Melanie | 2009-10-03 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-03 | 1 | -126/+88 |
| |\ \ | | |/ | |||||
| | * | * Removed code that is no longer used with Melanie's queue callback optimization | John Hurliman | 2009-10-02 | 1 | -126/+88 |
| | | | | | | | | | | | | | | | * Moved all priority queue access to helper functions to improve reliability and readability * New version of CSJ2K.dll (from libomv source tree) that fixes a JPEG2000 comment decoding bug | ||||
| * | | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-02 | 2 | -182/+142 |
| |\ \ | | |/ | |||||
| | * | * Removed even more unnecessary state variables from J2KImage | John Hurliman | 2009-10-02 | 2 | -182/+142 |
| | | | | | | | | | | | | | | | * Fixed the incorrect "out of memory?" exception messages and replaced them with useful information * Cleaned up J2KImage and LLImageManager to conform to coding conventions | ||||
* | | | 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 |
| | |\ \ |