diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
| commit | 53ce47fc1c2a713c6d7dd7fd9f98e50de727b974 (patch) | |
| tree | fcc220f37f0de56d63c5f501e7c577463106eb69 /indra/newview/llstartup.cpp | |
| parent | f36cf6f1bad7e239011ab3ad40dca8002f42083c (diff) | |
| parent | 395a29717026221255d8bed57098afa52c49bff9 (diff) | |
merge changes for STORM-1654
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 1795be91b9..e03ad2db94 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -131,7 +131,6 @@ #include "llsecondlifeurls.h" #include "llselectmgr.h" #include "llsky.h" -#include "llsidetray.h" #include "llstatview.h" #include "llstatusbar.h" // sendMoneyBalanceRequest(), owns L$ balance #include "llsurface.h" |