aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
diff options
context:
space:
mode:
authorUbitUmarov2019-10-22 13:04:01 +0100
committerUbitUmarov2019-10-22 13:04:01 +0100
commit46e36601cb3c54e6e441284aed7c0c5c35970a4c (patch)
treebf52486c1e8edaae327d7d93ea3ae6e6fd48a61d /OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
parentremove some more useless NULL arguments (diff)
downloadopensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.zip
opensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.tar.gz
opensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.tar.bz2
opensim-SC-46e36601cb3c54e6e441284aed7c0c5c35970a4c.tar.xz
remove some more useless NULL arguments
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs b/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
index 1f4c65a..cb72f23 100755
--- a/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
@@ -114,20 +114,20 @@ namespace OpenSim.Region.OptionalModules.Agent.TextureSender
114 114
115 if (!UUID.TryParse(rawAssetId, out assetId)) 115 if (!UUID.TryParse(rawAssetId, out assetId))
116 { 116 {
117 MainConsole.Instance.Output("ERROR: {0} is not a valid ID format", null, rawAssetId); 117 MainConsole.Instance.Output("ERROR: {0} is not a valid ID format", rawAssetId);
118 return; 118 return;
119 } 119 }
120 120
121 AssetBase asset = m_scene.AssetService.Get(assetId.ToString()); 121 AssetBase asset = m_scene.AssetService.Get(assetId.ToString());
122 if (asset == null) 122 if (asset == null)
123 { 123 {
124 MainConsole.Instance.Output("ERROR: No asset found with ID {0}", null, assetId); 124 MainConsole.Instance.Output("ERROR: No asset found with ID {0}", assetId);
125 return; 125 return;
126 } 126 }
127 127
128 if (asset.Type != (sbyte)AssetType.Texture) 128 if (asset.Type != (sbyte)AssetType.Texture)
129 { 129 {
130 MainConsole.Instance.Output("ERROR: Asset {0} is not a texture type", null, assetId); 130 MainConsole.Instance.Output("ERROR: Asset {0} is not a texture type", assetId);
131 return; 131 return;
132 } 132 }
133 133
@@ -144,12 +144,11 @@ namespace OpenSim.Region.OptionalModules.Agent.TextureSender
144 { 144 {
145 MainConsole.Instance.Output( 145 MainConsole.Instance.Output(
146 "Successfully decoded asset {0} with {1} layers and {2} components", 146 "Successfully decoded asset {0} with {1} layers and {2} components",
147 null,
148 assetId, layers.Length, components); 147 assetId, layers.Length, components);
149 } 148 }
150 else 149 else
151 { 150 {
152 MainConsole.Instance.Output("Decode of asset {0} failed", null, assetId); 151 MainConsole.Instance.Output("Decode of asset {0} failed", assetId);
153 } 152 }
154 } 153 }
155 } 154 }