aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/IInventoryData.cs
diff options
context:
space:
mode:
authorMelanie2012-07-06 20:51:18 +0100
committerMelanie2012-07-06 20:51:18 +0100
commit26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2 (patch)
treebf9802d765a4965dd1b42c4b2d3145b5813c0c1f /OpenSim/Data/IInventoryData.cs
parentMerge branch 'master' into careminster (diff)
parent added llSetVelocity. will refuse to work on vehicles and on attachments ( th... (diff)
downloadopensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.zip
opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.gz
opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.bz2
opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Data/IInventoryData.cs')
0 files changed, 0 insertions, 0 deletions