Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵ | Melanie | 2009-10-02 | 6 | -46/+27 |
| | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0. | ||||
* | Fix a merge conflict | Melanie | 2009-10-01 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into vehicles | Melanie | 2009-10-01 | 307 | -5621/+3279 |
|\ | |||||
| * | - adding new LandDataSerializer testcase to "test-xml" target as well | dr scofield (aka dirk husemann) | 2009-10-01 | 3 | -14/+57 |
| | | | | | | | | - 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 | 4 | -34/+126 |
| |\ \ | | |/ | |||||
| | * | adding testcase for LandDataSerializer; fixing LandDataSerializer ;-) | dr scofield (aka dirk husemann) | 2009-10-01 | 4 | -34/+126 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim | dr scofield (aka dirk husemann) | 2009-10-01 | 233 | -1011/+973 |
| |\ \ | | |/ | |/| | |||||
| | * | 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 | 360 | -8153/+8372 |
| | |\ \ | | | |/ | |||||
| | | * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 223 | -930/+875 |
| | | | | |||||
| | * | | * Adding Scale to EntityBase * Fixing the incorrect initialization of ↵ | John Hurliman | 2009-09-16 | 6 | -28/+46 |
| | | | | | | | | | | | | | | | | EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity | ||||
| * | | | adding skeleton test case for LandDataSerializer [w-i-p] | dr scofield (aka dirk husemann) | 2009-09-30 | 1 | -1/+34 |
| | |/ | |/| | |||||
| * | | 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 | 4 | -1/+10 |
| |\ \ | |||||
| | * \ | 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 | 4 | -1/+10 |
| | | | | | |||||
| * | | | | 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 | 19 | -374/+418 |
| |\ \ | |||||
| | * | | Convert DOS newlines to Unix newlines. | Jeff Ames | 2009-09-29 | 2 | -265/+265 |
| | | | | |||||
| | * | | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-09-29 | 16 | -69/+113 |
| | | | | |||||
| | * | | More reordering | Melanie | 2009-09-28 | 1 | -40/+40 |
| | | | | |||||
| * | | | Improved the Local grid connector to fetch data from the DB when it doesn't ↵ | Diva Canto | 2009-09-28 | 4 | -5/+45 |
| |/ / | | | | | | | | | | | | | | | | find it in the cache. Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes. | ||||
| * | | Reorder prebuild stuff to make panda eat bamboo in peace | Melanie | 2009-09-28 | 1 | -43/+43 |
| | | | |||||
| * | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-09-28 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-28 | 2 | -6/+64 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-28 | 2 | -2/+2 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge branch 'grid-service-redux' | Melanie | 2009-09-28 | 79 | -4193/+1406 |
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | |||||
| | * | | | Forgot a return statement. | Diva Canto | 2009-09-28 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Added Protocol versions back, this time in a range model. | Diva Canto | 2009-09-28 | 3 | -1/+76 |
| | | | | | |||||
| | * | | | Fixed bug in user server related to region's serverURI. | Diva Canto | 2009-09-28 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Added RegionSecret to GridRegion, and corresponding saving/retrieval from DB ↵ | Diva Canto | 2009-09-28 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | layer. This sounds fishy to me, but it's what's used to make external currency modules work, for now. | ||||
| | * | | | Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, ↵ | Diva Canto | 2009-09-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | which was causing an extra \n to be written into the buffer. | ||||
| | * | | | Added GridService section to OpenSim.Server.ini.example | Diva Canto | 2009-09-28 | 1 | -1/+10 |
| | | | | |