diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llinventory/llnotecard.cpp | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/llinventory/llnotecard.cpp')
-rw-r--r-- | linden/indra/llinventory/llnotecard.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp index 6d565e8..acd2e76 100644 --- a/linden/indra/llinventory/llnotecard.cpp +++ b/linden/indra/llinventory/llnotecard.cpp | |||
@@ -222,7 +222,7 @@ bool LLNotecard::importStream(std::istream& str) | |||
222 | if(success) | 222 | if(success) |
223 | { | 223 | { |
224 | // Actually set the text | 224 | // Actually set the text |
225 | mText = text; | 225 | mText = std::string(text); |
226 | } | 226 | } |
227 | 227 | ||
228 | delete[] text; | 228 | delete[] text; |
@@ -281,22 +281,12 @@ bool LLNotecard::exportStream( std::ostream& out_stream ) | |||
281 | 281 | ||
282 | //////////////////////////////////////////////////////////////////////////// | 282 | //////////////////////////////////////////////////////////////////////////// |
283 | 283 | ||
284 | const std::vector<LLPointer<LLInventoryItem> >& LLNotecard::getItems() const | ||
285 | { | ||
286 | return mItems; | ||
287 | } | ||
288 | |||
289 | LLString& LLNotecard::getText() | ||
290 | { | ||
291 | return mText; | ||
292 | } | ||
293 | |||
294 | void LLNotecard::setItems(const std::vector<LLPointer<LLInventoryItem> >& items) | 284 | void LLNotecard::setItems(const std::vector<LLPointer<LLInventoryItem> >& items) |
295 | { | 285 | { |
296 | mItems = items; | 286 | mItems = items; |
297 | } | 287 | } |
298 | 288 | ||
299 | void LLNotecard::setText(const LLString& text) | 289 | void LLNotecard::setText(const std::string& text) |
300 | { | 290 | { |
301 | mText = text; | 291 | mText = text; |
302 | } | 292 | } |