Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-02 | 3 | -188/+162 |
|\ | |||||
| * | Merge branch 'diva-textures-osgrid' of ↵ | Diva Canto | 2009-10-02 | 5 | -241/+161 |
| |\ | | | | | | | | | | ssh://diva@opensimulator.org/var/git/opensim into diva-textures-osgrid | ||||
| | * | * Removed even more unnecessary state variables from J2KImage | John Hurliman | 2009-10-02 | 2 | -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 | ||||
| * | | Close streams in MakeRequest. | Diva Canto | 2009-10-02 | 1 | -6/+20 |
| | | | |||||
* | | | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 27 | -396/+477 |
|\ \ \ | |||||
| * | | | reducing script engine log spam | dr scofield (aka dirk husemann) | 2009-10-02 | 1 | -4/+4 |
| | | | | |||||
| * | | | reducing region DB log spam | dr scofield (aka dirk husemann) | 2009-10-02 | 2 | -2/+2 |
| | | | | |||||
| * | | | fixing TestLandChannel to let it return empty List<ILandObject>() (as | dr scofield (aka dirk husemann) | 2009-10-02 | 2 | -6/+42 |
| | | | | | | | | | | | | | | | | does the real LandChannel), percolating to SceneSetupHelpers. | ||||
| * | | | - cleaning up LandData/ILandObject capitalization issues | dr scofield (aka dirk husemann) | 2009-10-02 | 24 | -384/+429 |
| | | | | | | | | | | | | | | | | - adding LandDataSerializer to OAR mechanics | ||||
* | | | | Merge branch 'diva-textures-osgrid' into diva-textures | Melanie | 2009-10-02 | 3 | -59/+19 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | * Changed the flush logic to drop packets in non-transactional streams, and ↵ | John Hurliman | 2009-10-02 | 3 | -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-textures | Melanie | 2009-10-02 | 341 | -5746/+8101 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Adam Frisby | 2009-10-02 | 6 | -46/+28 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-02 | 2 | -14/+21 |
| | |\ | |||||
| | * | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵ | Melanie | 2009-10-02 | 6 | -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 Frisby | 2009-10-02 | 1 | -4/+52 |
| | |/ | |/| | |||||
| * | | Added messages to assertions in the failing tests, so that we know which ↵ | Diva Canto | 2009-10-01 | 1 | -12/+19 |
| | | | | | | | | | | | | ones are failing. | ||||
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-10-01 | 1 | -0/+44 |
| |\ \ | | |/ | |||||
| | * | Add "dump asset" command to remote asset connector (the only one that uses a | Melanie | 2009-10-01 | 1 | -0/+44 |
| | | | | | | | | | | | | cache at all) | ||||
| * | | Switched log level of an annoying message in SQLite to Debug, and commented ↵ | Diva Canto | 2009-10-01 | 1 | -2/+2 |
| |/ | | | | | | | it too. | ||||
| * | Catch and print exceptions in MessagingService, to diagnose mysterious ↵ | Diva Canto | 2009-10-01 | 1 | -35/+51 |
| | | | | | | | | disappearances of the Messaging server. | ||||
| * | - adding new LandDataSerializer testcase to "test-xml" target as well | dr scofield (aka dirk husemann) | 2009-10-01 | 2 | -14/+52 |
| | | | | | | | | - adding another LandDataSerializer testcase | ||||
| * | fixing LandDataSerializer (yeah! for testcases) | dr scofield (aka dirk husemann) | 2009-10-01 | 2 | -19/+29 |
| | | |||||
| * | Merge branch 'oar-parcel' into x-opensim | dr scofield (aka dirk husemann) | 2009-10-01 | 1 | -1/+4 |
| |\ | |||||
| | * | adding meat to the LandDataSerializerTest cases. | dr scofield (aka dirk husemann) | 2009-10-01 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'oar-parcel' into x-opensim | dr scofield (aka dirk husemann) | 2009-10-01 | 2 | -32/+118 |
| |\ \ | | |/ | |||||
| | * | adding testcase for LandDataSerializer; fixing LandDataSerializer ;-) | dr scofield (aka dirk husemann) | 2009-10-01 | 2 | -32/+118 |
| | | | |||||
| * | | Removed an innefficent List.Contains lookup from UpdateQueue | James J Greensky | 2009-09-30 | 1 | -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/opensim | John Hurliman | 2009-09-30 | 36 | -48/+48 |
| |\ \ | |||||
| | * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 36 | -48/+48 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-09-30 | 344 | -7642/+7898 |
| |\ \ \ | | |/ / | |||||
| | * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 223 | -930/+875 |
| | |/ | |||||
| | * | adding LandDataSerializer (not connected anywhere, work-in-progress) | dr scofield (aka dirk husemann) | 2009-09-30 | 1 | -0/+185 |
| | | | | | | | | | | | | [hi, there, justin!] | ||||
| | * | Make create user to the Right Thing with regard to salting user passwords | Melanie | 2009-09-30 | 1 | -2/+4 |
| | | | |||||
| | * | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-09-30 | 2 | -1/+4 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-29 | 1 | -1/+1 |
| | | |\ | |||||
| | | * | | Minor bug fixes. | Diva Canto | 2009-09-29 | 2 | -1/+4 |
| | | | | | |||||
| | * | | | Change command help text to show .ini in place of .xml when creating regions | Melanie | 2009-09-30 | 1 | -2/+2 |
| | | |/ | | |/| | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim | dr scofield (aka dirk husemann) | 2009-09-29 | 3 | -1/+42 |
| | |\ \ | | | |/ | |||||
| | | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-29 | 1 | -4/+7 |
| | | |\ | |||||
| | | * | | A little hack to see if this fixes the problems with ~20% of SOG's becoming ↵ | Diva Canto | 2009-09-29 | 3 | -1/+42 |
| | | | | | | | | | | | | | | | | | | | | phantom after an import to megaregions. | ||||
| | * | | | This fix addresses the problem where phantom objects do not | Alan M Webb | 2009-09-29 | 1 | -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, if | Alan M Webb | 2009-09-29 | 1 | -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> | ||||
| | * | Remove empty CheckSumServer.cs file. | Jeff Ames | 2009-09-29 | 1 | -26/+0 |
| | | | |||||
| | * | Fix loading modules with alternate configurations and ports into ROBUST. | Melanie | 2009-09-29 | 14 | -55/+75 |
| | | | | | | | | | | | | Make all current modules support the configuration name option | ||||
| | * | Fixed bug in HG that was causing secondlife:// refs to bomb the client. | Diva Canto | 2009-09-28 | 2 | -4/+13 |
| | | | | | | | | | | | | Also fiddled a bit more with the initial CAP in the user server. | ||||
| | * | Fixed bug in Check4096 (HG). | Diva Canto | 2009-09-28 | 1 | -2/+2 |
| | | | |||||
| | * | Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer. | Diva Canto | 2009-09-28 | 1 | -4/+8 |
| | | | |||||
| | * | I think I have fixed something that was broken in the scene setup (tests) ↵ | Diva Canto | 2009-09-28 | 2 | -10/+14 |
| | | | | | | | | | | | | 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/opensim | Diva Canto | 2009-09-28 | 16 | -69/+113 |
| | |\ |