diff options
author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-01-04 00:54:41 -0800 |
---|---|---|
committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-01-04 00:54:41 -0800 |
commit | d4ce47b09122d1f76601ba402c2b9ad6bb504950 (patch) | |
tree | 2f9a4aca02618d53d31ac62625645f89fb30c52f /indra/newview/llviewertexteditor.h | |
parent | 93100236ae34eaa9cd3fa314e7e770339c13eba7 (diff) | |
parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) |
Merged lindenlab/viewer-release into default
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(); |