Commit Graph

10629 Commits (8d7075c5c6bb8b20f2f54be3b33914973c0943e3)

Author SHA1 Message Date
Melanie 8d7075c5c6 Adapt to renamed members in landObject 2009-10-05 16:33:25 +01:00
unknown 82df3d8fd6 MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy up 2009-10-05 16:07:33 +01:00
Melanie 8d5a40aad0 Merge branch 'master' into vehicles 2009-10-05 12:58:52 +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
Melanie dcdcbb314e Fix build break 2009-10-05 11:08:02 +01:00
Melanie 0744292b47 Merge branch 'master' into vehicles 2009-10-05 10:17:23 +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
Diva Canto b75b887798 Fixed interface between the Messaging server and the grid server. 2009-10-03 11:55:52 -07:00
Diva Canto df7049008a More streams closed. 2009-10-03 08:57:30 -07:00
Diva Canto de94aa9bb5 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-10-03 08:46:25 -07:00
Diva Canto e1112ff879 MOre streams closed. Corrected word in GridCommon.ini.example 2009-10-03 08:46:06 -07:00
Diva Canto 4843edfeb7 Closing more streams. 2009-10-03 08:33:19 -07:00
Melanie 874e423141 Fix my build break 2009-10-03 15:37:31 +01:00
Melanie b4d1cf0009 Small permissions tweak 2009-10-03 14:22:29 +01:00
Diva Canto 006dfd6d9a Closing another stream. 2009-10-02 20:35:15 -07:00
John Hurliman 387e9f7a7f * Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
John Hurliman 3ab6c89652 Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid 2009-10-02 16:54:03 -07:00
John Hurliman 332d3eb1bb * Removed code that is no longer used with Melanie's queue callback optimization
* Moved all priority queue access to helper functions to improve reliability and readability
* New version of CSJ2K.dll (from libomv source tree) that fixes a JPEG2000 comment decoding bug
2009-10-02 16:53:35 -07:00
Diva Canto 7a2ac292d6 Merge branch 'diva-textures-osgrid' of ssh://diva@opensimulator.org/var/git/opensim into diva-textures-osgrid 2009-10-02 16:24:13 -07:00
Diva Canto e66321227e Close streams in MakeRequest. 2009-10-02 16:23:46 -07:00
Melanie 36c8d55827 Merge branch 'diva-textures-osgrid' 2009-10-03 00:03:09 +01:00
Melanie 73fa409318 Merge branch 'diva-textures-osgrid' 2009-10-02 23:25:17 +01:00
John Hurliman bdc1345501 * Removed even more unnecessary state variables from J2KImage
* Fixed the incorrect "out of memory?" exception messages and replaced them with useful information
* Cleaned up J2KImage and LLImageManager to conform to coding conventions
2009-10-02 13:08:15 -07:00
John Hurliman 9b342d3e0d * Changed the flush logic to drop packets in non-transactional streams, and to not fire any "put more data in the queues" callbacks
* Minor tweaks to code formatting to make the callback chain for packet queuing easier to follow
2009-10-02 12:00:42 -07:00
Melanie 9eccea5777 Merge branch 'master' into vehicles 2009-10-02 19:53:42 +01:00
Melanie 46955f4260 Merge branch 'master' into vehicles 2009-10-02 19:04:46 +01:00
Melanie ce8974539e Merge branch 'master' into diva-textures 2009-10-02 19:03:22 +01:00
Melanie 6def897556 Merge branch 'diva-textures-osgrid' into diva-textures 2009-10-02 19:02:38 +01:00
Diva Canto 2e1c76f836 Added a default for grid services in standalone. 2009-10-02 07:18:36 -07:00