diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:25:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:25:04 +0000 |
| commit | d2597d35cf3aeaf0c47a134dfe9119ef7932b98a (patch) | |
| tree | 73c9e027e31810a582dfaeeaae6c51ef7208d6d1 /indra/newview/llviewermessage.cpp | |
| parent | c57beb8b4bd51add9a92ddc4d704e7bea9c4d940 (diff) | |
Undid previous commit (bogus merge)
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 99f1af61e5..439063e439 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -36,6 +36,7 @@ #include <deque> #include "audioengine.h" +#include "audiosettings.h" #include "indra_constants.h" #include "lscript_byteformat.h" #include "mean_collision_data.h" @@ -67,7 +68,6 @@ #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->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, FALSE); + gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, FALSE); } const std::string ALERT_PREFIX("ALERT: "); |