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/lltoolbar.cpp | |
parent | 940e070326e920b6314c7153f687d9985ad763ed (diff) | |
parent | 7efc0fbb4fd912d59a38a4d5653f1dc12c3876b1 (diff) |
Merge with Tip
Diffstat (limited to 'indra/newview/lltoolbar.cpp')
-rw-r--r-- | indra/newview/lltoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp index bf6d715c31..224c5b64bc 100644 --- a/indra/newview/lltoolbar.cpp +++ b/indra/newview/lltoolbar.cpp @@ -60,7 +60,7 @@ #include "lltoolmgr.h" #include "llui.h" #include "llviewermenu.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llpanelblockedlist.h" #include "llscrolllistctrl.h" #include "llscrolllistitem.h" |