aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance
diff options
context:
space:
mode:
authorMelanie2012-10-28 18:58:43 +0000
committerMelanie2012-10-28 18:58:43 +0000
commit5b0fc6029624cfe6dedd1096a2f9daa7fdc98470 (patch)
treefd30d7dd76baaa38c277f143cafbfcca88ff3961 /OpenSim/Region/ScriptEngine/Shared/Instance
parentMerge branch 'master' into careminster (diff)
parentAdd a property to determine if a link set is stored in the database. Also, fix (diff)
downloadopensim-SC-5b0fc6029624cfe6dedd1096a2f9daa7fdc98470.zip
opensim-SC-5b0fc6029624cfe6dedd1096a2f9daa7fdc98470.tar.gz
opensim-SC-5b0fc6029624cfe6dedd1096a2f9daa7fdc98470.tar.bz2
opensim-SC-5b0fc6029624cfe6dedd1096a2f9daa7fdc98470.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
0 files changed, 0 insertions, 0 deletions