aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLXInventoryData.cs
diff options
context:
space:
mode:
authorMelanie2010-01-04 06:17:38 +0000
committerMelanie2010-01-04 06:17:38 +0000
commitd657b76dba39a9cb5e37f7f86056893e39e8a3f9 (patch)
treee76f5c9177496038984afa7c4eb04fb093d475fc /OpenSim/Data/MySQL/MySQLXInventoryData.cs
parentSolve conflict (diff)
parentWhen rezzing a no-copy object on a no-rez parcel, the object vanishes from (diff)
downloadopensim-SC-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.zip
opensim-SC-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.tar.gz
opensim-SC-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.tar.bz2
opensim-SC-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLXInventoryData.cs')
0 files changed, 0 insertions, 0 deletions