aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
diff options
context:
space:
mode:
authorMelanie2012-03-22 20:38:49 +0000
committerMelanie2012-03-22 20:38:49 +0000
commit33818994810130117bae62ba2123bf8b55f181ea (patch)
treeeeb54ef00919abbd1a86b08a659570512856ac42 /OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
parentRevert "Stop messing order of updates, destroing the defined order of the sel... (diff)
parentRework Diva's patch to simplify it (diff)
downloadopensim-SC-33818994810130117bae62ba2123bf8b55f181ea.zip
opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.gz
opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.bz2
opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.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 17:03:17 +0000