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/Capabilities | |
| 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/Capabilities')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index 57b4667..f3efb53 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | |||
| @@ -85,7 +85,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 85 | // m_log.DebugFormat("[GETTEXTURE]: Received request for texture id {0}", textureID); | 85 | // m_log.DebugFormat("[GETTEXTURE]: Received request for texture id {0}", textureID); |
| 86 | 86 | ||
| 87 | string[] formats; | 87 | string[] formats; |
| 88 | if (format != null && format != string.Empty) | 88 | if (!string.IsNullOrEmpty(format)) |
| 89 | { | 89 | { |
| 90 | formats = new string[1] { format.ToLower() }; | 90 | formats = new string[1] { format.ToLower() }; |
| 91 | } | 91 | } |