diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 33dd77f..02b4007 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -890,7 +890,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
890 | { | 890 | { |
891 | if (channelID == 0) | 891 | if (channelID == 0) |
892 | { | 892 | { |
893 | LSLError("Cannot use llRegionSay() on channel 0"); | 893 | Error("llRegionSay", "Cannot use on channel 0"); |
894 | return; | 894 | return; |
895 | } | 895 | } |
896 | 896 | ||
@@ -2884,7 +2884,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2884 | 2884 | ||
2885 | if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0) | 2885 | if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_DEBIT) == 0) |
2886 | { | 2886 | { |
2887 | LSLError("No permissions to give money"); | 2887 | Error("llGiveMoney", "No permissions to give money"); |
2888 | return; | 2888 | return; |
2889 | } | 2889 | } |
2890 | 2890 | ||
@@ -2892,7 +2892,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2892 | 2892 | ||
2893 | if (!UUID.TryParse(destination, out toID)) | 2893 | if (!UUID.TryParse(destination, out toID)) |
2894 | { | 2894 | { |
2895 | LSLError("Bad key in llGiveMoney"); | 2895 | Error("llGiveMoney", "Bad key in llGiveMoney"); |
2896 | return; | 2896 | return; |
2897 | } | 2897 | } |
2898 | 2898 | ||
@@ -4391,7 +4391,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4391 | UUID av = new UUID(); | 4391 | UUID av = new UUID(); |
4392 | if (!UUID.TryParse(agent,out av)) | 4392 | if (!UUID.TryParse(agent,out av)) |
4393 | { | 4393 | { |
4394 | LSLError("First parameter to llTextBox needs to be a key"); | 4394 | Error("llTextBox", "First parameter must be a key"); |
4395 | return; | 4395 | return; |
4396 | } | 4396 | } |
4397 | 4397 | ||
@@ -6811,17 +6811,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6811 | UUID av = new UUID(); | 6811 | UUID av = new UUID(); |
6812 | if (!UUID.TryParse(avatar,out av)) | 6812 | if (!UUID.TryParse(avatar,out av)) |
6813 | { | 6813 | { |
6814 | LSLError("First parameter to llDialog needs to be a key"); | 6814 | Error("llDialog", "First parameter must be a key"); |
6815 | return; | 6815 | return; |
6816 | } | 6816 | } |
6817 | if (buttons.Length < 1) | 6817 | if (buttons.Length < 1) |
6818 | { | 6818 | { |
6819 | LSLError("No less than 1 button can be shown"); | 6819 | Error("llDialog", "At least 1 button must be shown"); |
6820 | return; | 6820 | return; |
6821 | } | 6821 | } |
6822 | if (buttons.Length > 12) | 6822 | if (buttons.Length > 12) |
6823 | { | 6823 | { |
6824 | LSLError("No more than 12 buttons can be shown"); | 6824 | Error("llDialog", "No more than 12 buttons can be shown"); |
6825 | return; | 6825 | return; |
6826 | } | 6826 | } |
6827 | string[] buts = new string[buttons.Length]; | 6827 | string[] buts = new string[buttons.Length]; |
@@ -6829,12 +6829,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6829 | { | 6829 | { |
6830 | if (buttons.Data[i].ToString() == String.Empty) | 6830 | if (buttons.Data[i].ToString() == String.Empty) |
6831 | { | 6831 | { |
6832 | LSLError("button label cannot be blank"); | 6832 | Error("llDialog", "Button label cannot be blank"); |
6833 | return; | 6833 | return; |
6834 | } | 6834 | } |
6835 | if (buttons.Data[i].ToString().Length > 24) | 6835 | if (buttons.Data[i].ToString().Length > 24) |
6836 | { | 6836 | { |
6837 | LSLError("button label cannot be longer than 24 characters"); | 6837 | Error("llDialog", "Button label cannot be longer than 24 characters"); |
6838 | return; | 6838 | return; |
6839 | } | 6839 | } |
6840 | buts[i] = buttons.Data[i].ToString(); | 6840 | buts[i] = buttons.Data[i].ToString(); |
@@ -10302,7 +10302,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10302 | 10302 | ||
10303 | if (quick_pay_buttons.Data.Length < 4) | 10303 | if (quick_pay_buttons.Data.Length < 4) |
10304 | { | 10304 | { |
10305 | LSLError("List must have at least 4 elements"); | 10305 | Error("llSetPayPrice", "List must have at least 4 elements"); |
10306 | return; | 10306 | return; |
10307 | } | 10307 | } |
10308 | m_host.ParentGroup.RootPart.PayPrice[0]=price; | 10308 | m_host.ParentGroup.RootPart.PayPrice[0]=price; |
@@ -11292,11 +11292,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11292 | Error(command, text); | 11292 | Error(command, text); |
11293 | } | 11293 | } |
11294 | 11294 | ||
11295 | internal void LSLError(string msg) | ||
11296 | { | ||
11297 | throw new ScriptException("LSL Runtime Error: " + msg); | ||
11298 | } | ||
11299 | |||
11300 | public delegate void AssetRequestCallback(UUID assetID, AssetBase asset); | 11295 | public delegate void AssetRequestCallback(UUID assetID, AssetBase asset); |
11301 | protected void WithNotecard(UUID assetID, AssetRequestCallback cb) | 11296 | protected void WithNotecard(UUID assetID, AssetRequestCallback cb) |
11302 | { | 11297 | { |