Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 11 | -2327/+1814 |
|/ | |||||
* | 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 | 11 | -71/+75 |
|\ \ | |/ |/| | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 3 | -5/+5 |
| | | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 12 | -69/+69 |
| | | |||||
| * | 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. | ||||
* | Formatting cleanup. | Jeff Ames | 2009-09-10 | 1 | -1/+1 |
| | |||||
* | * Lock timers when Calling Start() and Stop() when the Thread Context is ↵ | Teravus Ovares (Dan Olivares) | 2009-09-09 | 1 | -20/+56 |
| | | | | murky. This affects Mono only. | ||||
* | * Fixes mantis http://opensimulator.org/mantis/view.php?id=4044. Turns out ↵ | Diva Canto | 2009-08-22 | 1 | -12/+14 |
| | | | | | | folders were never being removed from trash when they were singled out for purging in trash. They were being removed when Trash was purged as a whole. That behavior is now fixed for the new InventoryService set. * Removed left-overs from AssetInventoryServer. | ||||
* | Putting the inventory packets back to ThrottleOutPacketType.Asset, because ↵ | Diva Canto | 2009-08-20 | 1 | -6/+6 |
| | | | | that didn't work. | ||||
* | Changed most of inventory packets to LowPriority, to see if that helps with ↵ | Diva Canto | 2009-08-20 | 1 | -6/+6 |
| | | | | freezing on searching large inventories. | ||||
* | Fixed a missing field in SendBulkInventoryFolderUpdate. | Diva Canto | 2009-08-20 | 1 | -1/+3 |
| | |||||
* | Added MoveItems, which is most useful upon viewer-delete inventory ↵ | Diva Canto | 2009-08-19 | 1 | -6/+13 |
| | | | | operation. Moving a batch of items is a 1-time operation. Made it async anyway, so that the viewer doesn't wait in case the DB layer is dumb (which is the case currently). | ||||
* | A better purge of trash folder. | Diva Canto | 2009-08-19 | 1 | -10/+15 |
| | |||||
* | jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024 | Diva Canto | 2009-08-18 | 1 | -2/+2 |
| | |||||
* | Added new OpenSim.ini setting: "client_throttle_max_bps" which overrides ↵ | dahlia | 2009-08-18 | 2 | -16/+31 |
| | | | | user's viewer network throttle settings | ||||
* | Did I say that i don't like git? Remove some stuff that shouldn't have | Melanie | 2009-08-17 | 1 | -55/+22 |
| | | | | gone in. | ||||
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-17 | 2 | -22/+56 |
|\ | |||||
| * | Add System.Xml reference to the console project | Melanie | 2009-08-17 | 1 | -22/+55 |
| | | |||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-16 | 1 | -0/+25 |
| |\ | |||||
| * | | * ShortVersion, another attempt at fixing the test thread death that ↵ | Teravus Ovares (Dan Olivares) | 2009-08-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | randomly occurs. * LongVersion nIni may be causing the test thread death. Pausing OpenSimulator during startup causes a nIni error that makes debugging startup operations difficult for users. It might be because when it's in pause mode, something else reads from the nini config passed? If it is, it might not be fixable.. however, if it's concurrency that causes nini death it would make sense to give each section of the tests a new IConfigSource so that they don't read from the same configsource at the same time. |