diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 19:10:43 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 19:10:43 -0800 |
commit | c2ca71322bf48653d466cba40bbe01c3401318c7 (patch) | |
tree | ecb9834f475c55dcf78c06aed115db69276068ef /indra/newview/llmorphview.cpp | |
parent | a0de48f0ccf7ab8181651646036a13f712641b54 (diff) | |
parent | 433eb89473e9aaa3864299b7ba50a320f14bba38 (diff) |
automated merge
Don't wanna fix all windows EOL issue here
warn-on-failure:unix-eol
Diffstat (limited to 'indra/newview/llmorphview.cpp')
-rw-r--r-- | indra/newview/llmorphview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp index f562e45770..b95e8bd3a2 100644 --- a/indra/newview/llmorphview.cpp +++ b/indra/newview/llmorphview.cpp @@ -40,7 +40,7 @@ #include "lldrawable.h" #include "lldrawpoolavatar.h" #include "llface.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llfloatercustomize.h" #include "llfloatertools.h" #include "llresmgr.h" @@ -143,7 +143,7 @@ void LLMorphView::setVisible(BOOL visible) initialize(); // First run dialog - LLFirstUse::useAppearance(); + //LLFirstUse::useAppearance(); } else { |