aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/LLSDAssetUploadRequest.cs
diff options
context:
space:
mode:
authorMelanie2013-01-16 01:11:20 +0000
committerMelanie2013-01-16 01:11:20 +0000
commitfc5711fa7ab3bcd0d81737735d098f070a7132bb (patch)
tree06fbc4ebf2a4788f4ffd65010d6abadfb2ffafae /OpenSim/Capabilities/LLSDAssetUploadRequest.cs
parentMerge branch 'avination' into careminster (diff)
parentBulletSim: disable center-of-mass computation for linksets until debugged. Mo... (diff)
downloadopensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.zip
opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.gz
opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.bz2
opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.xz
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions