aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into vehiclesMelanie2009-10-0520-358/+323
|\
| * * KeepAlive set to false in expect_user and log_off.Diva Canto2009-10-041-4/+9
| | | | | | | | * Check for null SP in PermissionsModule.
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-041-7/+4
| |\
| | * * MySQL data tests now pass by fixing a bad fix for a bad cast on the asset ↵John Hurliman2009-10-041-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 Canto2009-10-041-8/+10
| |/
| * Guarding a line that is sometimes throwing a null pointer exception.Diva Canto2009-10-041-5/+6
| |
| * Stream needs to be closed before the file can be moved...Diva Canto2009-10-041-5/+6
| |
| * Make sure to close the file streams on the FlotsamCache, even if something ↵Diva Canto2009-10-041-4/+12
| | | | | | | | fails.
| * Trying to avoid the null pointer exception in J2KImage, RunUpdate.Diva Canto2009-10-041-1/+9
| |
| * flexible extrusion shape defaults to lineardahlia2009-10-041-1/+1
| |
| * disable physics actors for flexible primsdahlia2009-10-041-3/+4
| |
| * Exclude sculpt proxies from mesh cachingdahlia2009-10-041-6/+23
| |
| * Merge branch 'diva-textures-osgrid'Melanie2009-10-0413-24/+24
| |\
| | * * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵John Hurliman2009-10-0213-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 breakMelanie2009-10-031-2/+2
| | |
| * | Small permissions tweakMelanie2009-10-031-1/+4
| | |
| * | Merge branch 'diva-textures-osgrid'Melanie2009-10-031-126/+88
| |\ \ | | |/
| | * * Removed code that is no longer used with Melanie's queue callback optimizationJohn Hurliman2009-10-021-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'Melanie2009-10-022-182/+142
| |\ \ | | |/
| | * * Removed even more unnecessary state variables from J2KImageJohn Hurliman2009-10-022-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 vehiclesMelanie2009-10-0217-1234/+785
|\ \ \ | |/ /
| * | Merge branch 'master' into diva-texturesMelanie2009-10-0218-365/+404
| |\ \
| * \ \ Merge branch 'diva-textures-osgrid' into diva-texturesMelanie2009-10-023-59/+19
| |\ \ \ | | | |/ | | |/|
| | * | * Changed the flush logic to drop packets in non-transactional streams, and ↵John Hurliman2009-10-023-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-texturesMelanie2009-10-02189-4858/+4101
| |\ \ \ | | |/ / | |/| |
| * | | Restore the missing image handling to the image manager. The missingMelanie2009-10-023-71/+92
| | | | | | | | | | | | | | | | image packet crashes Hippo without a message.
| * | | Merge branch 'diva-textures-osgrid' into texturetestMelanie2009-10-021-7/+28
| |\ \ \
| | * | | Locking the priority queue to see if it gets pass that exception.Diva Canto2009-10-011-7/+28
| | | | |
| * | | | Change texture sending to be driven by the queue empty event from theMelanie2009-10-024-90/+60
| |/ / / | | | | | | | | | | | | packet queue, rather than a timer
| * | | Removing console debug spewJohn Hurliman2009-10-011-7/+7
| | | |
| * | | Merge branch 'diva-textures-osgrid' of ↵John Hurliman2009-10-013-2/+93
| |\ \ \ | | | | | | | | | | | | | | | ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid
| | * | | Add a method to determine the count of packets in a throttleMelanie2009-10-013-0/+27
| | | | |
| | * | | Add OnQueueEmpty event to the packet layers. No user functinality yetMelanie2009-10-013-2/+66
| | | | |
| * | | | * Rewrote LLImageManager to use a real priority queue and hold minimal stateJohn Hurliman2009-10-013-449/+331
| |/ / / | | | | | | | | | | | | | | | | * Rewrote the logic in J2KImage.RunUpdate() * Added a default avatar texture (I made it myself)
| * | | Fixing LLClientView memory leakJames J Greensky2009-10-014-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 Canto2009-09-301-0/+14
| | | |
| * | | * Change the signature of the agent set appearance callback to prevent ↵John Hurliman2009-09-304-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 decoderMelanie2009-09-301-2/+5
| | | |
| * | | Add RebakeAvatarTexturesPacket to the client viewMelanie2009-09-304-0/+22
| | | |
| * | | Remove predecode-j2k and it's assoaciated logicMelanie2009-09-302-142/+0
| | | |
| * | | Squelch the debug noise from diva's patchMelanie2009-09-301-1/+1
| | | |
| * | | Attempting to improve the robustness of texture decoding by always ignoring ↵John Hurliman2009-09-305-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 ↵Melanie2009-09-301-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 Hurliman2009-09-301-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 Canto2009-09-302-12/+48
| | | | | | | | | | | | | | | | them later if the client asks for them again. Needs more testing in texture-rich sims.
* | | | Merge branch 'master' into vehiclesMelanie2009-10-0221-382/+477
|\ \ \ \ | | |_|/ | |/| |
| * | | reducing script engine log spamdr scofield (aka dirk husemann)2009-10-021-4/+4
| | | |
| * | | - cleaning up LandData/ILandObject capitalization issuesdr scofield (aka dirk husemann)2009-10-0217-361/+400
| | |/ | |/| | | | | | | - adding LandDataSerializer to OAR mechanics
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-10-026-46/+28
| |\ \
| | * \ Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-021-12/+19
| | |\ \