aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/PrimitiveBaseShape.cs
diff options
context:
space:
mode:
authorMelanie2012-11-30 01:19:08 +0000
committerMelanie2012-11-30 01:19:08 +0000
commitdaa1d99513546121592bcab64d2178a570cd250e (patch)
treeb45c14a2771cef6bfee8477aea2a84f6f25ed873 /OpenSim/Framework/PrimitiveBaseShape.cs
parentMerge branch 'avination' into careminster (diff)
parentBulletSim: fix boats floating low by removing LIMIT_MOTOR_UP flag from TYPE_B... (diff)
downloadopensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.zip
opensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.tar.gz
opensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.tar.bz2
opensim-SC_OLD-daa1d99513546121592bcab64d2178a570cd250e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
Diffstat (limited to 'OpenSim/Framework/PrimitiveBaseShape.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-10-06 10:36:18 +0000