aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
diff options
context:
space:
mode:
authorMelanie2012-05-31 03:37:43 +0100
committerMelanie2012-05-31 03:37:43 +0100
commite696d1d95225e3ddf90c823a2309dd8760af935b (patch)
tree8a72f0f86f2e6fd6e2e5d779993699b66f2c8ef9 /OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
parentMerge branch 'master' into careminster (diff)
parentubitode prim: if makebody() is called already having a body, do a full destru... (diff)
downloadopensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.zip
opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.gz
opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.bz2
opensim-SC-e696d1d95225e3ddf90c823a2309dd8760af935b.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-25 03:27:25 +0000