summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.cpp
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-11-04 17:04:17 -0800
committerPalmer <palmer@lindenlab.com>2009-11-04 17:04:17 -0800
commitd5cceb9d2f05ba4e19da3cc50ef273aa4dffc453 (patch)
treede0a6cf70ec27964f2b08040c9f217114bd49fa4 /indra/newview/llpreviewscript.cpp
parentc4817c4e5856577ff56f34ba48e12cef5ee7ab6d (diff)
parent71dc13aac99458989776e93c38294f507074fce4 (diff)
Almost automated merge
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
-rw-r--r--indra/newview/llpreviewscript.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index ac7abf1448..2382befcfa 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -89,7 +89,6 @@
#include "lltrans.h"
#include "llviewercontrol.h"
#include "llappviewer.h"
-#include "llpanelinventory.h"
const std::string HELLO_LSL =
"default\n"
@@ -452,7 +451,7 @@ bool LLScriptEdCore::hasChanged()
{
if (!mEditor) return false;
- return !mEditor->isPristine();
+ return ((!mEditor->isPristine() || mEnableSave) && mHasScriptData);
}
void LLScriptEdCore::draw()