aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* GetRegionByPosition: use the cache, Luke.Diva Canto2009-10-052-0/+28
|
* Eliminate pinned Mesh data on managed heap by using IntPtrs to memory ↵Dan Lake2009-10-053-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 successfuldahlia2009-10-041-8/+4
| | | | re-enable sculpt mesh caching
* * KeepAlive set to false in expect_user and log_off.Diva Canto2009-10-041-4/+9
| | | | * Check for null SP in PermissionsModule.
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-041-7/+4
|\
| * * MySQL data tests now pass by fixing a bad fix for a bad cast on the asset ↵John Hurliman2009-10-041-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)
* | Reduced locking.Diva Canto2009-10-041-8/+10
|/
* Guarding a line that is sometimes throwing a null pointer exception.Diva Canto2009-10-041-5/+6
|
* Stream needs to be closed before the file can be moved...Diva Canto2009-10-041-5/+6
|
* Make sure to close the file streams on the FlotsamCache, even if something ↵Diva Canto2009-10-041-4/+12
| | | | fails.
* Trying to avoid the null pointer exception in J2KImage, RunUpdate.Diva Canto2009-10-041-1/+9
|
* flexible extrusion shape defaults to lineardahlia2009-10-041-1/+1
|
* disable physics actors for flexible primsdahlia2009-10-041-3/+4
|
* Exclude sculpt proxies from mesh cachingdahlia2009-10-041-6/+23
|
* Merge branch 'diva-textures-osgrid'Melanie2009-10-0413-24/+24
|\
| * * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵John Hurliman2009-10-0213-24/+24
| | | | | | | | | | | | 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?
* | Fix my build breakMelanie2009-10-031-2/+2
| |
* | Small permissions tweakMelanie2009-10-031-1/+4
| |
* | Merge branch 'diva-textures-osgrid'Melanie2009-10-031-126/+88
|\ \ | |/
| * * Removed code that is no longer used with Melanie's queue callback optimizationJohn Hurliman2009-10-021-126/+88
| | | | | | | | | | * 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
* | Merge branch 'diva-textures-osgrid'Melanie2009-10-022-182/+142
|\ \ | |/
| * * Removed even more unnecessary state variables from J2KImageJohn Hurliman2009-10-022-182/+142
| | | | | | | | | | * Fixed the incorrect "out of memory?" exception messages and replaced them with useful information * Cleaned up J2KImage and LLImageManager to conform to coding conventions
* | Merge branch 'master' into diva-texturesMelanie2009-10-0218-365/+404
|\ \
| * | reducing script engine log spamdr scofield (aka dirk husemann)2009-10-021-4/+4
| | |
| * | - cleaning up LandData/ILandObject capitalization issuesdr scofield (aka dirk husemann)2009-10-0217-361/+400
| | | | | | | | | | | | - adding LandDataSerializer to OAR mechanics
* | | Merge branch 'diva-textures-osgrid' into diva-texturesMelanie2009-10-023-59/+19
|\ \ \ | | |/ | |/|
| * | * Changed the flush logic to drop packets in non-transactional streams, and ↵John Hurliman2009-10-023-59/+19
| | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'master' into diva-texturesMelanie2009-10-02189-4858/+4101
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-10-026-46/+28
| |\
| | * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-021-12/+19
| | |\
| | * | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵Melanie2009-10-026-46/+28
| | | | | | | | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
| * | | * Attempting to fix a issue with console commands & the estate module. Again.Adam Frisby2009-10-021-4/+52
| | |/ | |/|
| * | Added messages to assertions in the failing tests, so that we know which ↵Diva Canto2009-10-011-12/+19
| |/ | | | | | | ones are failing.
| * Removed an innefficent List.Contains lookup from UpdateQueueJames J Greensky2009-09-301-5/+4
| | | | | | | | | | | | Changed the underlying data structure used to detected duplicate in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a List to a Dictionary.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-3026-37/+37
| |\
| | * Formatting cleanup.Jeff Ames2009-10-0126-37/+37
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-30187-4967/+4246
| |\ \ | | |/
| | * Formatting cleanup.Jeff Ames2009-10-01134-525/+525
| | |
| | * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-09-302-1/+4
| | |\
| | | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-291-1/+1
| | | |\
| | | * | Minor bug fixes.Diva Canto2009-09-292-1/+4
| | | | |
| | * | | Change command help text to show .ini in place of .xml when creating regionsMelanie2009-09-301-2/+2
| | | |/ | | |/|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensimdr scofield (aka dirk husemann)2009-09-293-1/+42
| | |\ \ | | | |/
| | | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-291-4/+7
| | | |\
| | | * | A little hack to see if this fixes the problems with ~20% of SOG's becoming ↵Diva Canto2009-09-293-1/+42
| | | | | | | | | | | | | | | | | | | | phantom after an import to megaregions.
| | * | | This fix addresses the problem where phantom objects do notAlan M Webb2009-09-291-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | always behave like they are phantom, and llVolumeDetect seems to operate in a random fashion. Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
| | * | Given the perverse way that strided works, ifAlan M Webb2009-09-291-4/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | there is only one element in the range, it must also coincide with the specified stride. The existing code assumes that the stride starts at start ( which is the expected and most useful behavior). Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
| | * Fixed bug in Check4096 (HG).Diva Canto2009-09-281-2/+2
| | |
| | * I think I have fixed something that was broken in the scene setup (tests) ↵Diva Canto2009-09-281-3/+4
| | | | | | | | | | | | and that needs to be reflected in all other services setups. But the teleport test still doesn't work. Commenting it for now.
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-287-39/+60
| | |\