aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Properties
diff options
context:
space:
mode:
authorMelanie2013-03-08 01:07:05 +0000
committerMelanie2013-03-08 01:07:05 +0000
commit70f0587558a30d61b311af8de6aa8baeb7a498f8 (patch)
tree9a9b09125f0b6cdd54ac1874fda2b39851d465a0 /OpenSim/Region/OptionalModules/Properties
parent* Separate two if trees that got merged into one if tree with borked logic. (diff)
parent* Just another one of those new packet blocks causing a null ref. Defaultin... (diff)
downloadopensim-SC-70f0587558a30d61b311af8de6aa8baeb7a498f8.zip
opensim-SC-70f0587558a30d61b311af8de6aa8baeb7a498f8.tar.gz
opensim-SC-70f0587558a30d61b311af8de6aa8baeb7a498f8.tar.bz2
opensim-SC-70f0587558a30d61b311af8de6aa8baeb7a498f8.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Properties')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-11-18 01:25:38 +0000