Merge branch 'master' into varregion

This commit is contained in:
Robert Adams
2013-11-15 14:56:13 -08:00
34 changed files with 171 additions and 100 deletions

View File

@@ -461,7 +461,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
string result = instr;
if (result == null || result.Length == 0)
if (string.IsNullOrEmpty(result))
return result;
// Repeatedly scan the string until all possible