aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/assets/ScriptsAssetSet/KanEd-Test07.lsl
diff options
context:
space:
mode:
authorRobert Adams2014-01-11 08:52:23 -0800
committerRobert Adams2014-01-11 08:52:23 -0800
commit1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f (patch)
tree125392101f83c8e7cb239848ae7a6cc12595b1a2 /bin/assets/ScriptsAssetSet/KanEd-Test07.lsl
parentMerge branch 'master' into varregion (diff)
parentFix crash in BulletSim which sometimes happens making a linkset physical (diff)
downloadopensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.zip
opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.gz
opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.bz2
opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.xz
Merge branch 'master' into varregion
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneBase.cs OpenSim/Services/Interfaces/IGridService.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs (conflicts were debug statements that are commented out in master branch)
Diffstat (limited to 'bin/assets/ScriptsAssetSet/KanEd-Test07.lsl')
0 files changed, 0 insertions, 0 deletions