aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2019-04-18 14:01:54 +0100
committerUbitUmarov2019-04-18 14:01:54 +0100
commitbd442208d84e3412385ecb3421344e871206e0a4 (patch)
treefe902795b9e52cb63c23183a9701b229db598e15 /OpenSim
parent mantis 8517: let texture argument of PRIM_TEXTURE only change the other par... (diff)
downloadopensim-SC-bd442208d84e3412385ecb3421344e871206e0a4.zip
opensim-SC-bd442208d84e3412385ecb3421344e871206e0a4.tar.gz
opensim-SC-bd442208d84e3412385ecb3421344e871206e0a4.tar.bz2
opensim-SC-bd442208d84e3412385ecb3421344e871206e0a4.tar.xz
mantis 8517: actually let NULL_KEY do the same as on PRIM_TEXTURE
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index cbd2b3c..5c6b7b2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2411,7 +2411,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2411 2411
2412 UUID textureID = new UUID(); 2412 UUID textureID = new UUID();
2413 bool dotexture = true; 2413 bool dotexture = true;
2414 if(String.IsNullOrEmpty(texture)) 2414 if(String.IsNullOrEmpty(texture) || texture == ScriptBaseClass.NULL_KEY)
2415 dotexture = false; 2415 dotexture = false;
2416 else 2416 else
2417 { 2417 {