OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'justincc-master'

master-beforevarregion
Justin Clark-Casey (justincc) 2014-01-10 20:46:00 +00:00
parent 68cbccb288 8c6b9ef865
commit 09e800f4b1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.txt
View File

@ -75,6 +75,7 @@ what it is today.
* Chris Yeoh (IBM) * Chris Yeoh (IBM)
* controlbreak * controlbreak
* coyled * coyled
* ctrlaltdavid
* Daedius * Daedius
* daTwitch * daTwitch
* devalnor-#708 * devalnor-#708

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -4397,7 +4397,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UUID av = new UUID(); UUID av = new UUID();
if (!UUID.TryParse(agent,out av)) if (!UUID.TryParse(agent,out av))
{ {
LSLError("First parameter to llDialog needs to be a key"); LSLError("First parameter to llTextBox needs to be a key");
return; return;
} }