aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorMelanie2012-10-04 20:16:23 +0100
committerMelanie2012-10-04 20:16:23 +0100
commit637e9a10db25930a3a23b98fb8f3fe6040335bf4 (patch)
tree3df797463214861c86f7068280e6ab07b97c1066 /OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
parentMerge branch 'master' into careminster (diff)
parentAllow default animation to be stopped to be replaced with another one. (diff)
downloadopensim-SC-637e9a10db25930a3a23b98fb8f3fe6040335bf4.zip
opensim-SC-637e9a10db25930a3a23b98fb8f3fe6040335bf4.tar.gz
opensim-SC-637e9a10db25930a3a23b98fb8f3fe6040335bf4.tar.bz2
opensim-SC-637e9a10db25930a3a23b98fb8f3fe6040335bf4.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs')
0 files changed, 0 insertions, 0 deletions