Commit Graph

10561 Commits (6def897556c00e6b7aa04308231a6ee556c22a50)

Author SHA1 Message Date
Melanie 6def897556 Merge branch 'diva-textures-osgrid' into diva-textures 2009-10-02 19:02:38 +01:00
John Hurliman 9b342d3e0d * Changed the flush logic to drop packets in non-transactional streams, and 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
2009-10-02 12:00:42 -07:00
Melanie 31d8cec0f8 Merge branch 'master' into diva-textures 2009-10-02 08:23:38 +01:00
Melanie 3ba36bb4d8 Restore the missing image handling to the image manager. The missing
image packet crashes Hippo without a message.
2009-10-02 05:49:27 +01:00
Melanie 9a429610e2 Merge branch 'diva-textures-osgrid' into texturetest 2009-10-02 04:19:22 +01:00
Diva Canto 746dad7b74 Locking the priority queue to see if it gets pass that exception. 2009-10-01 20:32:22 -07:00
Melanie 18a744cac1 Change texture sending to be driven by the queue empty event from the
packet queue, rather than a timer
2009-10-02 04:04:14 +01:00
John Hurliman 54ff84050f Removing console debug spew 2009-10-01 18:12:13 -07:00
Adam Frisby a2cdbd784d Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2009-10-02 10:54:01 +10:00
John Hurliman aaf8fbcef9 Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid 2009-10-01 17:53:28 -07:00
Adam Frisby a030e3d61b * Attempting to fix a issue with console commands & the estate module. Again. 2009-10-02 10:53:21 +10:00
John Hurliman 6e0c79b8fe * Rewrote LLImageManager to use a real priority queue and hold minimal state
* Rewrote the logic in J2KImage.RunUpdate()
* Added a default avatar texture (I made it myself)
2009-10-01 17:42:13 -07:00
Diva Canto 24d5b57503 Added messages to assertions in the failing tests, so that we know which ones are failing. 2009-10-01 17:28:42 -07:00
Melanie 4a1076128c Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim 2009-10-02 00:45:43 +01:00
Melanie d6301db382 Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity"
This reverts commit 39842eb4af.
2009-10-02 00:45:31 +01:00
Diva Canto ac0927c922 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-10-01 16:40:04 -07:00
Diva Canto c8c4b4c505 Switched log level of an annoying message in SQLite to Debug, and commented it too. 2009-10-01 16:39:41 -07:00
Melanie 54a912bb9c Add a method to determine the count of packets in a throttle 2009-10-01 22:35:57 +01:00
Melanie 7c1fdb2540 Add "dump asset" command to remote asset connector (the only one that uses a
cache at all)
2009-10-01 21:29:57 +01:00
Melanie 26478ff689 Add "dump asset" command to remote asset connector (the only one that uses a
cache at all)
2009-10-01 21:26:53 +01:00
Melanie 5e9da4daab Add OnQueueEmpty event to the packet layers. No user functinality yet 2009-10-01 21:08:17 +01:00
Diva Canto 94783e9377 Catch and print exceptions in MessagingService, to diagnose mysterious disappearances of the Messaging server. 2009-10-01 09:17:22 -07:00
dr scofield (aka dirk husemann) 133a4a9906 - adding new LandDataSerializer testcase to "test-xml" target as well
- adding another LandDataSerializer testcase
2009-10-01 15:03:16 +02:00
dr scofield (aka dirk husemann) 05da73c300 fixing LandDataSerializer (yeah! for testcases) 2009-10-01 12:01:41 +02:00
dr scofield (aka dirk husemann) 18416ec518 Merge branch 'oar-parcel' into x-opensim 2009-10-01 10:30:43 +02:00
dr scofield (aka dirk husemann) 77ed8e977a adding meat to the LandDataSerializerTest cases. 2009-10-01 10:30:26 +02:00
dr scofield (aka dirk husemann) 5b378a793b Merge branch 'oar-parcel' into x-opensim 2009-10-01 09:48:30 +02:00
dr scofield (aka dirk husemann) 9dcf7da42a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim 2009-10-01 09:48:02 +02:00
dr scofield (aka dirk husemann) 40cf840df2 adding testcase for LandDataSerializer; fixing LandDataSerializer ;-) 2009-10-01 09:47:45 +02:00
James J Greensky 44776fea72 Fixing LLClientView memory leak
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.
2009-10-01 04:11:32 +01:00
Diva Canto 1eb6f99d19 Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there. 2009-09-30 20:27:40 -07:00
James J Greensky 8e3dd64282 Removed an innefficent List.Contains lookup from UpdateQueue
Changed the underlying data structure used to detected duplicate
in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a
List to a Dictionary.
2009-09-30 17:53:32 -07:00
John Hurliman cb26878f96 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2009-09-30 17:51:34 -07:00
John Hurliman f6cc20940f Taking the opportunity to delete unnecessary text files from the Prebuild folder (the license information is already in the appropriate place in the OpenSim distro) 2009-09-30 17:49:51 -07:00
Jeff Ames 606e831ff5 Formatting cleanup. 2009-10-01 09:38:36 +09:00
John Hurliman 5dfd2643df * Change the signature of the agent set appearance callback to prevent 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
2009-09-30 15:53:03 -07:00
John Hurliman acfe2d9f4e Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2009-09-30 15:28:23 -07:00
Melanie 041aaaa62c Prevent null data being sent to the decoder 2009-09-30 22:21:22 +01:00
Melanie 79ba96ad6f Limit the number of packet data blocks to 50, as packets are already limited
This is enough to prevent the fast back and forth of allocation and release
the pool is meant to prevent, but not too much so we don't hog memory
2009-09-30 21:33:29 +01:00
Melanie 400abed271 Add RebakeAvatarTexturesPacket to the client view 2009-09-30 21:33:20 +01:00
Melanie 67fefdb5a0 Remove predecode-j2k and it's assoaciated logic 2009-09-30 21:33:00 +01:00
Melanie d0bf084da5 Remove the settings for the J2KDecoder, since they are now obsolete (thank god!) 2009-09-30 21:31:48 +01:00
Melanie b0c0d6f9d1 Squelch the debug noise from diva's patch 2009-09-30 20:36:20 +01:00
John Hurliman f56dc5fcda Attempting to improve the robustness of texture decoding by always ignoring 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
2009-09-30 19:26:53 +01:00
Melanie f908e32f62 Revert "Attempting to improve the robustness of texture decoding by always 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 22cc31135e.
2009-09-30 19:26:26 +01:00
Melanie 8d35cd9061 Remove more tests that don't apply to this build 2009-09-30 19:25:48 +01:00
Melanie c1706e9a68 Remove the dll for the removed tests 2009-09-30 19:20:57 +01:00
Melanie 41e4f3afdb Remove some tests that no longer apply 2009-09-30 19:14:58 +01:00
John Hurliman 22cc31135e Attempting to improve the robustness of texture decoding by always ignoring 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
2009-09-30 18:42:45 +01:00
Diva Canto 4bf47fa592 This releases the texture assets from LLImageManager cache, and re-requests them later if the client asks for them again. Needs more testing in texture-rich sims. 2009-09-30 18:41:41 +01:00