aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into vehiclesMelanie2009-10-0622-137/+253
|\
| * Corrected words in error message.Diva Canto2009-10-061-2/+2
| |
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-061-6/+6
| |\
| | * Commenting the DEBUG code that I added yesterday, because it's causing mono ↵Diva Canto2009-10-061-6/+6
| | | | | | | | | | | | | | | | | | to fail with https://bugzilla.novell.com/show_bug.cgi?id=538854
| * | Lock the heartbeat against multiple invocations. May prevent deadlocks and/orMelanie2009-10-061-0/+10
| |/ | | | | | | runaway thread use
| * Remove the using() constructs from the new style database modules; they causedMelanie2009-10-064-75/+77
| | | | | | | | | | | | | | | | the underlying connection of a reader or command to be closed before the reader or command itself. Added the proper logic to Close and dispose items in CloseDBConnection. Readers and Connections need Close(), Commands need Dispose(), in the order Reader, Command, Connection. Also reinstated 80-column-friendly formatting
| * Correction on the DEBUG code.Diva Canto2009-10-051-4/+3
| |
| * #if DEBBUG code for monitoring the ThreadPool.Diva Canto2009-10-051-0/+7
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-10-052-25/+38
| |\
| | * * GridServerPostHandler.cs: Try/catch in HandleDiva Canto2009-10-052-25/+38
| | | | | | | | | | | | * BaseOpenSimServer.cs: Added thread pool numbers in show threads
| * | Added CloseDBConnection() to replace the old CloseReaderCommand(). This will ↵John Hurliman2009-10-054-11/+21
| |/ | | | | | | close the MySQLConnection attached to a MySQLCommand. I'm not sure if this accounts for every time a database connection needs to be closed, but it matches up 1:1 with the places where the database connection was previously being closed
| * Make sure that keys exist in arrays before trying to access them.Michael Cortez2009-10-051-3/+9
| |
| * Ensure the specified imSessionID exists in the DroppedSession collection ↵Michael Cortez2009-10-051-1/+1
| | | | | | | | before attempting to access it.
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-052-4/+4
| |\
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-10-054-17/+36
| | |\
| | * | change default ports for inventory and grid connectors in example .ini files ↵Justin Clark-Casey (justincc)2009-10-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | to 8003 to match the ROBUST default altered wiki page to reflect this
| * | | Minor change.Diva Canto2009-10-051-1/+1
| | |/ | |/|
| * | Fixed bug introduced in one of the last commits.Diva Canto2009-10-051-1/+1
| | |
| * | More debug to try to diagnose a problem with region registration.Diva Canto2009-10-052-2/+7
| | |
| * | More error catching/outputting.Diva Canto2009-10-051-4/+14
| | |
| * | 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
| |/
* | Make sure that keys exist in arrays before trying to access them.Michael Cortez2009-10-051-3/+9
| |
* | Ensure the specified imSessionID exists in the DroppedSession collection ↵Michael Cortez2009-10-051-1/+1
| | | | | | | | before attempting to access it.
* | Adapt to renamed members in landObjectMelanie2009-10-051-10/+10
| |
* | MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy upunknown2009-10-055-1456/+1776
| |
* | Merge branch 'master' into vehiclesMelanie2009-10-054-69/+124
|\ \ | |/
| * 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
* | Fix build breakMelanie2009-10-051-1/+1
| |
* | Merge branch 'master' into vehiclesMelanie2009-10-0563-1866/+1834
|\ \ | |/
| * 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
| |