aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into vehiclesMelanie2009-10-069-28/+70
|\
| * 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 t...Diva Canto2009-10-061-6/+6
| * | Lock the heartbeat against multiple invocations. May prevent deadlocks and/orMelanie2009-10-061-0/+10
| |/
| * Correction on the DEBUG code.Diva Canto2009-10-051-4/+3
| * #if DEBBUG code for monitoring the ThreadPool.Diva Canto2009-10-051-0/+7
| * 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 befo...Michael Cortez2009-10-051-1/+1
| * Changed the lock object, to see if this helps at all. Also switched the order...Diva Canto2009-10-051-11/+15
| * * 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
* | 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 befo...Michael Cortez2009-10-051-1/+1
* | Merge branch 'master' into vehiclesMelanie2009-10-054-69/+124
|\ \ | |/
| * Eliminate pinned Mesh data on managed heap by using IntPtrs to memory allocat...Dan Lake2009-10-053-61/+120
| * only cache mesh if meshing was successfuldahlia2009-10-041-8/+4
* | Fix build breakMelanie2009-10-051-1/+1
* | Merge branch 'master' into vehiclesMelanie2009-10-0520-358/+323
|\ \ | |/
| * * KeepAlive set to false in expect_user and log_off.Diva Canto2009-10-041-4/+9
| * 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 L...John Hurliman2009-10-041-7/+4
| * | 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 fa...Diva Canto2009-10-041-4/+12
| * 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 Util.UTF...John Hurliman2009-10-0213-24/+24
| * | 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
| * | Merge branch 'diva-textures-osgrid'Melanie2009-10-022-182/+142
| |\ \ | | |/
| | * * Removed even more unnecessary state variables from J2KImageJohn Hurliman2009-10-022-182/+142
* | | Merge branch 'master' into vehiclesMelanie2009-10-0217-1234/+785
|\ \ \ | |/ /
| * | Merge branch 'master' into diva-texturesMelanie2009-10-0218-365/+404
| |\ \
| * \ \ Merge branch 'diva-textures-osgrid' into diva-texturesMelanie2009-10-023-59/+19
| |\ \ \ | | | |/ | | |/|
| | * | * Changed the flush logic to drop packets in non-transactional streams, and t...John Hurliman2009-10-023-59/+19
| * | | Merge branch 'master' into diva-texturesMelanie2009-10-02189-4858/+4101
| |\ \ \ | | |/ / | |/| |
| * | | Restore the missing image handling to the image manager. The missingMelanie2009-10-023-71/+92
| * | | Merge branch 'diva-textures-osgrid' into texturetestMelanie2009-10-021-7/+28
| |\ \ \
| | * | | Locking the priority queue to see if it gets pass that exception.Diva Canto2009-10-011-7/+28
| * | | | Change texture sending to be driven by the queue empty event from theMelanie2009-10-024-90/+60
| |/ / /
| * | | Removing console debug spewJohn Hurliman2009-10-011-7/+7
| * | | Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensi...John Hurliman2009-10-013-2/+93
| |\ \ \
| | * | | Add a method to determine the count of packets in a throttleMelanie2009-10-013-0/+27