ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,633 Commits 5 Branches 93 Tags
8a7a947faaeeaeac2f74f695cefd6eb3e774dc15
Commit Graph

10633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Melanie
8a7a947faa Remove the using() constructs from the new style database modules; they caused 
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
 2009-10-06 14:30:25 +01: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
a76a1afda8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2009-10-05 16:41:19 -07:00
John Hurliman
6720369376 Added CloseDBConnection() to replace the old CloseReaderCommand(). This will 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 2009-10-05 16:39:40 -07:00
Diva Canto
2753f4d62c * GridServerPostHandler.cs: Try/catch in Handle 
* BaseOpenSimServer.cs: Added thread pool numbers in show threads
 2009-10-05 16:06:21 -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
3d7e1eb7e5 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-10-05 13:14:42 -07:00
Diva Canto
282b752035 Minor change. 2009-10-05 13:14:14 -07:00
Justin Clark-Casey (justincc)
0f93ea5d95 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2009-10-05 20:20:00 +01:00
Justin Clark-Casey (justincc)
46110b0195 change default ports for inventory and grid connectors in example .ini files to 8003 to match the ROBUST default 
altered wiki page to reflect this
 2009-10-05 20:18:35 +01:00
Diva Canto
9bd1353875 Fixed bug introduced in one of the last commits. 2009-10-05 12:13:38 -07:00
Diva Canto
05b80185b9 More debug to try to diagnose a problem with region registration. 2009-10-05 11:49:21 -07:00
Diva Canto
5f18a088a8 More error catching/outputting. 2009-10-05 11:14:46 -07: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
Diva Canto
62ea6b6383 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-10-05 10:31:41 -07:00
Diva Canto
a2d5da7129 More debug messages if things go wrong. 2009-10-05 10:31:09 -07:00
Justin Clark-Casey (justincc)
10c4b88ccf minor: remove mono compile warning 2009-10-05 18:20:37 +01:00
Diva Canto
81c08ec74a Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-10-05 09:19:16 -07:00
Diva Canto
75b35ddf4a More error messages to warn when/if things go wrong. 2009-10-05 09:18:51 -07:00
Diva Canto
ad81b453b3 GetRegionByPosition: use the cache, Luke. 2009-10-05 09:02:52 -07:00
Melanie
0cb974bc76 Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim 2009-10-05 16:32:31 +01:00
Melanie
5702c8f910 Adapt to renamed members in landObject 2009-10-05 16:31:54 +01:00
Melanie
a7023ed81c Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim 2009-10-05 16:08:57 +01:00
unknown
7c3e5afc0c MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy up 2009-10-05 16:08:35 +01: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
Melanie
a208f33c5d Make the asset connector async Get overload return false if the asset 
retrieval was not synchronous.
 2009-10-05 00:23:47 +01: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
a528e7704c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2009-10-04 13:58:22 -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
022526661b Just trying a few things. This one will reduce the number of async calls. 2009-10-04 13:38:12 -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
30aac00f6b Closing more streams even if things fail. 2009-10-04 10:12:19 -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
f21f3727df Leaving the MemoryStreams unclosed. 2009-10-04 09:20:01 -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
dahlia
0cbd9eee2f Exclude sculpt proxies from mesh caching 2009-10-04 02:14:13 -07:00
Melanie
6878b26b0d Merge branch 'diva-textures-osgrid' 2009-10-04 05:49:16 +01:00
Diva Canto
2d9c27a28f Slightly better message with status code for WebException. 2009-10-03 20:18:21 -07:00
Diva Canto
b2cdee5a14 Better error handling to diagnose login problems. 2009-10-03 19:08:56 -07:00
Diva Canto
25e7697987 Fixed build order for Linux. 2009-10-03 16:33:10 -07:00
Diva Canto
b6920267f0 Close was being called to early on the Memory stream. 2009-10-03 16:27:55 -07:00