aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ParcelMediaCommandEnum.cs
diff options
context:
space:
mode:
authorMelanie2010-10-09 01:07:41 +0100
committerMelanie2010-10-09 01:07:41 +0100
commit231feab57ff1e6d92388b75645382c865e65dea2 (patch)
tree014c2218919051fdbb995c844ebb322145e1c36b /OpenSim/Framework/ParcelMediaCommandEnum.cs
parentFix a security relevant issue with take / take copy (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.zip
opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.tar.gz
opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.tar.bz2
opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
Diffstat (limited to 'OpenSim/Framework/ParcelMediaCommandEnum.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-11-14 01:03:02 +0000