diff options
| author | Melanie | 2011-10-11 23:22:23 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 23:22:23 +0100 |
| commit | 1ca86114e1aba555597b05b4dfa35f6a1cb20e6e (patch) | |
| tree | fbe27ec9db614d24bbde291eb6ef31c2c57b5360 | |
| parent | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge (diff) | |
| parent | Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather... (diff) | |
| download | opensim-SC_OLD-1ca86114e1aba555597b05b4dfa35f6a1cb20e6e.zip opensim-SC_OLD-1ca86114e1aba555597b05b4dfa35f6a1cb20e6e.tar.gz opensim-SC_OLD-1ca86114e1aba555597b05b4dfa35f6a1cb20e6e.tar.bz2 opensim-SC_OLD-1ca86114e1aba555597b05b4dfa35f6a1cb20e6e.tar.xz | |
Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmerge
| -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 4acfc76..6b35716 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -2139,7 +2139,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2139 | } | 2139 | } |
| 2140 | else | 2140 | else |
| 2141 | { | 2141 | { |
| 2142 | return String.Empty; | 2142 | return UUID.Zero.ToString(); |
| 2143 | } | 2143 | } |
| 2144 | } | 2144 | } |
| 2145 | 2145 | ||