aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2012-02-05 20:58:04 +0000
committerMelanie2012-02-05 20:58:04 +0000
commit54fc78013d1eb946551656849e7007427ef4aec3 (patch)
treefae81b9031f5ae0fb07d0f3e61eb83946bbc26b1 /OpenSim/Services
parentMerge branch 'master' into careminster (diff)
parentRevert my two quick fixes for the lag issue and put in the real fix, which (diff)
downloadopensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.zip
opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.gz
opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.bz2
opensim-SC-54fc78013d1eb946551656849e7007427ef4aec3.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services')
0 files changed, 0 insertions, 0 deletions