aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into vehiclesMelanie2009-10-0563-1866/+1834
|\
| * Make the asset connector async Get overload return false if the assetMelanie2009-10-051-0/+4
| * * KeepAlive set to false in expect_user and log_off.Diva Canto2009-10-042-6/+11
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-0418-1284/+1165
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-10-041-1/+2
| | |\
| | * | * MySQL data tests now pass by fixing a bad fix for a bad cast on the asset L...John Hurliman2009-10-0418-1284/+1165
| * | | Reduced locking.Diva Canto2009-10-041-8/+10
| | |/ | |/|
| * | Just trying a few things. This one will reduce the number of async calls.Diva Canto2009-10-041-1/+2
| |/
| * Guarding a line that is sometimes throwing a null pointer exception.Diva Canto2009-10-041-5/+6
| * Closing more streams even if things fail.Diva Canto2009-10-041-6/+25
| * 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
| * Leaving the MemoryStreams unclosed.Diva Canto2009-10-042-2/+4
| * 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-0428-51/+73
| |\
| | * Closing another stream.Diva Canto2009-10-021-4/+19
| | * * Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF...John Hurliman2009-10-0227-48/+55
| * | Slightly better message with status code for WebException.Diva Canto2009-10-031-1/+1
| * | Better error handling to diagnose login problems.Diva Canto2009-10-032-79/+102
| * | Fixed build order for Linux.Diva Canto2009-10-031-64/+64
| * | Close was being called to early on the Memory stream.Diva Canto2009-10-033-3/+7
| * | Fixed interface between the Messaging server and the grid server.Diva Canto2009-10-032-42/+32
| * | More streams closed.Diva Canto2009-10-032-2/+18
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-031-2/+2
| |\ \
| | * | Fix my build breakMelanie2009-10-031-2/+2
| * | | MOre streams closed. Corrected word in GridCommon.ini.exampleDiva Canto2009-10-032-1/+2
| * | | Closing more streams.Diva Canto2009-10-031-4/+27
| |/ /
| * | Small permissions tweakMelanie2009-10-031-1/+4
| * | Merge branch 'diva-textures-osgrid'Melanie2009-10-032-126/+88
| |\ \ | | |/
| | * Merge branch 'diva-textures-osgrid' of ssh://opensimulator.org/var/git/opensi...John Hurliman2009-10-021-6/+20
| | |\
| | * | * Removed code that is no longer used with Melanie's queue callback optimizationJohn Hurliman2009-10-022-126/+88
| * | | Merge branch 'diva-textures-osgrid'Melanie2009-10-023-188/+162
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'diva-textures-osgrid' of ssh://diva@opensimulator.org/var/git/o...Diva Canto2009-10-025-241/+161
| | |\ \ | | | |/
| | | * * Removed even more unnecessary state variables from J2KImageJohn Hurliman2009-10-022-182/+142
| | * | Close streams in MakeRequest.Diva Canto2009-10-021-6/+20
* | | | Merge branch 'master' into vehiclesMelanie2009-10-0241-2787/+822
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into diva-texturesMelanie2009-10-0228-396/+481
| |\ \ \
| * \ \ \ 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-02356-5947/+8373
| |\ \ \ | | |/ / | |/| |
| * | | 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-025-95/+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-014-2/+137
| |\ \ \
| | * | | Add a method to determine the count of packets in a throttleMelanie2009-10-013-0/+27