aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
diff options
context:
space:
mode:
authorMelanie2012-11-23 03:39:49 +0000
committerMelanie2012-11-23 03:39:49 +0000
commitae8733bf5943e42f019007ebad951360747d4fc1 (patch)
tree09b9cb539fc7a3a05067f47628adac7331e8cf28 /OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
parentAdd a newline before the constant help text (diff)
parentRemove the redundant BypassPermissions() checks in EstateManagmentModule. (diff)
downloadopensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.zip
opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.tar.gz
opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.tar.bz2
opensim-SC-ae8733bf5943e42f019007ebad951360747d4fc1.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.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:52:13 +0000