aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into diva-texturesMelanie2009-10-02341-5746/+8101
|\
| * 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-022-14/+21
| | |\
| | * | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵Melanie2009-10-026-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 Frisby2009-10-021-4/+52
| | |/ | |/|
| * | Added messages to assertions in the failing tests, so that we know which ↵Diva Canto2009-10-011-12/+19
| | | | | | | | | | | | ones are failing.
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-011-0/+44
| |\ \ | | |/
| | * Add "dump asset" command to remote asset connector (the only one that uses aMelanie2009-10-011-0/+44
| | | | | | | | | | | | cache at all)
| * | Switched log level of an annoying message in SQLite to Debug, and commented ↵Diva Canto2009-10-011-2/+2
| |/ | | | | | | it too.
| * Catch and print exceptions in MessagingService, to diagnose mysterious ↵Diva Canto2009-10-011-35/+51
| | | | | | | | disappearances of the Messaging server.
| * - adding new LandDataSerializer testcase to "test-xml" target as welldr scofield (aka dirk husemann)2009-10-012-14/+52
| | | | | | | | - adding another LandDataSerializer testcase
| * fixing LandDataSerializer (yeah! for testcases)dr scofield (aka dirk husemann)2009-10-012-19/+29
| |
| * Merge branch 'oar-parcel' into x-opensimdr scofield (aka dirk husemann)2009-10-011-1/+4
| |\
| | * adding meat to the LandDataSerializerTest cases.dr scofield (aka dirk husemann)2009-10-011-1/+4
| | |
| * | Merge branch 'oar-parcel' into x-opensimdr scofield (aka dirk husemann)2009-10-012-32/+118
| |\ \ | | |/
| | * adding testcase for LandDataSerializer; fixing LandDataSerializer ;-)dr scofield (aka dirk husemann)2009-10-012-32/+118
| | |
| * | Removed an innefficent List.Contains lookup from UpdateQueueJames J Greensky2009-09-301-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/opensimJohn Hurliman2009-09-3036-48/+48
| |\ \
| | * | Formatting cleanup.Jeff Ames2009-10-0136-48/+48
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-30344-7642/+7898
| |\ \ \ | | |/ /
| | * | Formatting cleanup.Jeff Ames2009-10-01223-930/+875
| | |/
| | * adding LandDataSerializer (not connected anywhere, work-in-progress)dr scofield (aka dirk husemann)2009-09-301-0/+185
| | | | | | | | | | | | [hi, there, justin!]
| | * Make create user to the Right Thing with regard to salting user passwordsMelanie2009-09-301-2/+4
| | |
| | * 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 ↵Diva Canto2009-09-293-1/+42
| | | | | | | | | | | | | | | | | | | | phantom after an import to megaregions.
| | * | | This fix addresses the problem where phantom objects do notAlan M Webb2009-09-291-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, ifAlan M Webb2009-09-291-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 Ames2009-09-291-26/+0
| | |
| | * Fix loading modules with alternate configurations and ports into ROBUST.Melanie2009-09-2914-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 Canto2009-09-282-4/+13
| | | | | | | | | | | | Also fiddled a bit more with the initial CAP in the user server.
| | * Fixed bug in Check4096 (HG).Diva Canto2009-09-281-2/+2
| | |
| | * Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.Diva Canto2009-09-281-4/+8
| | |
| | * I think I have fixed something that was broken in the scene setup (tests) ↵Diva Canto2009-09-282-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/opensimDiva Canto2009-09-2816-69/+113
| | |\
| | | * Add copyright header. Formatting cleanup.Jeff Ames2009-09-2916-69/+113
| | | |
| | * | Improved the Local grid connector to fetch data from the DB when it doesn't ↵Diva Canto2009-09-284-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.
| | * Merge branch 'grid-service-redux'Melanie2009-09-2869-4184/+1352
| | |\
| | | * Forgot a return statement.Diva Canto2009-09-281-1/+1
| | | |
| | | * Added Protocol versions back, this time in a range model.Diva Canto2009-09-283-1/+76
| | | |
| | | * Fixed bug in user server related to region's serverURI.Diva Canto2009-09-281-1/+1
| | | |
| | | * Added RegionSecret to GridRegion, and corresponding saving/retrieval from DB ↵Diva Canto2009-09-281-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 Canto2009-09-281-2/+2
| | | | | | | | | | | | | | | | which was causing an extra \n to be written into the buffer.
| | | * Deleted some files that aren't being used anymore.Diva Canto2009-09-283-131/+0
| | | |
| | | * Fixed small bug in having to deal with RegionInfo's ServerURI, which wasn't ↵Diva Canto2009-09-271-0/+1
| | | | | | | | | | | | | | | | being set.
| | | * Fixed the connection from User server to GridServer.Diva Canto2009-09-271-32/+30
| | | |