aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie2011-10-12 00:10:30 +0100
committerMelanie2011-10-12 00:10:30 +0100
commite4f3ba8610dc7648cb9d789fbaa35276b92fb975 (patch)
treedd973171f9999c769ac823d27a457c24f411f226 /OpenSim/Data
parentMerge commit 'bfa405e6f70ee31510a20f708327c1c254398926' into bigmerge (diff)
parentRemoved all refs to IClientAPI from IAttachmentsModule. Separated client hand... (diff)
downloadopensim-SC-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.zip
opensim-SC-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.gz
opensim-SC-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.bz2
opensim-SC-e4f3ba8610dc7648cb9d789fbaa35276b92fb975.tar.xz
Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Data')
0 files changed, 0 insertions, 0 deletions