diff options
| author | Richard Linden <none@none> | 2010-09-16 22:10:30 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-16 22:10:30 -0700 |
| commit | 83bb4b9518da813a42e49366cea15e5ae9dc7507 (patch) | |
| tree | 395372dc049dc2ea06dcd977a8b71befbda37fe0 /indra/newview/llviewermessage.cpp | |
| parent | 1911993cc7761216c70b95e77b49da383c9e162d (diff) | |
fixed merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 48d11e1f05..317d08cc52 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -49,6 +49,7 @@ #include "llagent.h" #include "llagentcamera.h" #include "llcallingcard.h" +#include "llchannelmanager.h" #include "llbuycurrencyhtml.h" #include "llfirstuse.h" #include "llfloaterbuyland.h" @@ -76,11 +77,13 @@ #include "llstatenums.h" #include "llstatusbar.h" #include "llimview.h" +#include "llscreenchannel.h" #include "llspeakers.h" #include "lltrans.h" #include "lltranslate.h" #include "llviewerfoldertype.h" #include "lluri.h" +#include "llviewercontrol.h" #include "llviewergenericmessage.h" #include "llviewermenu.h" #include "llviewerjoystick.h" |