aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-03 22:39:04 +0100
committerJustin Clark-Casey (justincc)2012-05-03 22:39:04 +0100
commitc221eaf0b0bc7a813d73d0070ca72552dd27f109 (patch)
tree1451793f38c48254ce9224ceb34fdce8abb3b9c5 /OpenSim
parentReinsert a 2000ms delay before closing a no longer required agent on the sour... (diff)
parentFixes Mantis #5999. llSetLinkPrimitiveParams with PRIM_BUMP_SHINY did cause a... (diff)
downloadopensim-SC_OLD-c221eaf0b0bc7a813d73d0070ca72552dd27f109.zip
opensim-SC_OLD-c221eaf0b0bc7a813d73d0070ca72552dd27f109.tar.gz
opensim-SC_OLD-c221eaf0b0bc7a813d73d0070ca72552dd27f109.tar.bz2
opensim-SC_OLD-c221eaf0b0bc7a813d73d0070ca72552dd27f109.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 62b5c0f..704dfc3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7336,7 +7336,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7336 return; 7336 return;
7337 face = (int)rules.GetLSLIntegerItem(idx++); 7337 face = (int)rules.GetLSLIntegerItem(idx++);
7338 int shiny = (int)rules.GetLSLIntegerItem(idx++); 7338 int shiny = (int)rules.GetLSLIntegerItem(idx++);
7339 Bumpiness bump = (Bumpiness)Convert.ToByte((int)rules.GetLSLIntegerItem(idx++)); 7339 Bumpiness bump = (Bumpiness)(int)rules.GetLSLIntegerItem(idx++);
7340 7340
7341 SetShiny(part, face, shiny, bump); 7341 SetShiny(part, face, shiny, bump);
7342 7342