Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into vehicles | Melanie | 2009-10-06 | 22 | -137/+253 |
|\ | |||||
| * | Corrected words in error message. | Diva Canto | 2009-10-06 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-06 | 1 | -6/+6 |
| |\ | |||||
| | * | Commenting the DEBUG code that I added yesterday, because it's causing mono ↵ | Diva Canto | 2009-10-06 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | to fail with https://bugzilla.novell.com/show_bug.cgi?id=538854 | ||||
| * | | Lock the heartbeat against multiple invocations. May prevent deadlocks and/or | Melanie | 2009-10-06 | 1 | -0/+10 |
| |/ | | | | | | | runaway thread use | ||||
| * | Remove the using() constructs from the new style database modules; they caused | Melanie | 2009-10-06 | 4 | -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 Canto | 2009-10-05 | 1 | -4/+3 |
| | | |||||
| * | #if DEBBUG code for monitoring the ThreadPool. | Diva Canto | 2009-10-05 | 1 | -0/+7 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-10-05 | 2 | -25/+38 |
| |\ | |||||
| | * | * GridServerPostHandler.cs: Try/catch in Handle | Diva Canto | 2009-10-05 | 2 | -25/+38 |
| | | | | | | | | | | | | * BaseOpenSimServer.cs: Added thread pool numbers in show threads | ||||
| * | | Added CloseDBConnection() to replace the old CloseReaderCommand(). This will ↵ | John Hurliman | 2009-10-05 | 4 | -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 Cortez | 2009-10-05 | 1 | -3/+9 |
| | | |||||
| * | Ensure the specified imSessionID exists in the DroppedSession collection ↵ | Michael Cortez | 2009-10-05 | 1 | -1/+1 |
| | | | | | | | | before attempting to access it. | ||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-10-05 | 2 | -4/+4 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-10-05 | 4 | -17/+36 |
| | |\ | |||||
| | * | | change default ports for inventory and grid connectors in example .ini files ↵ | Justin Clark-Casey (justincc) | 2009-10-05 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | to 8003 to match the ROBUST default altered wiki page to reflect this | ||||
| * | | | Minor change. | Diva Canto | 2009-10-05 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Fixed bug introduced in one of the last commits. | Diva Canto | 2009-10-05 | 1 | -1/+1 |
| | | | |||||
| * | | More debug to try to diagnose a problem with region registration. | Diva Canto | 2009-10-05 | 2 | -2/+7 |
| | | | |||||
| * | | More error catching/outputting. | Diva Canto | 2009-10-05 | 1 | -4/+14 |
| | | | |||||
| * | | Changed the lock object, to see if this helps at all. Also switched the ↵ | Diva Canto | 2009-10-05 | 1 | -11/+15 |
| |/ | | | | | | | order of lock and try/catch in RemoveImageFromQueue. | ||||
| * | * minor: tweak asset cache logging levels downwards | Justin Clark-Casey (justincc) | 2009-10-05 | 4 | -12/+9 |
| | | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-10-05 | 2 | -15/+12 |
| |\ | |||||
| | * | minor: remove mono compile warning | Justin Clark-Casey (justincc) | 2009-10-05 | 1 | -5/+2 |
| | | | |||||
| | * | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-05 | 1 | -2/+14 |
| | |\ | |||||
| | * | | Adapt to renamed members in landObject | Melanie | 2009-10-05 | 1 | -10/+10 |
| | | | | |||||
| * | | | More debug messages if things go wrong. | Diva Canto | 2009-10-05 | 1 | -2/+24 |
| | |/ | |/| | |||||
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-10-05 | 5 | -1456/+1776 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-05 | 2 | -0/+28 |
| | |\ | |||||
| | * | | MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy up | unknown | 2009-10-05 | 5 | -1456/+1776 |
| | | | | |||||
| * | | | More error messages to warn when/if things go wrong. | Diva Canto | 2009-10-05 | 1 | -2/+14 |
| | |/ | |/| | |||||
| * | | GetRegionByPosition: use the cache, Luke. | Diva Canto | 2009-10-05 | 2 | -0/+28 |
| |/ | |||||
* | | Make sure that keys exist in arrays before trying to access them. | Michael Cortez | 2009-10-05 | 1 | -3/+9 |
| | | |||||
* | | Ensure the specified imSessionID exists in the DroppedSession collection ↵ | Michael Cortez | 2009-10-05 | 1 | -1/+1 |
| | | | | | | | | before attempting to access it. | ||||
* | | Adapt to renamed members in landObject | Melanie | 2009-10-05 | 1 | -10/+10 |
| | | |||||
* | | MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy up | unknown | 2009-10-05 | 5 | -1456/+1776 |
| | | |||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-05 | 4 | -69/+124 |
|\ \ | |/ | |||||
| * | Eliminate pinned Mesh data on managed heap by using IntPtrs to memory ↵ | Dan Lake | 2009-10-05 | 3 | -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 successful | dahlia | 2009-10-04 | 1 | -8/+4 |
| | | | | | | | | re-enable sculpt mesh caching | ||||
* | | Fix build break | Melanie | 2009-10-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into vehicles | Melanie | 2009-10-05 | 63 | -1866/+1834 |
|\ \ | |/ | |||||
| * | Make the asset connector async Get overload return false if the asset | Melanie | 2009-10-05 | 1 | -0/+4 |
| | | | | | | | | retrieval was not synchronous. | ||||
| * | * KeepAlive set to false in expect_user and log_off. | Diva Canto | 2009-10-04 | 2 | -6/+11 |
| | | | | | | | | * Check for null SP in PermissionsModule. | ||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-10-04 | 18 | -1284/+1165 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-10-04 | 1 | -1/+2 |
| | |\ | |||||
| | * | | * MySQL data tests now pass by fixing a bad fix for a bad cast on the asset ↵ | John Hurliman | 2009-10-04 | 18 | -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 Canto | 2009-10-04 | 1 | -8/+10 |
| | |/ | |/| | |||||
| * | | Just trying a few things. This one will reduce the number of async calls. | Diva Canto | 2009-10-04 | 1 | -1/+2 |
| |/ | |||||
| * | Guarding a line that is sometimes throwing a null pointer exception. | Diva Canto | 2009-10-04 | 1 | -5/+6 |
| | | |||||
| * | Closing more streams even if things fail. | Diva Canto | 2009-10-04 | 1 | -6/+25 |
| | |