aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llinventory/llnotecard.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llinventory/llnotecard.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-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.h')
-rw-r--r--linden/indra/llinventory/llnotecard.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/llinventory/llnotecard.h b/linden/indra/llinventory/llnotecard.h
index 2b36ae2..a510ba3 100644
--- a/linden/indra/llinventory/llnotecard.h
+++ b/linden/indra/llinventory/llnotecard.h
@@ -52,11 +52,12 @@ public:
52 bool importStream(std::istream& str); 52 bool importStream(std::istream& str);
53 bool exportStream(std::ostream& str); 53 bool exportStream(std::ostream& str);
54 54
55 const std::vector<LLPointer<LLInventoryItem> >& getItems() const; 55 const std::vector<LLPointer<LLInventoryItem> >& getItems() const { return mItems; }
56 LLString& getText(); 56 const std::string& getText() const { return mText; }
57 std::string& getText() { return mText; }
57 58
58 void setItems(const std::vector<LLPointer<LLInventoryItem> >& items); 59 void setItems(const std::vector<LLPointer<LLInventoryItem> >& items);
59 void setText(const LLString& text); 60 void setText(const std::string& text);
60 S32 getVersion() { return mVersion; } 61 S32 getVersion() { return mVersion; }
61 S32 getEmbeddedVersion() { return mEmbeddedVersion; } 62 S32 getEmbeddedVersion() { return mEmbeddedVersion; }
62 63
@@ -64,7 +65,7 @@ private:
64 bool importEmbeddedItemsStream(std::istream& str); 65 bool importEmbeddedItemsStream(std::istream& str);
65 bool exportEmbeddedItemsStream(std::ostream& str); 66 bool exportEmbeddedItemsStream(std::ostream& str);
66 std::vector<LLPointer<LLInventoryItem> > mItems; 67 std::vector<LLPointer<LLInventoryItem> > mItems;
67 LLString mText; 68 std::string mText;
68 S32 mMaxText; 69 S32 mMaxText;
69 S32 mVersion; 70 S32 mVersion;
70 S32 mEmbeddedVersion; 71 S32 mEmbeddedVersion;