aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2009-12-30 00:36:16 +0000
committerMelanie2009-12-30 00:36:16 +0000
commit6a4c578e5eba688516af2b0123869bb43e663eda (patch)
treedfee01f6d3fb910edba09adf05f98205e513d41f /OpenSim/Region
parentFixed a couple of bugs that were bombing the data migration. (diff)
downloadopensim-SC_OLD-6a4c578e5eba688516af2b0123869bb43e663eda.zip
opensim-SC_OLD-6a4c578e5eba688516af2b0123869bb43e663eda.tar.gz
opensim-SC_OLD-6a4c578e5eba688516af2b0123869bb43e663eda.tar.bz2
opensim-SC_OLD-6a4c578e5eba688516af2b0123869bb43e663eda.tar.xz
Fix an omission in LSL that causes a viewer crash
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2b6d9bd..6102504 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6260,6 +6260,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6260 LSLError("First parameter to llDialog needs to be a key"); 6260 LSLError("First parameter to llDialog needs to be a key");
6261 return; 6261 return;
6262 } 6262 }
6263 if (buttons.Length < 1)
6264 {
6265 LSLError("No less than 1 button can be shown");
6266 return;
6267 }
6263 if (buttons.Length > 12) 6268 if (buttons.Length > 12)
6264 { 6269 {
6265 LSLError("No more than 12 buttons can be shown"); 6270 LSLError("No more than 12 buttons can be shown");