aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-30 14:10:13 -0400
committerJonathan Freedman2010-10-30 14:10:13 -0400
commite371d3208cdda87f8ea86adb591ed6225f0aa442 (patch)
treef481acfbafcb7134c00ff519c0c12b41e7815d02 /OpenSim/Services/HypergridService
parentMerge branch 'master' into mantis5110 (diff)
parentLogins work now, but avatars are green ugly gnomes. (diff)
downloadopensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.zip
opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.gz
opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.bz2
opensim-SC_OLD-e371d3208cdda87f8ea86adb591ed6225f0aa442.tar.xz
Merge branch 'master' into mantis5110
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
Diffstat (limited to 'OpenSim/Services/HypergridService')
0 files changed, 0 insertions, 0 deletions