aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-11-22 15:16:28 +0100
committerMelanie2010-11-22 15:16:28 +0100
commit506192e4663456d1d35976cc854e2a675660463a (patch)
tree653a3a048ffb1b68c50a89e3f42f9b1f41d95f64 /OpenSim
parentFox case on a method (diff)
downloadopensim-SC-506192e4663456d1d35976cc854e2a675660463a.zip
opensim-SC-506192e4663456d1d35976cc854e2a675660463a.tar.gz
opensim-SC-506192e4663456d1d35976cc854e2a675660463a.tar.bz2
opensim-SC-506192e4663456d1d35976cc854e2a675660463a.tar.xz
Make an invalud key string in llTextBox and llDialog non fatal to avoid
breakinf sloppily made no-mod scripted items.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index dee0d9a..1ba28dc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4469,7 +4469,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4469 UUID av = new UUID(); 4469 UUID av = new UUID();
4470 if (!UUID.TryParse(agent,out av)) 4470 if (!UUID.TryParse(agent,out av))
4471 { 4471 {
4472 LSLError("First parameter to llDialog needs to be a key"); 4472 //LSLError("First parameter to llDialog needs to be a key");
4473 return; 4473 return;
4474 } 4474 }
4475 4475
@@ -6731,7 +6731,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6731 UUID av = new UUID(); 6731 UUID av = new UUID();
6732 if (!UUID.TryParse(avatar,out av)) 6732 if (!UUID.TryParse(avatar,out av))
6733 { 6733 {
6734 LSLError("First parameter to llDialog needs to be a key"); 6734 //LSLError("First parameter to llDialog needs to be a key");
6735 return; 6735 return;
6736 } 6736 }
6737 if (buttons.Length < 1) 6737 if (buttons.Length < 1)