diff options
| author | James Cook <james@lindenlab.com> | 2008-04-03 18:43:54 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-04-03 18:43:54 +0000 |
| commit | 55c25229b79b1755c989e5996c8e8d118f369721 (patch) | |
| tree | 1fa882bc7e11dc8aec031d5e268131809874168a /indra/newview/llagent.cpp | |
| parent | b3fcfa16ba8b984163c38904e165052a34be6dab (diff) | |
svn merge -r 83778:83944 maint-ui-10-merge
QAR-442
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index a9d4e8a2f6..d00dfef478 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -58,7 +58,6 @@ #include "imageids.h" #include "llbox.h" #include "llbutton.h" -#include "llcameraview.h" #include "llcallingcard.h" #include "llchatbar.h" #include "llconsole.h" @@ -69,6 +68,7 @@ #include "llfloateractivespeakers.h" #include "llfloateravatarinfo.h" #include "llfloaterbuildoptions.h" +#include "llfloatercamera.h" #include "llfloaterchat.h" #include "llfloatercustomize.h" #include "llfloaterdirectory.h" |