diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-24 11:44:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-24 11:44:43 -0500 |
| commit | f57aa3e83f1b4286b1d6b5cc8bca20fb924cb002 (patch) | |
| tree | 12dae11397876ce10d75eeabe5b1656ea18cd6ac /indra/llinventory | |
| parent | b429ff8ec3e1aebc60ff7f4d3376cfc8b9f2e669 (diff) | |
| parent | f9b9c7a5816cf0b9627a4a50e73a663667937145 (diff) | |
merge changes for i18n fixes
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventory.cpp | 2 | ||||
| -rw-r--r-- | indra/llinventory/llnotecard.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index bda76eac80..a3caf79519 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -61,8 +61,6 @@ static const std::string INV_FOLDER_ID_LABEL_WS("category_id"); ///---------------------------------------------------------------------------- /// Local function declarations, constants, enums, and typedefs ///---------------------------------------------------------------------------- -const U8 TASK_INVENTORY_ITEM_KEY = 0; -const U8 TASK_INVENTORY_ASSET_KEY = 1; const LLUUID MAGIC_ID("3c115e51-04f4-523c-9fa6-98aff1034730"); diff --git a/indra/llinventory/llnotecard.cpp b/indra/llinventory/llnotecard.cpp index 62829c284f..69152cefe0 100644 --- a/indra/llinventory/llnotecard.cpp +++ b/indra/llinventory/llnotecard.cpp @@ -199,7 +199,7 @@ bool LLNotecard::importStream(std::istream& str) return FALSE; } - if(text_len > mMaxText) + if(text_len > mMaxText || text_len < 0) { llwarns << "Invalid Linden text length: " << text_len << llendl; return FALSE; |