summaryrefslogtreecommitdiff
path: root/indra/newview/llhudtext.cpp
diff options
context:
space:
mode:
authorEric Tulla <tulla@lindenlab.com>2009-09-29 23:09:41 +0000
committerEric Tulla <tulla@lindenlab.com>2009-09-29 23:09:41 +0000
commit6d887be5895286f6b65ea751014f33bd9e0faac4 (patch)
treec5e0a88ccc2666fd5720a84cd2bd505865886b31 /indra/newview/llhudtext.cpp
parent7dbf4d526a0dcb753ab17feaf7bee012aeb7229c (diff)
Syncing latest appearance work from avatar pipeline into viewer2.0.
Result of: (NO CONFLICTS) svn merge -r 134301:134742 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-9 .
Diffstat (limited to 'indra/newview/llhudtext.cpp')
0 files changed, 0 insertions, 0 deletions