diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-01-15 13:27:25 -0800 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-01-15 13:27:25 -0800 |
commit | 7590704e0e93b48f897c47dba07916efebd95274 (patch) | |
tree | e38f863dc5a72bc078d362a9fee214e018d0ca05 /indra/newview/llagent.cpp | |
parent | 940e070326e920b6314c7153f687d9985ad763ed (diff) | |
parent | 7efc0fbb4fd912d59a38a4d5653f1dc12c3876b1 (diff) |
Merge with Tip
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 5ea253709c..297bcfd1df 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" @@ -5697,10 +5697,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 { |