From 050dad0ce35207a4ac1562175e853590ad9b7681 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 7 Nov 2007 22:55:27 +0000 Subject: merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 --- indra/newview/llpreviewscript.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpreviewscript.cpp') diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 7eac589640..6c377009f2 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -72,7 +72,6 @@ #include "llscrolllistctrl.h" #include "lltextbox.h" #include "llslider.h" -#include "viewer.h" #include "lldir.h" #include "llcombobox.h" //#include "llfloaterchat.h" @@ -83,7 +82,8 @@ #include "llwebbrowserctrl.h" #include "lluictrlfactory.h" -#include "viewer.h" +#include "llviewercontrol.h" +#include "llappviewer.h" #include "llpanelinventory.h" @@ -629,7 +629,7 @@ void LLScriptEdCore::handleSaveChangesDialog( S32 option, void* userdata ) case 2: // "Cancel" default: // If we were quitting, we didn't really mean it. - app_abort_quit(); + LLAppViewer::instance()->abortQuit(); break; } } -- cgit v1.2.3