diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
| commit | e1c1428569b03bbb20e7597ebec7d707151ce802 (patch) | |
| tree | 69ca6d0fd05300346ddc14664b6d44bd4206a8b4 /indra/viewer_components/login/lllogin.cpp | |
| parent | f356d7eb9fd730f5f6f5a29fb0706e20876ad3bd (diff) | |
| parent | ab4104d2d785199722f93d027e72af40d16f5703 (diff) | |
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
Diffstat (limited to 'indra/viewer_components/login/lllogin.cpp')
| -rwxr-xr-x | indra/viewer_components/login/lllogin.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp index bdcb068200..3357ad812d 100755 --- a/indra/viewer_components/login/lllogin.cpp +++ b/indra/viewer_components/login/lllogin.cpp @@ -23,7 +23,6 @@ * $/LicenseInfo$ */ -#include <boost/coroutine/coroutine.hpp> #include "linden_common.h" #include "llsd.h" #include "llsdutil.h" |