diff options
| author | Erica <erica@lindenlab.com> | 2009-12-11 13:17:19 -0800 |
|---|---|---|
| committer | Erica <erica@lindenlab.com> | 2009-12-11 13:17:19 -0800 |
| commit | 9c0d3e4e8626eeeec7fa55f41efad26bdd36db2b (patch) | |
| tree | c8bb688a466659452c7e2f0162f547a5419dce40 /indra/newview/llnamebox.cpp | |
| parent | 1f3a55470919bf451f9c45b454d9bbf815a3e88a (diff) | |
| parent | 5b1c92ebb04a6d4d70a89a81e6f5c0af77733d51 (diff) | |
resolving sidepanel conflict
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llnamebox.cpp')
0 files changed, 0 insertions, 0 deletions