aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTalun2013-09-10 10:56:34 +0100
committerJustin Clark-Casey (justincc)2013-09-20 21:38:49 +0100
commit726b7dce61a0279f8c47fcf882ad1ee1987e5d43 (patch)
tree6954f69491a54a6944af4c188563d3b1fa931725
parentBulletSim: update DLLs and SOs to disable Bullet's internal profiling. (diff)
downloadopensim-SC_OLD-726b7dce61a0279f8c47fcf882ad1ee1987e5d43.zip
opensim-SC_OLD-726b7dce61a0279f8c47fcf882ad1ee1987e5d43.tar.gz
opensim-SC_OLD-726b7dce61a0279f8c47fcf882ad1ee1987e5d43.tar.bz2
opensim-SC_OLD-726b7dce61a0279f8c47fcf882ad1ee1987e5d43.tar.xz
6762: llList2Key fails to convert a string in a list to a key
llGetPrimitiveParams changed to return the sculpty key as an LSL_String so that type checking in llList2Key will work
-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 34e2b4d..924f4d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8483,7 +8483,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8483 break; 8483 break;
8484 8484
8485 case ScriptBaseClass.PRIM_TYPE_SCULPT: 8485 case ScriptBaseClass.PRIM_TYPE_SCULPT:
8486 res.Add(Shape.SculptTexture.ToString()); 8486 res.Add(new LSL_String(Shape.SculptTexture.ToString()));
8487 res.Add(new LSL_Integer(Shape.SculptType)); 8487 res.Add(new LSL_Integer(Shape.SculptType));
8488 break; 8488 break;
8489 8489