summaryrefslogtreecommitdiff
path: root/indra/newview/llfriendcard.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-25 10:47:49 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-25 10:47:49 -0400
commit44774cd265306c6d29f0a63c0876c7fa7b84311e (patch)
treebb0568b710fbcef3ac2b8b72522e0cb08967201f /indra/newview/llfriendcard.cpp
parentf7ec54a92f3d87ea87fc3471a29f20d623336646 (diff)
parent5d412387869012c43e9d7d40b5b8414f42353051 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/llfriendcard.cpp')
0 files changed, 0 insertions, 0 deletions