aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
diff options
context:
space:
mode:
authorMelanie2011-10-11 23:32:16 +0100
committerMelanie2011-10-11 23:32:16 +0100
commita9af618842e3b70620bd0115405c366dd593efb0 (patch)
tree05de920104ca054c9ce62d0c27a1272610d2fcae /OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
parentMerge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge (diff)
parentRemoved redundant code in AttachmentsModule and simplified interfaces which c... (diff)
downloadopensim-SC-a9af618842e3b70620bd0115405c366dd593efb0.zip
opensim-SC-a9af618842e3b70620bd0115405c366dd593efb0.tar.gz
opensim-SC-a9af618842e3b70620bd0115405c366dd593efb0.tar.bz2
opensim-SC-a9af618842e3b70620bd0115405c366dd593efb0.tar.xz
Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-26 22:32:15 +0000