aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Changed the lock object, to see if this helps at all. Also switched the ↵Diva Canto2009-10-051-11/+15
| | | | order of lock and try/catch in RemoveImageFromQueue.
* * minor: tweak asset cache logging levels downwardsJustin Clark-Casey (justincc)2009-10-054-12/+9
|
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-052-15/+12
|\
| * minor: remove mono compile warningJustin Clark-Casey (justincc)2009-10-051-5/+2
| |
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-051-2/+14
| |\
| * | Adapt to renamed members in landObjectMelanie2009-10-051-10/+10
| | |
* | | More debug messages if things go wrong.Diva Canto2009-10-051-2/+24
| |/ |/|
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-055-1456/+1776
|\ \ | |/
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-052-0/+28
| |\
| * | MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy upunknown2009-10-055-1456/+1776
| | |
* | | More error messages to warn when/if things go wrong.Diva Canto2009-10-051-2/+14
| |/ |/|
* | GetRegionByPosition: use the cache, Luke.Diva Canto2009-10-052-0/+28
|/
* Eliminate pinned Mesh data on managed heap by using IntPtrs to memory ↵Dan Lake2009-10-053-61/+120
| | | | allocated on the unmanaged heap. This prevents fragmentation of the managed heap and the resulting stress on GC. A region with ~150,000 prims using ODE and Meshmerizer saw memory remain flat around 1.2GB as opposed to 1.5GB and continually growing due to pinned memory. This patch complements the unique mesh dictionary patch applied to Meshmerizer but is independent. The net effect is a 60-75% reduction in memory for our largest regions.
* only cache mesh if meshing was successfuldahlia2009-10-041-8/+4
| | | | re-enable sculpt mesh caching
* Make the asset connector async Get overload return false if the assetMelanie2009-10-051-0/+4
| | | | retrieval was not synchronous.
* * KeepAlive set to false in expect_user and log_off.Diva Canto2009-10-042-6/+11
| | | | * Check for null SP in PermissionsModule.
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-0418-1284/+1165
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-10-041-1/+2
| |\
| * | * MySQL data tests now pass by fixing a bad fix for a bad cast on the asset ↵John Hurliman2009-10-0418-1284/+1165
| | | | | | | | | | | | | | | | | | 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
| |/ |/|
* | Just trying a few things. This one will reduce the number of async calls.Diva Canto2009-10-041-1/+2
|/
* Guarding a line that is sometimes throwing a null pointer exception.Diva Canto2009-10-041-5/+6
|
* Closing more streams even if things fail.Diva Canto2009-10-041-6/+25
|
* 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.
* Leaving the MemoryStreams unclosed.Diva Canto2009-10-042-2/+4
|
* 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-0428-51/+73
|\
| * Closing another stream.Diva Canto2009-10-021-4/+19
| |
| * * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵John Hurliman2009-10-0227-48/+55
| | | | | | | | | | | | 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?
* | Slightly better message with status code for WebException.Diva Canto2009-10-031-1/+1
| |
* | Better error handling to diagnose login problems.Diva Canto2009-10-032-79/+102
| |
* | Fixed build order for Linux.Diva Canto2009-10-031-64/+64
| |
* | Close was being called to early on the Memory stream.Diva Canto2009-10-033-3/+7
| |
* | Fixed interface between the Messaging server and the grid server.Diva Canto2009-10-032-42/+32
| |
* | More streams closed.Diva Canto2009-10-032-2/+18
| |
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-031-2/+2
|\ \
| * | Fix my build breakMelanie2009-10-031-2/+2
| | |
* | | MOre streams closed. Corrected word in GridCommon.ini.exampleDiva Canto2009-10-032-1/+2
| | |
* | | Closing more streams.Diva Canto2009-10-031-4/+27
|/ /
* | Small permissions tweakMelanie2009-10-031-1/+4
| |
* | Merge branch 'diva-textures-osgrid'Melanie2009-10-032-126/+88
|\ \ | |/
| * Merge branch 'diva-textures-osgrid' of ↵John Hurliman2009-10-021-6/+20
| |\ | | | | | | | | | ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid
| * | * Removed code that is no longer used with Melanie's queue callback optimizationJohn Hurliman2009-10-022-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-023-188/+162
|\ \ \ | | |/ | |/|
| * | Merge branch 'diva-textures-osgrid' of ↵Diva Canto2009-10-025-241/+161
| |\ \ | | |/ | | | | | | ssh://diva@opensimulator.org/var/git/opensim into diva-textures-osgrid
| | * * 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