ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source
This commit is contained in:
Melanie
2013-02-07 21:26:55 +00:00
parent bb210aa2c0 bbda7b94b3
commit 8b78b9429d
9 changed files with 222 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -4678,7 +4678,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UUID av = new UUID();
if (!UUID.TryParse(agent,out av))
{
//LSLError("First parameter to llDialog needs to be a key");
return;
}
@@ -7175,20 +7174,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
if (buttons.Length > 12)
{
LSLError("No more than 12 buttons can be shown");
return;
ShoutError("button list too long, must be 12 or fewer entries");
}
string[] buts = new string[buttons.Length];
for (int i = 0; i < buttons.Length; i++)
int length = buttons.Length;
if (length > 12)
length = 12;
string[] buts = new string[length];
for (int i = 0; i < length; i++)
{
if (buttons.Data[i].ToString() == String.Empty)
{
LSLError("button label cannot be blank");
ShoutError("button label cannot be blank");
return;
}
if (buttons.Data[i].ToString().Length > 24)
{
llWhisper(ScriptBaseClass.DEBUG_CHANNEL, "button label cannot be longer than 24 characters");
ShoutError("button label cannot be longer than 24 characters");
return;
}
buts[i] = buttons.Data[i].ToString();