diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:42:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:42:27 +0000 |
| commit | d85247e63e5ff0b488211b62429a4895b48dee27 (patch) | |
| tree | 0aa2f02aeef6a8133e0d037e95ad5089b20df9eb /indra/newview/llviewermessage.cpp | |
| parent | d2597d35cf3aeaf0c47a134dfe9119ef7932b98a (diff) | |
QAR-449 Viewer 1.20 RC 0
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 439063e439..99f1af61e5 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -36,7 +36,6 @@ #include <deque> #include "audioengine.h" -#include "audiosettings.h" #include "indra_constants.h" #include "lscript_byteformat.h" #include "mean_collision_data.h" @@ -68,6 +67,7 @@ #include "llagent.h" #include "llcallingcard.h" #include "llconsole.h" +#include "llvieweraudio.h" #include "llviewercontrol.h" #include "lldrawpool.h" #include "llfirstuse.h" @@ -4069,7 +4069,7 @@ void process_alert_core(const std::string& message, BOOL modal) LLString snap_filename = gDirUtilp->getLindenUserDir(); snap_filename += gDirUtilp->getDirDelimiter(); snap_filename += SCREEN_HOME_FILENAME; - gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, FALSE); + gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, FALSE); } const std::string ALERT_PREFIX("ALERT: "); |