Commit Graph

11155 Commits (4a29a7f92cc5264dfcb4a4376a61506d29dd9d8d)

Author SHA1 Message Date
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
Melanie d0cc0985fa Fix a merge conflict 2009-10-01 14:45:06 +01:00
Melanie 41ff39414b Merge branch 'master' into vehicles 2009-10-01 14:08:15 +01: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
Melanie 61d6e42af2 Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim into vehicles 2009-09-30 17:46:04 +01:00
Kitto Flora 07df0e0ab0 Merge branch '0.6.7-post-fixes' into vehicles 2009-09-30 19:07:18 +02:00
Kitto Flora d43f739cef And another merge issue 2009-09-30 19:05:39 +02:00
Kitto Flora 11750a272e And another 2009-09-30 19:04:06 +02:00
Kitto Flora 6b65eb76d0 Another small change to avoid later merge conflict 2009-09-30 19:01:55 +02:00
Kitto Flora 53fbc970ca Small chaneg to adapt to trunk 2009-09-30 18:58:52 +02:00
opensim 827b0fb199 Commit initial version of KittoFlora's vehicle changes 2009-09-30 18:51:02 +02:00
Jeff Ames ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
dr scofield (aka dirk husemann) de9be9c80a adding skeleton test case for LandDataSerializer [w-i-p] 2009-09-30 17:00:02 +02:00
dr scofield (aka dirk husemann) 33515c75e4 adding LandDataSerializer (not connected anywhere, work-in-progress)
[hi, there, justin!]
2009-09-30 16:19:39 +02:00
Melanie 1006a2254c Make create user to the Right Thing with regard to salting user passwords 2009-09-30 13:36:03 +01:00
Melanie 377a8b5229 Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim 2009-09-30 11:17:27 +01:00
Melanie 94aa7e677c Change command help text to show .ini in place of .xml when creating regions 2009-09-30 09:12:43 +01:00
Diva Canto 89016203de Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-29 16:13:31 -07:00
Diva Canto b1d204802f Minor bug fixes. 2009-09-29 16:13:07 -07:00
Justin Clark-Casey (justincc) e9c05cf385 change 0.6.7 candidate branch down to RC1 2009-09-29 21:47:11 +01:00
Justin Clark-Casey (justincc) 74a05ac32b small test change 2009-09-29 21:25:13 +01:00
dr scofield (aka dirk husemann) 09cb8a594b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim 2009-09-29 17:00:02 +02:00
Diva Canto 37a8b2b8b7 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-29 07:56:29 -07:00