diff options
author | Rider Linden <rider@lindenlab.com> | 2017-11-30 11:42:49 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2017-11-30 11:42:49 -0800 |
commit | 1df10afa2a7802763330475e1a90547c3cff7c06 (patch) | |
tree | 8a8cdb8c02f1e18e8cfacefc1efbc2ab43c6157e /indra/newview/llviewertexteditor.h | |
parent | d7dd10b88bc3fda88f6528ecc5936e4889f019f3 (diff) | |
parent | e3a2c5e3217ae74a0277f2e6d4e1e708fe398a1c (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewertexteditor.h')
-rw-r--r-- | indra/newview/llviewertexteditor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h index 33cfca4f90..44f104dde1 100644 --- a/indra/newview/llviewertexteditor.h +++ b/indra/newview/llviewertexteditor.h @@ -71,7 +71,8 @@ public: mObjectID = object_id; mPreviewID = preview_id; } - + void setNotecardObjectID(const LLUUID& object_id){ mObjectID = object_id;} + void setASCIIEmbeddedText(const std::string& instr); void setEmbeddedText(const std::string& instr); std::string getEmbeddedText(); |