aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2008-09-20 17:32:58 +0000
committerHomer Horwitz2008-09-20 17:32:58 +0000
commitf352d6ed9b39aac281146d4853cde942acdf056d (patch)
tree42c8ad8bafa5391d921560c9777ba73d00d8c21a
parent* Fix build error, (maybe) (diff)
downloadopensim-SC_OLD-f352d6ed9b39aac281146d4853cde942acdf056d.zip
opensim-SC_OLD-f352d6ed9b39aac281146d4853cde942acdf056d.tar.gz
opensim-SC_OLD-f352d6ed9b39aac281146d4853cde942acdf056d.tar.bz2
opensim-SC_OLD-f352d6ed9b39aac281146d4853cde942acdf056d.tar.xz
- Consistency fix: Like llGetNumberOfNotecardLines, llGetNotecardLine returns NULL_KEY on error now
- Conformance fix: If the notecard can't be found, shout on DEBUG_CHANNEL as the docs state - Bug fix: Don't let llGetNotecardLine throw an exception on freshly created notecards
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs14
1 files changed, 13 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 f49cf0c..c806697 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8067,6 +8067,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8067 return tid.ToString(); 8067 return tid.ToString();
8068 } 8068 }
8069 } 8069 }
8070 // if we got to here, we didn't find the notecard the script was asking for
8071 // => complain loudly, as specified by the LSL docs
8072 ShoutError("Notecard '" + name + "' could not be found.");
8073
8070 // ScriptSleep(100); 8074 // ScriptSleep(100);
8071 return UUID.Zero.ToString(); 8075 return UUID.Zero.ToString();
8072 } 8076 }
@@ -8109,8 +8113,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8109 } 8113 }
8110 } 8114 }
8111 8115
8116 // if we got to here, we didn't find the notecard the script was asking for
8117 // => complain loudly, as specified by the LSL docs
8118 ShoutError("Notecard '" + name + "' could not be found.");
8119
8112 // ScriptSleep(100); 8120 // ScriptSleep(100);
8113 return String.Empty; 8121 return UUID.Zero.ToString();
8114 } 8122 }
8115 8123
8116 } 8124 }
@@ -8169,6 +8177,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8169 { 8177 {
8170 case 0: 8178 case 0:
8171 words = input[idx].Split(' '); // Linden text ver 8179 words = input[idx].Split(' '); // Linden text ver
8180 // Notecards are created *really* empty. Treat that as "no text" (just like after saving an empty notecard)
8181 if (words.Length < 3)
8182 return new String[0];
8183
8172 int version = int.Parse(words[3]); 8184 int version = int.Parse(words[3]);
8173 if (version != 2) 8185 if (version != 2)
8174 return new String[0]; 8186 return new String[0];