diff options
| author | Melanie | 2012-08-29 22:06:43 +0200 |
|---|---|---|
| committer | Melanie | 2012-08-29 22:06:43 +0200 |
| commit | 67f18655d50914857a1fffe75995155e7a6d5b8e (patch) | |
| tree | 52895a2827a00bd473e13a86c8b40b337c69c024 /OpenSim | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-67f18655d50914857a1fffe75995155e7a6d5b8e.zip opensim-SC_OLD-67f18655d50914857a1fffe75995155e7a6d5b8e.tar.gz opensim-SC_OLD-67f18655d50914857a1fffe75995155e7a6d5b8e.tar.bz2 opensim-SC_OLD-67f18655d50914857a1fffe75995155e7a6d5b8e.tar.xz | |
Allow llList2Key to also act on System.String
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 |
1 files changed, 2 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 7dae53a..d5e611c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -5475,7 +5475,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 5475 | // for completion and should LSL_Key ever be implemented | 5475 | // for completion and should LSL_Key ever be implemented |
| 5476 | // as it's own struct | 5476 | // as it's own struct |
| 5477 | else if (!(src.Data[index] is LSL_String || | 5477 | else if (!(src.Data[index] is LSL_String || |
| 5478 | src.Data[index] is LSL_Key)) | 5478 | src.Data[index] is LSL_Key || |
| 5479 | src.Data[index] is String)) | ||
| 5479 | { | 5480 | { |
| 5480 | return ""; | 5481 | return ""; |
| 5481 | } | 5482 | } |