aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2015-10-02 18:39:05 +0100
committerUbitUmarov2015-10-02 18:39:05 +0100
commitb8cb9d1bbbb127abe90141376d4c78eed5973c96 (patch)
treea97027a9a5edd548e33d9dfdcf9e487d908623ae /OpenSim/Region
parent do group SetPos sync as master, script thread does need to wait for it to be... (diff)
downloadopensim-SC-b8cb9d1bbbb127abe90141376d4c78eed5973c96.zip
opensim-SC-b8cb9d1bbbb127abe90141376d4c78eed5973c96.tar.gz
opensim-SC-b8cb9d1bbbb127abe90141376d4c78eed5973c96.tar.bz2
opensim-SC-b8cb9d1bbbb127abe90141376d4c78eed5973c96.tar.xz
also on another location, plus a bit clean
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs17
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 694f8a1..0649a6a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7909,19 +7909,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7909 Error("llDialog", "First parameter must be a key"); 7909 Error("llDialog", "First parameter must be a key");
7910 return; 7910 return;
7911 } 7911 }
7912 if (buttons.Length < 1) 7912
7913 int length = buttons.Length;
7914 if (length < 1)
7913 { 7915 {
7914 Error("llDialog", "At least 1 button must be shown"); 7916 Error("llDialog", "At least 1 button must be shown");
7915 return; 7917 return;
7916 } 7918 }
7917 if (buttons.Length > 12) 7919 if (length > 12)
7918 { 7920 {
7919 Error("llDialog", "No more than 12 buttons can be shown"); 7921 Error("llDialog", "No more than 12 buttons can be shown");
7920 return; 7922 return;
7921 } 7923 }
7922 int length = buttons.Length;
7923 if (length > 12)
7924 length = 12;
7925 7924
7926 string[] buts = new string[length]; 7925 string[] buts = new string[length];
7927 for (int i = 0; i < length; i++) 7926 for (int i = 0; i < length; i++)
@@ -9924,9 +9923,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9924 if (part.ParentGroup.RootPart == part) 9923 if (part.ParentGroup.RootPart == part)
9925 { 9924 {
9926 SceneObjectGroup parent = part.ParentGroup; 9925 SceneObjectGroup parent = part.ParentGroup;
9927 Util.FireAndForget(delegate(object x) { 9926// Util.FireAndForget(delegate(object x) {
9928 parent.UpdateGroupPosition(currentPosition); 9927 parent.UpdateGroupPosition(currentPosition);
9929 }); 9928// });
9930 } 9929 }
9931 else 9930 else
9932 { 9931 {
@@ -14388,6 +14387,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14388 return list; 14387 return list;
14389 } 14388 }
14390 14389
14390
14391 // this is wrong, except on a few trivial cases
14392 // keeping it for now just for raycast v3
14393
14391 /// <summary> 14394 /// <summary>
14392 /// Helper to calculate bounding box of an avatar. 14395 /// Helper to calculate bounding box of an avatar.
14393 /// </summary> 14396 /// </summary>