Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | One last attempt at tunning the locking/no locking behaviour. The previous ↵ | Diva Canto | 2009-10-07 | 1 | -10/+16 |
| | | | | one was too lax and made the important login packets fail. | ||||
* | Another go at the deadlock: not locking TryGetValue, and just catch/ignore ↵ | Diva Canto | 2009-10-07 | 1 | -15/+31 |
| | | | | exceptions. | ||||
* | Changed the locking mechanism, because the existing one is causing deadlocks ↵ | Diva Canto | 2009-10-07 | 1 | -25/+100 |
| | | | | to occur. | ||||
* | replace LLClientView with proper version | Melanie | 2009-10-07 | 1 | -1898/+1332 |
| | |||||
* | Replace LLClientView on the branch with master. UNCOMPILABLE! | Melanie | 2009-10-07 | 1 | -1332/+1898 |
| | |||||
* | Revert "Merging in diva's locking fixes" | Melanie | 2009-10-07 | 1 | -69/+47 |
| | | | | This reverts commit 832cc685138b2244529f10b54b373c34adb4a633. | ||||
* | Commented noisy debugging about packet splitting | John Hurliman | 2009-10-06 | 1 | -4/+4 |
| | |||||
* | Merging in diva's locking fixes | John Hurliman | 2009-10-06 | 1 | -47/+69 |
|\ | |||||
| * | Rewrote parts of the code that were double-locking different objects. This ↵ | Diva Canto | 2009-10-06 | 1 | -47/+69 |
| | | | | | | | | is about half of the code base reviewed. | ||||
* | | Applying the real fix (thank you for tracking that MSDN doc down Melanie) | John Hurliman | 2009-10-06 | 1 | -5/+6 |
| | | |||||
* | | Trying Melanie's fix | John Hurliman | 2009-10-06 | 1 | -3/+4 |
| | | |||||
* | | * Added a sanity check for Mono before trying to enumerate over an empty ↵ | John Hurliman | 2009-10-06 | 1 | -0/+3 |
| | | | | | | | | | | | | SortedDictionary * Changed the order of a log line from DotNetEngine so you can tell whether or not it is actually loading | ||||
* | | * Added missing references to prebuild.xml and commented out the LindenUDP ↵ | John Hurliman | 2009-10-06 | 7 | -195/+195 |
| | | | | | | | | | | | | | | | | tests until a new test harness is written * Clients are no longer disconnected when a packet handler crashes. We'll see how this works out in practice * Added documentation and cleanup, getting ready for the first public push * Deleted an old LLUDP file | ||||
* | | * Try/catch around EndInvoke() when Util.FireAndForget() returns to catch ↵ | John Hurliman | 2009-10-06 | 3 | -78/+112 |
| | | | | | | | | | | | | | | exceptions thrown in the async method * Added packet stats handling to the new LLUDP implementation * Attempting to avoid a race condition when creating a new LLUDPClient | ||||
* | | * Continued work on the new LLUDP implementation. Appears to be functioning, ↵ | John Hurliman | 2009-10-06 | 13 | -2116/+1028 |
| | | | | | | | | | | | | | | | | although not everything is reimplemented yet * Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing * Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively * Fixed formatting for a MySQLAssetData error logging line | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵ | John Hurliman | 2009-10-05 | 1 | -18/+24 |
|\ \ | |/ | | | | | htb-throttle | ||||
| * | Changed the lock object, to see if this helps at all. Also switched the ↵ | Diva Canto | 2009-10-05 | 1 | -11/+15 |
| | | | | | | | | order of lock and try/catch in RemoveImageFromQueue. | ||||
| * | Reduced locking. | Diva Canto | 2009-10-04 | 1 | -8/+10 |
| | | |||||
* | | Beginning work on the new LLUDP implementation | John Hurliman | 2009-10-05 | 12 | -2328/+1815 |
|/ | |||||
* | Guarding a line that is sometimes throwing a null pointer exception. | Diva Canto | 2009-10-04 | 1 | -5/+6 |
| | |||||
* | Trying to avoid the null pointer exception in J2KImage, RunUpdate. | Diva Canto | 2009-10-04 | 1 | -1/+9 |
| | |||||
* | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-04 | 1 | -2/+2 |
|\ | |||||
| * | * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵ | John Hurliman | 2009-10-02 | 1 | -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 '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 '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 | 15 | -87/+91 |
|\ \ | |/ |/| | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 5 | -8/+8 |
| | | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 16 | -82/+82 |
| | | |||||
| * | Unpacking the mess with OtherRegionUp, so we can have a real cache of the ↵ | Diva Canto | 2009-09-27 | 1 | -1/+2 |
| | | | | | | | | neighbours in the grid service modules. | ||||
| * | * Makes SimulatorEnable messages 'reliable' and subject to redelivery. | Adam Frisby | 2009-09-23 | 1 | -0/+3 |
| | | |||||
* | | 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 | 2 | -448/+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. | ||||
* | | * Change the signature of the agent set appearance callback to prevent ↵ | John Hurliman | 2009-09-30 | 1 | -6/+8 |
| | | | | | | | | | | | | | | 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 | 1 | -0/+10 |
| | | |||||
* | | 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 | 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 | ||||
* | | 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. |