aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | Add OnQueueEmpty event to the packet layers. No user functinality yetMelanie2009-10-013-2/+66
| * | | | * Rewrote LLImageManager to use a real priority queue and hold minimal stateJohn Hurliman2009-10-013-449/+331
| |/ / /
| * | | Fixing LLClientView memory leakJames J Greensky2009-10-014-8/+29
| * | | Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there.Diva Canto2009-09-301-0/+14
| * | | * Change the signature of the agent set appearance callback to prevent unnece...John Hurliman2009-09-304-26/+42
| * | | Prevent null data being sent to the decoderMelanie2009-09-301-2/+5
| * | | Add RebakeAvatarTexturesPacket to the client viewMelanie2009-09-304-0/+22
| * | | Remove predecode-j2k and it's assoaciated logicMelanie2009-09-302-142/+0
| * | | Squelch the debug noise from diva's patchMelanie2009-09-301-1/+1
| * | | Attempting to improve the robustness of texture decoding by always ignoring L...John Hurliman2009-09-305-534/+165
| * | | Revert "Attempting to improve the robustness of texture decoding by always ig...Melanie2009-09-301-68/+168
| * | | Attempting to improve the robustness of texture decoding by always ignoring L...John Hurliman2009-09-301-168/+68
| * | | This releases the texture assets from LLImageManager cache, and re-requests t...Diva Canto2009-09-302-12/+48
* | | | Merge branch 'master' into vehiclesMelanie2009-10-0221-382/+477
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| | |/ | |/|
| * | 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 of...Melanie2009-10-026-46/+28
| * | | | * 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 ones...Diva Canto2009-10-011-12/+19
| |/ /
* | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of...Melanie2009-10-026-46/+27
* | | Fix a merge conflictMelanie2009-10-011-1/+1
* | | Merge branch 'master' into vehiclesMelanie2009-10-01180-4620/+1662
|\ \ \ | |/ /
| * | Removed an innefficent List.Contains lookup from UpdateQueueJames J Greensky2009-09-301-5/+4
| * | 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 p...Diva Canto2009-09-293-1/+42
| | * | | | This fix addresses the problem where phantom objects do notAlan M Webb2009-09-291-1/+1
| | | |/ / | | |/| |
| | * | | Given the perverse way that strided works, ifAlan M Webb2009-09-291-4/+7
| | |/ /