ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-09-02 11:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,669 Commits 5 Branches 97 Tags
ab3bfca54631d55ff951ce02b3f99e64e2ea7367
Commit Graph

6740 Commits

Author SHA1 Message Date
Melanie
a52f6c56b1 Merge branch 'master' into htb-throttle 2009-10-07 05:19:20 +01:00
Diva Canto
d344ca932d A small change in FetchInventoryDescendantsCAPS. 2009-10-06 22:19:20 -07:00
Diva Canto
8c255b374a Uncommented log message on CAPs FetchInventoryDescendants 2009-10-06 21:32:15 -07:00
Melanie
d33b6fef2b replace LLClientView with proper version 2009-10-07 04:37:12 +01:00
Melanie
adc208e568 Replace LLClientView on the branch with master. UNCOMPILABLE! 2009-10-07 04:36:36 +01:00
Diva Canto
58c33fbc89 Uncommented log message on CAPs FetchInventoryDescendants 2009-10-07 04:32:35 +01:00
Diva Canto
b5b53dd3eb * One more debug message on FetchInventoryDescendants 
* More streams close on finally
 2009-10-06 19:55:35 -07:00
Melanie
6f2d183107 Merge branch 'master' into htb-throttle 2009-10-07 03:01:11 +01:00
Melanie
89d23a1fa2 Revert "Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed." 
This reverts commit e992ca0255.
 2009-10-07 01:45:49 +01:00
Melanie
9618c196c2 Revert "Merging in diva's locking fixes" 
This reverts commit 832cc68513.
 2009-10-07 01:44:36 +01:00
John Hurliman
312438f145 Commented noisy debugging about packet splitting 2009-10-06 15:55:39 -07:00
John Hurliman
832cc68513 Merging in diva's locking fixes 2009-10-06 15:54:00 -07:00
John Hurliman
7199976d48 Checks the number of ThreadPool and IOCP threads on startup and bumps up the numbers to .NET defaults of 500/1000 if need be 2009-10-06 15:51:56 -07:00
Diva Canto
e992ca0255 Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed. 2009-10-06 15:39:53 -07:00
John Hurliman
9cb5db3621 Applying the real fix (thank you for tracking that MSDN doc down Melanie) 2009-10-06 15:08:09 -07:00
John Hurliman
74fe284a20 Trying Melanie's fix 2009-10-06 14:50:46 -07:00
John Hurliman
eb205ef4f0 Added a debug line for nebadon 2009-10-06 14:07:04 -07:00
John Hurliman
25676ac5cf * Added a sanity check for Mono before trying to enumerate over an empty SortedDictionary 
* Changed the order of a log line from DotNetEngine so you can tell whether or not it is actually loading
 2009-10-06 13:39:10 -07:00
John Hurliman
fa6027aa09 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle 2009-10-06 12:15:24 -07:00
John Hurliman
61b5372153 * Added missing references to prebuild.xml and commented out the LindenUDP 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
 2009-10-06 12:13:16 -07:00
Diva Canto
77b4abaa25 * Removed verbose debug message 
* 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
 2009-10-06 11:08:11 -07:00
John Hurliman
fb19d1ca0a * Try/catch around EndInvoke() when Util.FireAndForget() returns to catch 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
 2009-10-06 10:12:59 -07:00
Diva Canto
3db4d38645 Removing dependencies on System.Runtime.Remoting. 2009-10-06 09:54:15 -07:00
Melanie
40d0018d66 Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim 2009-10-06 15:29:46 +01:00
Diva Canto
d4d060b57d Commenting the DEBUG code that I added yesterday, because it's causing mono to fail with 
https://bugzilla.novell.com/show_bug.cgi?id=538854
 2009-10-06 07:49:05 -07:00
Melanie
2a060136bd Lock the heartbeat against multiple invocations. May prevent deadlocks and/or 
runaway thread use
 2009-10-06 15:28:38 +01:00
John Hurliman
2519f071f2 Fixing a few compile errors in the previous commit 2009-10-06 02:50:59 -07:00
John Hurliman
e7c877407f * Continued work on the new LLUDP implementation. Appears to be functioning, 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
 2009-10-06 02:38:00 -07:00
Diva Canto
0c46df973a Correction on the DEBUG code. 2009-10-05 21:02:10 -07:00
Diva Canto
e36a54ee2a #if DEBBUG code for monitoring the ThreadPool. 2009-10-05 20:39:23 -07:00
John Hurliman
7ddb6fbced Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle 2009-10-05 17:38:27 -07:00
John Hurliman
429a84f390 Beginning work on the new LLUDP implementation 2009-10-05 17:38:14 -07:00
Michael Cortez
d4a6d9191a Make sure that keys exist in arrays before trying to access them. 2009-10-05 20:47:00 +01:00
Michael Cortez
544675d0f0 Ensure the specified imSessionID exists in the DroppedSession collection before attempting to access it. 2009-10-05 20:47:00 +01:00
Diva Canto
05c1ec7faf Changed the lock object, to see if this helps at all. Also switched the order of lock and try/catch in RemoveImageFromQueue. 2009-10-05 11:01:45 -07:00
Justin Clark-Casey (justincc)
2a19187e01 * minor: tweak asset cache logging levels downwards 2009-10-05 18:32:19 +01:00
Justin Clark-Casey (justincc)
10c4b88ccf minor: remove mono compile warning 2009-10-05 18:20:37 +01:00
Diva Canto
ad81b453b3 GetRegionByPosition: use the cache, Luke. 2009-10-05 09:02:52 -07:00
Dan Lake
6d52974c5f Eliminate pinned Mesh data on managed heap by using IntPtrs to memory 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. 2009-10-05 12:45:41 +01:00
dahlia
5c593f3892 only cache mesh if meshing was successful 
re-enable sculpt mesh caching
 2009-10-04 20:01:44 -07:00
Diva Canto
362e94a022 * KeepAlive set to false in expect_user and log_off. 
* Check for null SP in PermissionsModule.
 2009-10-04 16:30:12 -07:00
Diva Canto
08d3650138 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-10-04 14:06:28 -07:00
Diva Canto
5b19d5a7b7 Reduced locking. 2009-10-04 14:05:58 -07:00
John Hurliman
29a4614529 * MySQL data tests now pass by fixing a bad fix for a bad cast on the asset 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)
 2009-10-04 13:57:51 -07:00
Diva Canto
d93e0a0503 Guarding a line that is sometimes throwing a null pointer exception. 2009-10-04 10:30:21 -07:00
Diva Canto
fe9cca64de Stream needs to be closed before the file can be moved... 2009-10-04 09:56:54 -07:00
Diva Canto
b803d5ab9b Make sure to close the file streams on the FlotsamCache, even if something fails. 2009-10-04 09:44:04 -07:00
Diva Canto
366bfe17ae Trying to avoid the null pointer exception in J2KImage, RunUpdate. 2009-10-04 07:41:10 -07:00
dahlia
95ebb7794c flexible extrusion shape defaults to linear 2009-10-04 02:59:12 -07:00
dahlia
efebc809ce disable physics actors for flexible prims 2009-10-04 02:54:36 -07:00