diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2014-12-28 09:34:28 -0500 | 
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2014-12-28 09:34:28 -0500 | 
| commit | 2d7fb5c67580620fd707b4fde3c497886e050dd1 (patch) | |
| tree | cbab45e4cdc1bf826a2104f688e051b826764c4f | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
STORM-2094 Save button not activated if spelling corrected in Notecard and no other changes made
| -rwxr-xr-x | doc/contributions.txt | 2 | ||||
| -rwxr-xr-x | indra/llui/lltextbase.cpp | 1 | ||||
| -rwxr-xr-x | indra/llui/lltextbase.h | 1 | ||||
| -rwxr-xr-x | indra/llui/lltexteditor.cpp | 8 | ||||
| -rwxr-xr-x | indra/llui/lltexteditor.h | 2 | 
5 files changed, 14 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 18acb18911..6087ecec4e 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -185,6 +185,7 @@ Ansariel Hiller  	BUG-3764  	STORM-1984  	STORM-1979 +	STORM-2094  Aralara Rajal  Arare Chantilly  	CHUIBUG-191 @@ -718,6 +719,7 @@ Jonathan Yap  	STORM-2030  	STORM-2034  	STORM-2018 +	STORM-2094  Kadah Coba  	STORM-1060      STORM-1843 diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 9b125a85b9..e51f2a212f 100755 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1316,6 +1316,7 @@ void LLTextBase::replaceWithSuggestion(U32 index)  			setCursorPos(it->first + (S32)suggestion.length()); +			onSpellCheckPerformed();  			break;  		} diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 738b4d5b8e..51fe904b4f 100755 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -362,6 +362,7 @@ public:  	std::string				getMisspelledWord(U32 pos) const;  	bool					isMisspelledWord(U32 pos) const;  	void					onSpellCheckSettingsChange(); +	virtual void			onSpellCheckPerformed(){}  	// used by LLTextSegment layout code  	bool					getWordWrap() { return mWordWrap; } diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index cf5fdef539..227b1f91a9 100755 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -2380,6 +2380,14 @@ void LLTextEditor::removeTextFromEnd(S32 num_chars)  //---------------------------------------------------------------------------- +void LLTextEditor::onSpellCheckPerformed() +{ +	if (isPristine()) +	{ +		mBaseDocIsPristine = FALSE; +	} +} +  void LLTextEditor::makePristine()  {  	mPristineCmd = mLastCmd; diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h index f6bdf917b4..26702b2412 100755 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -160,6 +160,8 @@ public:  	autoreplace_callback_t mAutoreplaceCallback;  	void			setAutoreplaceCallback(autoreplace_callback_t cb) { mAutoreplaceCallback = cb; } +	/*virtual*/ void	onSpellCheckPerformed(); +  	//  	// Text manipulation  	//  | 
