aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llinventory/llnotecard.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llinventory/llnotecard.cpp')
-rw-r--r--linden/indra/llinventory/llnotecard.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp
index 9e7e043..f7e3632 100644
--- a/linden/indra/llinventory/llnotecard.cpp
+++ b/linden/indra/llinventory/llnotecard.cpp
@@ -61,7 +61,7 @@ bool LLNotecard::importEmbeddedItemsStream(std::istream& str)
61 str >> std::ws >> "LLEmbeddedItems version" >> mEmbeddedVersion >> "\n"; 61 str >> std::ws >> "LLEmbeddedItems version" >> mEmbeddedVersion >> "\n";
62 if (str.fail()) 62 if (str.fail())
63 { 63 {
64 llwarns << "Invalid Linden text file header" << llendl; 64 llwarns << "Invalid notecard text file header" << llendl;
65 goto import_file_failed; 65 goto import_file_failed;
66 } 66 }
67 67
@@ -74,7 +74,7 @@ bool LLNotecard::importEmbeddedItemsStream(std::istream& str)
74 str >> std::ws >> "{\n"; 74 str >> std::ws >> "{\n";
75 if(str.fail()) 75 if(str.fail())
76 { 76 {
77 llwarns << "Invalid Linden text file format: missing {" << llendl; 77 llwarns << "Invalid notecard text file format: missing {" << llendl;
78 goto import_file_failed; 78 goto import_file_failed;
79 } 79 }
80 80
@@ -165,20 +165,20 @@ bool LLNotecard::importStream(std::istream& str)
165 str >> std::ws >> "Linden text version " >> mVersion >> "\n"; 165 str >> std::ws >> "Linden text version " >> mVersion >> "\n";
166 if(str.fail()) 166 if(str.fail())
167 { 167 {
168 llwarns << "Invalid Linden text file header " << llendl; 168 llwarns << "Invalid notecard text file header " << llendl;
169 return FALSE; 169 return FALSE;
170 } 170 }
171 171
172 if( 1 != mVersion && 2 != mVersion) 172 if( 1 != mVersion && 2 != mVersion)
173 { 173 {
174 llwarns << "Invalid Linden text file version: " << mVersion << llendl; 174 llwarns << "Invalid notecard text file version: " << mVersion << llendl;
175 return FALSE; 175 return FALSE;
176 } 176 }
177 177
178 str >> std::ws >> "{\n"; 178 str >> std::ws >> "{\n";
179 if(str.fail()) 179 if(str.fail())
180 { 180 {
181 llwarns << "Invalid Linden text file format" << llendl; 181 llwarns << "Invalid notecard text file format" << llendl;
182 return FALSE; 182 return FALSE;
183 } 183 }
184 184
@@ -191,7 +191,7 @@ bool LLNotecard::importStream(std::istream& str)
191 str.getline(line_buf, STD_STRING_BUF_SIZE); 191 str.getline(line_buf, STD_STRING_BUF_SIZE);
192 if(str.fail()) 192 if(str.fail())
193 { 193 {
194 llwarns << "Invalid Linden text length field" << llendl; 194 llwarns << "Invalid notecard text length field" << llendl;
195 return FALSE; 195 return FALSE;
196 } 196 }
197 line_buf[STD_STRING_STR_LEN] = '\0'; 197 line_buf[STD_STRING_STR_LEN] = '\0';
@@ -199,13 +199,13 @@ bool LLNotecard::importStream(std::istream& str)
199 S32 text_len = 0; 199 S32 text_len = 0;
200 if( 1 != sscanf(line_buf, "Text length %d", &text_len) ) 200 if( 1 != sscanf(line_buf, "Text length %d", &text_len) )
201 { 201 {
202 llwarns << "Invalid Linden text length field" << llendl; 202 llwarns << "Invalid notecard text length field" << llendl;
203 return FALSE; 203 return FALSE;
204 } 204 }
205 205
206 if(text_len > mMaxText) 206 if(text_len > mMaxText)
207 { 207 {
208 llwarns << "Invalid Linden text length: " << text_len << llendl; 208 llwarns << "Invalid notecard text length: " << text_len << llendl;
209 return FALSE; 209 return FALSE;
210 } 210 }
211 211
@@ -215,7 +215,7 @@ bool LLNotecard::importStream(std::istream& str)
215 fullread(str, text, text_len); 215 fullread(str, text, text_len);
216 if(str.fail()) 216 if(str.fail())
217 { 217 {
218 llwarns << "Invalid Linden text: text shorter than text length: " << text_len << llendl; 218 llwarns << "Invalid notecard text: text shorter than text length: " << text_len << llendl;
219 success = FALSE; 219 success = FALSE;
220 } 220 }
221 text[text_len] = '\0'; 221 text[text_len] = '\0';