Pull merge from lindenlab/viewer-release

1 files changed, 59 insertions, 3 deletions

diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index 9fa40bc6b9..ffddeeb129 100755
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -1337,6 +1337,7 @@ BOOL LLGestureMgr::matchPrefix(const std::string& in_str, std::string* out_str)
 {
 	S32 in_len = in_str.length();
 
+	//return whole trigger, if received text equals to it
 	item_map_t::iterator it;
 	for (it = mActive.begin(); it != mActive.end(); ++it)
 	{
@@ -1344,7 +1345,24 @@ BOOL LLGestureMgr::matchPrefix(const std::string& in_str, std::string* out_str)
 		if (gesture)
 		{
 			const std::string& trigger = gesture->getTrigger();
-			
+			if (!LLStringUtil::compareInsensitive(in_str, trigger))
+			{
+				*out_str = trigger;
+				return TRUE;
+			}
+		}
+	}
+
+	//return common chars, if more than one trigger matches the prefix
+	std::string rest_of_match = "";
+	std::string buf = "";
+	for (it = mActive.begin(); it != mActive.end(); ++it)
+	{
+		LLMultiGesture* gesture = (*it).second;
+		if (gesture)
+		{
+			const std::string& trigger = gesture->getTrigger();
+
 			if (in_len > (S32)trigger.length())
 			{
 				// too short, bail out
@@ -1355,11 +1373,49 @@ BOOL LLGestureMgr::matchPrefix(const std::string& in_str, std::string* out_str)
 			LLStringUtil::truncate(trigger_trunc, in_len);
 			if (!LLStringUtil::compareInsensitive(in_str, trigger_trunc))
 			{
-				*out_str = trigger;
-				return TRUE;
+				if (rest_of_match.compare("") == 0)
+				{
+					rest_of_match = trigger.substr(in_str.size());
+				}
+				std::string cur_rest_of_match = trigger.substr(in_str.size());
+				buf = "";
+				S32 i=0;
+
+				while (i<rest_of_match.length() && i<cur_rest_of_match.length())
+				{
+					if (rest_of_match[i]==cur_rest_of_match[i])
+				    {
+						buf.push_back(rest_of_match[i]);
+				    }
+				    else
+				    {
+				    	if(i==0)
+				    	{
+				    		rest_of_match = "";
+				    	}
+				    	break;
+				    }
+					i++;
+				}
+				if (rest_of_match.compare("") == 0)
+				{
+					return FALSE;
+				}
+				if (buf.compare("") != 0)
+				{
+					rest_of_match = buf;
+				}
+
 			}
 		}
 	}
+
+	if (rest_of_match.compare("") != 0)
+	{
+		*out_str = in_str+rest_of_match;
+		return TRUE;
+	}
+
 	return FALSE;
 }