diff options
| author | Melanie | 2013-11-23 19:13:22 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-23 19:13:22 +0000 |
| commit | 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch) | |
| tree | a833014a1fedd774e7a9a01cd89a7edddb4210ba /OpenSim/Framework/WebUtil.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 | |
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
Diffstat (limited to 'OpenSim/Framework/WebUtil.cs')
| -rw-r--r-- | OpenSim/Framework/WebUtil.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 9fa93ea..33ef8e0 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
| @@ -721,7 +721,7 @@ namespace OpenSim.Framework | |||
| 721 | /// <returns></returns> | 721 | /// <returns></returns> |
| 722 | public static string[] GetPreferredImageTypes(string accept) | 722 | public static string[] GetPreferredImageTypes(string accept) |
| 723 | { | 723 | { |
| 724 | if (accept == null || accept == string.Empty) | 724 | if (string.IsNullOrEmpty(accept)) |
| 725 | return new string[0]; | 725 | return new string[0]; |
| 726 | 726 | ||
| 727 | string[] types = accept.Split(new char[] { ',' }); | 727 | string[] types = accept.Split(new char[] { ',' }); |