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/llagent.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/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index c05103cdb7..9340e305da 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -43,7 +43,7 @@ #include "llcallingcard.h" #include "llchannelmanager.h" #include "llconsole.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llfloatercamera.h" #include "llfloatercustomize.h" #include "llfloaterreg.h" @@ -5695,10 +5695,10 @@ void LLAgent::processScriptControlChange(LLMessageSystem *msg, void **) } // Any control taken? If so, might be first time. - if (total_count > 0) - { - LLFirstUse::useOverrideKeys(); - } + //if (total_count > 0) + //{ + //LLFirstUse::useOverrideKeys(); + //} } else { |