aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
diff options
context:
space:
mode:
authorMelanie2013-03-28 02:29:07 +0000
committerMelanie2013-03-28 02:29:07 +0000
commitf548a41fb88bd45deda99a19889960f81a1969c4 (patch)
treef53b612d628f83bbe60040735fd869fa7c8261b6 /OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
parentMerge branch 'master' into careminster (diff)
parentAdd back a log message when we attempt a megaregion auto-reteleport (diff)
downloadopensim-SC-f548a41fb88bd45deda99a19889960f81a1969c4.zip
opensim-SC-f548a41fb88bd45deda99a19889960f81a1969c4.tar.gz
opensim-SC-f548a41fb88bd45deda99a19889960f81a1969c4.tar.bz2
opensim-SC-f548a41fb88bd45deda99a19889960f81a1969c4.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-22 14:08:44 +0000