aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'oar-parcel' into x-opensimdr scofield (aka dirk husemann)2009-10-014-34/+126
|\
| * adding testcase for LandDataSerializer; fixing LandDataSerializer ;-)dr scofield (aka dirk husemann)2009-10-014-34/+126
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensimdr scofield (aka dirk husemann)2009-10-01233-1011/+973
|\ \ | |/ |/|
| * 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-3036-48/+48
| |\
| | * Formatting cleanup.Jeff Ames2009-10-0136-48/+48
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-30360-8153/+8372
| |\ \ | | |/
| | * Formatting cleanup.Jeff Ames2009-10-01223-930/+875
| * | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB...John Hurliman2009-09-166-28/+46
* | | adding skeleton test case for LandDataSerializer [w-i-p]dr scofield (aka dirk husemann)2009-09-301-1/+34
| |/ |/|
* | adding LandDataSerializer (not connected anywhere, work-in-progress)dr scofield (aka dirk husemann)2009-09-301-0/+185
* | 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-304-1/+10
|\ \
| * \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-291-1/+1
| |\ \
| * | | Minor bug fixes.Diva Canto2009-09-294-1/+10
* | | | 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
|/ /
* | 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
* | Fixed bug in HG that was causing secondlife:// refs to bomb the client.Diva Canto2009-09-282-4/+13
* | 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) and...Diva Canto2009-09-282-10/+14
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-2819-374/+418
|\ \
| * | Convert DOS newlines to Unix newlines.Jeff Ames2009-09-292-265/+265
| * | Add copyright header. Formatting cleanup.Jeff Ames2009-09-2916-69/+113
| * | More reorderingMelanie2009-09-281-40/+40
* | | Improved the Local grid connector to fetch data from the DB when it doesn't f...Diva Canto2009-09-284-5/+45
|/ /
* | Reorder prebuild stuff to make panda eat bamboo in peaceMelanie2009-09-281-43/+43
* | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-09-280-0/+0
|\ \
| * \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-282-6/+64
| |\ \
| * \ \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-282-2/+2
| |\ \ \
* | \ \ \ Merge branch 'grid-service-redux'Melanie2009-09-2879-4193/+1406
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | 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
| * | | Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, which...Diva Canto2009-09-281-2/+2
| * | | Added GridService section to OpenSim.Server.ini.exampleDiva Canto2009-09-281-1/+10
| * | | 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 b...Diva Canto2009-09-271-0/+1
| * | | Fixed the connection from User server to GridServer.Diva Canto2009-09-272-32/+33
| * | | Fixed an issue with the PresenceModule in "gridmode", introduced by my fixing...Diva Canto2009-09-271-3/+0
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-271-2/+3
| |\ \ \
| * | | | Guarding the methods under if (m_Enabled)Diva Canto2009-09-271-3/+7
| * | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-271-0/+4
| |\ \ \ \