aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵John Hurliman2009-10-064-2/+22
|\ | | | | | | htb-throttle
| * * Removed verbose debug messageDiva Canto2009-10-062-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 Canto2009-10-061-0/+4
| |
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-061-6/+6
| |\
| | * Commenting the DEBUG code that I added yesterday, because it's causing mono ↵Diva Canto2009-10-061-6/+6
| | | | | | | | | | | | | | | | | | to fail with https://bugzilla.novell.com/show_bug.cgi?id=538854
| * | Lock the heartbeat against multiple invocations. May prevent deadlocks and/orMelanie2009-10-061-0/+10
| |/ | | | | | | runaway thread use
| * Correction on the DEBUG code.Diva Canto2009-10-051-4/+3
| |
| * #if DEBBUG code for monitoring the ThreadPool.Diva Canto2009-10-051-0/+7
| |
* | * Added missing references to prebuild.xml and commented out the LindenUDP ↵John Hurliman2009-10-067-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 Hurliman2009-10-063-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 commitJohn Hurliman2009-10-069-11/+0
| |
* | * Continued work on the new LLUDP implementation. Appears to be functioning, ↵John Hurliman2009-10-0613-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 Hurliman2009-10-0515-112/+206
|\ \ | |/ | | | | htb-throttle
| * Make sure that keys exist in arrays before trying to access them.Michael Cortez2009-10-051-3/+9
| |
| * Ensure the specified imSessionID exists in the DroppedSession collection ↵Michael Cortez2009-10-051-1/+1
| | | | | | | | before attempting to access it.
| * Changed the lock object, to see if this helps at all. Also switched the ↵Diva Canto2009-10-051-11/+15
| | | | | | | | order of lock and try/catch in RemoveImageFromQueue.
| * * minor: tweak asset cache logging levels downwardsJustin Clark-Casey (justincc)2009-10-054-12/+9
| |
| * minor: remove mono compile warningJustin Clark-Casey (justincc)2009-10-051-5/+2
| |
| * 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
| |\
| * | Reduced locking.Diva Canto2009-10-041-8/+10
| | |
* | | Beginning work on the new LLUDP implementationJohn Hurliman2009-10-0513-2329/+1816
| |/ |/|
* | * 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)
* 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.