aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
diff options
context:
space:
mode:
authorMelanie2013-03-05 23:57:53 +0000
committerMelanie2013-03-05 23:57:53 +0000
commit81552f41c601017f43061d923eba393b9f85a7b3 (patch)
tree5d6c3aba0f72941c06b47eaae6f4cd0301b60b23 /OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
parentMerge branch 'avination' into careminster (diff)
parentminor: Fix mono compiler warning in MonitorModule (diff)
downloadopensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.zip
opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.tar.gz
opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.tar.bz2
opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-22 01:27:10 +0000