svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated

1 files changed, 15 insertions, 2 deletions

diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index aec4bb2ab7..ca1c527cb2 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -118,13 +118,14 @@ public:
 	void selectFirstError();
 
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
+	
+	void enableSave(BOOL b) {mEnableSave = b;}
 
 protected:
 	void deleteBridges();
 	void setHelpPage(const std::string& help_string);
 	void updateDynamicHelp(BOOL immediate = FALSE);
 	void addHelpItemToHistory(const std::string& help_string);
-
 	static void onErrorList(LLUICtrl*, void* user_data);
 
  	virtual const char *getTitleName() const { return "Script"; }
@@ -147,6 +148,7 @@ private:
 	LLKeywordToken* mLastHelpToken;
 	LLFrameTimer	mLiveHelpTimer;
 	S32				mLiveHelpHistorySize;
+	BOOL			mEnableSave;
 };
 
 
@@ -184,8 +186,9 @@ protected:
 							   void* user_data, S32 status, LLExtStat ext_status);
 	static void onSaveComplete(const LLUUID& uuid, void* user_data, S32 status, LLExtStat ext_status);
 	static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
+public:
 	static LLPreviewLSL* getInstance(const LLUUID& uuid);
-
+protected:
 	static void* createScriptEdPanel(void* userdata);
 
 
@@ -195,6 +198,7 @@ protected:
 	LLScriptEdCore* mScriptEd;
 	// Can safely close only after both text and bytecode are uploaded
 	S32 mPendingUploads;
+
 };
 
 
@@ -277,6 +281,15 @@ protected:
 	S32 mPendingUploads;
 
 	static LLMap<LLUUID, LLLiveLSLEditor*> sInstances;
+	BOOL getIsModifiable() const { return mIsModifiable; } // Evaluated on load assert
+	
+private:
+
+	static void	onMonoCheckboxClicked(LLUICtrl*, void* userdata);
+	BOOL monoChecked() const;
+
+	LLCheckBoxCtrl*	mMonoCheckbox;
+	BOOL mIsModifiable;
 };
 
 #endif  // LL_LLPREVIEWSCRIPT_H