diff options
| author | David Walter Seikel | 2013-04-06 21:47:13 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-04-06 21:47:13 +1000 |
| commit | ba982c0575515a8524d5044f928cd336303f807c (patch) | |
| tree | 7044c629d59d89e5b8e896914097ccc5de619975 /linden/indra/lscript/lscript_execute/lscript_execute.cpp | |
| parent | And actually add the new files for MOAP radar (diff) | |
| download | meta-impy-ba982c0575515a8524d5044f928cd336303f807c.zip meta-impy-ba982c0575515a8524d5044f928cd336303f807c.tar.gz meta-impy-ba982c0575515a8524d5044f928cd336303f807c.tar.bz2 meta-impy-ba982c0575515a8524d5044f928cd336303f807c.tar.xz | |
Clean up some compiler warnings. More to come.
Diffstat (limited to 'linden/indra/lscript/lscript_execute/lscript_execute.cpp')
| -rw-r--r-- | linden/indra/lscript/lscript_execute/lscript_execute.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.cpp b/linden/indra/lscript/lscript_execute/lscript_execute.cpp index b2b54cd..7af407f 100644 --- a/linden/indra/lscript/lscript_execute/lscript_execute.cpp +++ b/linden/indra/lscript/lscript_execute/lscript_execute.cpp | |||
| @@ -809,16 +809,7 @@ void LLScriptExecute::runInstructions(BOOL b_print, const LLUUID &id, | |||
| 809 | // is there a fault? | 809 | // is there a fault? |
| 810 | // if yes, print out message and exit | 810 | // if yes, print out message and exit |
| 811 | S32 value = getVersion(); | 811 | S32 value = getVersion(); |
| 812 | S32 major_version = 0; | 812 | if ((value != LSL2_VERSION1_END_NUMBER) && (value != LSL2_VERSION_NUMBER)) |
| 813 | if (value == LSL2_VERSION1_END_NUMBER) | ||
| 814 | { | ||
| 815 | major_version = 1; | ||
| 816 | } | ||
| 817 | else if (value == LSL2_VERSION_NUMBER) | ||
| 818 | { | ||
| 819 | major_version = 2; | ||
| 820 | } | ||
| 821 | else | ||
| 822 | { | 813 | { |
| 823 | setFault(LSRF_VERSION_MISMATCH); | 814 | setFault(LSRF_VERSION_MISMATCH); |
| 824 | } | 815 | } |