Merge pull request #1723 from secondlife/brad/maint-a-merge-to-gltf-dev

maint a merge to gltf dev

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 6205b44375..4f90db17c0 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -470,7 +470,7 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
     // to eat trailing spaces that might be part of a gesture.
     LLWStringUtil::trimHead(raw_text);
 
-    S32 length = raw_text.length();
+    auto length = raw_text.length();
 
     if( (length > 0) && (raw_text[0] != '/') )  // forward slash is used for escape (eg. emote) sequences
     {
@@ -518,7 +518,7 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
 
                 // Select to end of line, starting from the character
                 // after the last one the user typed.
-                self->mInputEditor->setSelection(length, outlength);
+                self->mInputEditor->setSelection(static_cast<S32>(length), outlength);
             }
         }