aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/LLSDTaskInventoryUploadComplete.cs
diff options
context:
space:
mode:
authorMelanie2012-11-04 22:37:28 +0000
committerMelanie2012-11-04 22:37:28 +0000
commitdd416298f1da71b801c789367a4408f5c2728df1 (patch)
tree9aa8ed8419dd536fe2f326755ad3468289818ffc /OpenSim/Capabilities/LLSDTaskInventoryUploadComplete.cs
parentMerge branch 'master' into careminster (diff)
parentAdd a method to query all registered script constants to allow non-XEngine (diff)
downloadopensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.zip
opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.tar.gz
opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.tar.bz2
opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Capabilities/LLSDTaskInventoryUploadComplete.cs')
0 files changed, 0 insertions, 0 deletions