Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into htb-throttle | Melanie | 2009-10-07 | 1 | -1/+2 |
|\ | |||||
| * | A small change in FetchInventoryDescendantsCAPS. | Diva Canto | 2009-10-06 | 1 | -1/+2 |
| | | |||||
| * | Uncommented log message on CAPs FetchInventoryDescendants | Diva Canto | 2009-10-06 | 1 | -3/+3 |
| | | |||||
* | | replace LLClientView with proper version | Melanie | 2009-10-07 | 1 | -1898/+1332 |
| | | |||||
* | | Replace LLClientView on the branch with master. UNCOMPILABLE! | Melanie | 2009-10-07 | 1 | -1332/+1898 |
| | | |||||
* | | Uncommented log message on CAPs FetchInventoryDescendants | Diva Canto | 2009-10-07 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into htb-throttle | Melanie | 2009-10-07 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | * One more debug message on FetchInventoryDescendants | Diva Canto | 2009-10-06 | 1 | -0/+1 |
| | | | | | | | | * More streams close on finally | ||||
| * | Revert "Rewrote parts of the code that were double-locking different ↵ | Melanie | 2009-10-07 | 8 | -174/+127 |
| | | | | | | | | | | | | objects. This is about half of the code base reviewed." This reverts commit e992ca025571a891333a57012c2cd4419b6581e5. | ||||
* | | Revert "Merging in diva's locking fixes" | Melanie | 2009-10-07 | 8 | -174/+127 |
| | | | | | | | | This reverts commit 832cc685138b2244529f10b54b373c34adb4a633. | ||||
* | | Commented noisy debugging about packet splitting | John Hurliman | 2009-10-06 | 1 | -4/+4 |
| | | |||||
* | | Merging in diva's locking fixes | John Hurliman | 2009-10-06 | 8 | -127/+174 |
|\ \ | |/ | |||||
| * | Rewrote parts of the code that were double-locking different objects. This ↵ | Diva Canto | 2009-10-06 | 8 | -127/+174 |
| | | | | | | | | is about half of the code base reviewed. | ||||
* | | Checks the number of ThreadPool and IOCP threads on startup and bumps up the ↵ | John Hurliman | 2009-10-06 | 1 | -0/+12 |
| | | | | | | | | numbers to .NET defaults of 500/1000 if need be | ||||
* | | Applying the real fix (thank you for tracking that MSDN doc down Melanie) | John Hurliman | 2009-10-06 | 1 | -5/+6 |
| | | |||||
* | | Trying Melanie's fix | John Hurliman | 2009-10-06 | 1 | -3/+4 |
| | | |||||
* | | Added a debug line for nebadon | John Hurliman | 2009-10-06 | 1 | -0/+3 |
| | | |||||
* | | * Added a sanity check for Mono before trying to enumerate over an empty ↵ | John Hurliman | 2009-10-06 | 2 | -4/+7 |
| | | | | | | | | | | | | SortedDictionary * Changed the order of a log line from DotNetEngine so you can tell whether or not it is actually loading | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵ | John Hurliman | 2009-10-06 | 4 | -2/+22 |
|\ \ | |/ | | | | | htb-throttle | ||||
| * | * Removed verbose debug message | Diva Canto | 2009-10-06 | 2 | -2/+2 |
| | | | | | | | | | | * Restored HG inventory access which had been lost upon adding a 3rd argument to inventory and asset server handlers * Fixed a stupid bug in the InventoryConnector which was making move items do things twice | ||||
| * | Removing dependencies on System.Runtime.Remoting. | Diva Canto | 2009-10-06 | 1 | -0/+4 |
| | | |||||
| * | 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 | ||||
| * | 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 |
| | | |||||
* | | * Added missing references to prebuild.xml and commented out the LindenUDP ↵ | John Hurliman | 2009-10-06 | 7 | -195/+195 |
| | | | | | | | | | | | | | | | | tests until a new test harness is written * Clients are no longer disconnected when a packet handler crashes. We'll see how this works out in practice * Added documentation and cleanup, getting ready for the first public push * Deleted an old LLUDP file | ||||
* | | * Try/catch around EndInvoke() when Util.FireAndForget() returns to catch ↵ | John Hurliman | 2009-10-06 | 3 | -78/+112 |
| | | | | | | | | | | | | | | exceptions thrown in the async method * Added packet stats handling to the new LLUDP implementation * Attempting to avoid a race condition when creating a new LLUDPClient | ||||
* | | Fixing a few compile errors in the previous commit | John Hurliman | 2009-10-06 | 9 | -11/+0 |
| | | |||||
* | | * Continued work on the new LLUDP implementation. Appears to be functioning, ↵ | John Hurliman | 2009-10-06 | 13 | -2116/+1028 |
| | | | | | | | | | | | | | | | | although not everything is reimplemented yet * Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing * Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively * Fixed formatting for a MySQLAssetData error logging line | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵ | John Hurliman | 2009-10-05 | 15 | -112/+206 |
|\ \ | |/ | | | | | htb-throttle | ||||
| * | 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. | ||||
| * | 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 |
| | | |||||
| * | minor: remove mono compile warning | Justin Clark-Casey (justincc) | 2009-10-05 | 1 | -5/+2 |
| | | |||||
| * | GetRegionByPosition: use the cache, Luke. | Diva Canto | 2009-10-05 | 2 | -0/+28 |
| | | |||||
| * | 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 | ||||
| * | * KeepAlive set to false in expect_user and log_off. | Diva Canto | 2009-10-04 | 1 | -4/+9 |
| | | | | | | | | * Check for null SP in PermissionsModule. | ||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-10-04 | 1 | -7/+4 |
| |\ | |||||
| * | | Reduced locking. | Diva Canto | 2009-10-04 | 1 | -8/+10 |
| | | | |||||
* | | | Beginning work on the new LLUDP implementation | John Hurliman | 2009-10-05 | 13 | -2329/+1816 |
| |/ |/| | |||||
* | | * MySQL data tests now pass by fixing a bad fix for a bad cast on the asset ↵ | John Hurliman | 2009-10-04 | 1 | -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) | ||||
* | Guarding a line that is sometimes throwing a null pointer exception. | Diva Canto | 2009-10-04 | 1 | -5/+6 |
| | |||||
* | Stream needs to be closed before the file can be moved... | Diva Canto | 2009-10-04 | 1 | -5/+6 |
| | |||||
* | Make sure to close the file streams on the FlotsamCache, even if something ↵ | Diva Canto | 2009-10-04 | 1 | -4/+12 |
| | | | | fails. | ||||
* | Trying to avoid the null pointer exception in J2KImage, RunUpdate. | Diva Canto | 2009-10-04 | 1 | -1/+9 |
| | |||||
* | flexible extrusion shape defaults to linear | dahlia | 2009-10-04 | 1 | -1/+1 |
| | |||||
* | disable physics actors for flexible prims | dahlia | 2009-10-04 | 1 | -3/+4 |
| |