aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-01-10 20:46:00 +0000
committerJustin Clark-Casey (justincc)2014-01-10 20:46:00 +0000
commit09e800f4b1be57c523e43cc459ac4f2d81890071 (patch)
tree0bc4402a147241ecf5af36d0f95b714328450578 /OpenSim/Region
parentMerge branch 'justincc-master' (diff)
parentminor: Add ctrlaltdavid to contributors list (diff)
downloadopensim-SC_OLD-09e800f4b1be57c523e43cc459ac4f2d81890071.zip
opensim-SC_OLD-09e800f4b1be57c523e43cc459ac4f2d81890071.tar.gz
opensim-SC_OLD-09e800f4b1be57c523e43cc459ac4f2d81890071.tar.bz2
opensim-SC_OLD-09e800f4b1be57c523e43cc459ac4f2d81890071.tar.xz
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Region')
-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 5663048..e54b697 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4397,7 +4397,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4397 UUID av = new UUID(); 4397 UUID av = new UUID();
4398 if (!UUID.TryParse(agent,out av)) 4398 if (!UUID.TryParse(agent,out av))
4399 { 4399 {
4400 LSLError("First parameter to llDialog needs to be a key"); 4400 LSLError("First parameter to llTextBox needs to be a key");
4401 return; 4401 return;
4402 } 4402 }
4403 4403