summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-07-24 00:46:26 +0000
committerLoren Shih <seraph@lindenlab.com>2009-07-24 00:46:26 +0000
commit17b9cda4325a035f00e077a6a8e33a8c4f2d5a89 (patch)
tree61cf3566c5162237104dfeec8c9332aa34883aa3 /indra/newview/lltoolpie.cpp
parent858f7846715f5182ed9b5e8da7f98ae972297b10 (diff)
For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"
svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
0 files changed, 0 insertions, 0 deletions