aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorMelanie2011-04-18 21:04:09 +0100
committerMelanie2011-04-18 21:04:09 +0100
commitccf63a9c633606d994fe33c699f8fcd000ec9d81 (patch)
tree367d25e505b0986b78eaca8e58bc556c3dac6c92 /OpenSim/Framework/Servers
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentFix bug where objects were being coalesced in the wrong positions. (diff)
downloadopensim-SC_OLD-ccf63a9c633606d994fe33c699f8fcd000ec9d81.zip
opensim-SC_OLD-ccf63a9c633606d994fe33c699f8fcd000ec9d81.tar.gz
opensim-SC_OLD-ccf63a9c633606d994fe33c699f8fcd000ec9d81.tar.bz2
opensim-SC_OLD-ccf63a9c633606d994fe33c699f8fcd000ec9d81.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Servers')
0 files changed, 0 insertions, 0 deletions