diff options
author | Melanie | 2010-11-24 18:56:25 +0100 |
---|---|---|
committer | Melanie | 2010-11-24 18:56:25 +0100 |
commit | b3a71c6df1538c61247f7d4711aba4c840508db8 (patch) | |
tree | 2089c5b109ec504b16feea0ea44911f7d77fd849 /OpenSim/Region/ScriptEngine | |
parent | Prevent a dump in the llGetLinkKey method when using LINK_ROOT in a single prim (diff) | |
download | opensim-SC_OLD-b3a71c6df1538c61247f7d4711aba4c840508db8.zip opensim-SC_OLD-b3a71c6df1538c61247f7d4711aba4c840508db8.tar.gz opensim-SC_OLD-b3a71c6df1538c61247f7d4711aba4c840508db8.tar.bz2 opensim-SC_OLD-b3a71c6df1538c61247f7d4711aba4c840508db8.tar.xz |
Prevent an overlength button label from producing a debug dump and aborting
the script.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ec4d815..1dd4ca4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6756,7 +6756,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6756 | } | 6756 | } |
6757 | if (buttons.Data[i].ToString().Length > 24) | 6757 | if (buttons.Data[i].ToString().Length > 24) |
6758 | { | 6758 | { |
6759 | LSLError("button label cannot be longer than 24 characters"); | 6759 | llWhisper(ScriptBaseClass.DEBUG_CHANNEL, "button label cannot be longer than 24 characters"); |
6760 | return; | 6760 | return; |
6761 | } | 6761 | } |
6762 | buts[i] = buttons.Data[i].ToString(); | 6762 | buts[i] = buttons.Data[i].ToString(); |
@@ -7319,7 +7319,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7319 | LSL_Vector v; | 7319 | LSL_Vector v; |
7320 | v = rules.GetVector3Item(idx++); | 7320 | v = rules.GetVector3Item(idx++); |
7321 | av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z); | 7321 | av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z); |
7322 | av.SendFullUpdateToAllClients(); | 7322 | av.SendAvatarDataToAllAgents(); |
7323 | 7323 | ||
7324 | break; | 7324 | break; |
7325 | 7325 | ||
@@ -7329,7 +7329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7329 | LSL_Rotation r; | 7329 | LSL_Rotation r; |
7330 | r = rules.GetQuaternionItem(idx++); | 7330 | r = rules.GetQuaternionItem(idx++); |
7331 | av.OffsetRotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); | 7331 | av.OffsetRotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s); |
7332 | av.SendFullUpdateToAllClients(); | 7332 | av.SendAvatarDataToAllAgents(); |
7333 | break; | 7333 | break; |
7334 | } | 7334 | } |
7335 | } | 7335 | } |