Merge branch 'master' into careminster

Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
author: Melanie 2013-11-23 19:13:22 +0000
committer: Melanie 2013-11-23 19:13:22 +0000
commit: 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch)
tree: a833014a1fedd774e7a9a01cd89a7edddb4210ba /OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
parent: Merge branch 'master' into careminster (diff)
parent: Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff)
download: opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip
opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz
opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2
opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
index 5a37fad..b5d9fda 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
@@ -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
author	Melanie	2013-11-23 19:13:22 +0000
committer	Melanie	2013-11-23 19:13:22 +0000
commit	3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch)
tree	a833014a1fedd774e7a9a01cd89a7edddb4210ba /OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
parent	Merge branch 'master' into careminster (diff)
parent	Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff)
download	opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs index 5a37fad..b5d9fda 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
@@ -461,7 +461,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
461		461
462	string result = instr;	462	string result = instr;
463		463
464	if (result == null \|\| result.Length == 0)	464	if (string.IsNullOrEmpty(result))
465	return result;	465	return result;
466		466
467	// Repeatedly scan the string until all possible	467	// Repeatedly scan the string until all possible