diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-05-30 17:39:09 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-05-30 17:39:09 +0000 |
| commit | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (patch) | |
| tree | ab3877f764cc27dbdca0b683f07e6ea3a3ac8a23 /indra/llinventory | |
| parent | 7b61f1d0ec30e97fd3b7c5caf4b0e675c6e9a1f5 (diff) | |
merge -r61423:62602 svn/branches/maintenance --> release
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llnotecard.cpp | 6 | ||||
| -rw-r--r-- | indra/llinventory/llsaleinfo.cpp | 4 | ||||
| -rw-r--r-- | indra/llinventory/lluserrelations.h | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/indra/llinventory/llnotecard.cpp b/indra/llinventory/llnotecard.cpp index 96ee7ff800..325cb2a1f7 100644 --- a/indra/llinventory/llnotecard.cpp +++ b/indra/llinventory/llnotecard.cpp @@ -84,12 +84,6 @@ bool LLNotecard::importEmbeddedItemsStream(std::istream& str) goto import_file_failed; } - if( (index < 0) ) - { - llwarns << "Invalid LLEmbeddedItems file format: invalid ext char index: " << index << llendl; - goto import_file_failed; - } - str >> std::ws >> "inv_item\t0\n"; if(str.fail()) { diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp index c469eae33c..32ba4aaaec 100644 --- a/indra/llinventory/llsaleinfo.cpp +++ b/indra/llinventory/llsaleinfo.cpp @@ -155,7 +155,7 @@ BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask) buffer, " %254s %254s", keyword, valuestr); - if(!keyword) + if(!keyword[0]) { continue; } @@ -211,7 +211,7 @@ BOOL LLSaleInfo::importLegacyStream(std::istream& input_stream, BOOL& has_perm_m buffer, " %254s %254s", keyword, valuestr); - if(!keyword) + if(!keyword[0]) { continue; } diff --git a/indra/llinventory/lluserrelations.h b/indra/llinventory/lluserrelations.h index 7c24254339..ddf6767b23 100644 --- a/indra/llinventory/lluserrelations.h +++ b/indra/llinventory/lluserrelations.h @@ -18,7 +18,7 @@ * @class LLRelationship * * This class represents a relationship between two agents, where the - * related agent is stored and the other agent is the relationship is + * related agent is stored and the other agent in the relationship is * implicit by container ownership. * This is merely a cache of this information used by the sim * and viewer. |