Merge branch 'master' into DRTVWR-544-maint

# Conflicts:
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/llviewerregion.cpp

1 files changed, 8 insertions, 5 deletions

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 5d57a7e75a..979503bb67 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1564,11 +1564,14 @@ void LLTextBase::reflow()
 		{
 			// find first element whose end comes after start_index
 			line_list_t::iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), start_index, line_end_compare());
-			line_start_index = iter->mDocIndexStart;
-			line_count = iter->mLineNum;
-			cur_top = iter->mRect.mTop;
-			getSegmentAndOffset(iter->mDocIndexStart, &seg_iter, &seg_offset);
-			mLineInfoList.erase(iter, mLineInfoList.end());
+            if (iter != mLineInfoList.end())
+            {
+                line_start_index = iter->mDocIndexStart;
+                line_count = iter->mLineNum;
+                cur_top = iter->mRect.mTop;
+                getSegmentAndOffset(iter->mDocIndexStart, &seg_iter, &seg_offset);
+                mLineInfoList.erase(iter, mLineInfoList.end());
+            }
 		}
 
 		S32 line_height = 0;