summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterperms.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-02-04 10:11:17 -0800
committerRick Pasetto <rick@lindenlab.com>2010-02-04 10:11:17 -0800
commitb25972fc2515ebf9699a54922d800c319846e9a1 (patch)
treeaa6f2eabff8a104b1b299c82e8a2f77a57495c9d /indra/newview/llfloaterperms.cpp
parent5d1ccb389f041204c266bdb598c33ab89472a691 (diff)
parent17a00666ba98853e6ba3c019bb4ac8a8ebaac7cd (diff)
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llfloaterperms.cpp')
0 files changed, 0 insertions, 0 deletions