diff options
| author | Talun | 2013-09-10 10:56:34 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-09-12 23:23:52 +0100 |
| commit | 07d6a0385fdbb0559a878f0884505459e08e7867 (patch) | |
| tree | dec4aa07cf350f626ae54053df10f540825f8bb1 | |
| parent | BulletSim: update DLLs and SOs to disable Bullet's internal profiling. (diff) | |
| download | opensim-SC_OLD-07d6a0385fdbb0559a878f0884505459e08e7867.zip opensim-SC_OLD-07d6a0385fdbb0559a878f0884505459e08e7867.tar.gz opensim-SC_OLD-07d6a0385fdbb0559a878f0884505459e08e7867.tar.bz2 opensim-SC_OLD-07d6a0385fdbb0559a878f0884505459e08e7867.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.cs | 2 |
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 | ||