diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-24 07:37:50 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-24 07:37:50 +0800 |
| commit | 7f354c70ba623b591c36dadd0f6616b349be4fc7 (patch) | |
| tree | 67557a9981877e6e4b1f08937dfde94e6287dc61 /indra/newview/llviewertexteditor.cpp | |
| parent | 5b9cb5bba3c12b1b5c86ba56d43ccf06b83edc14 (diff) | |
| parent | 33e0766ee08cccb480675a75d83b3a6e78849906 (diff) | |
Merge tag '6.6.14-release'
source for viewer 6.6.14.581101
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index 7abb42dd8a..d2701f0aff 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -1194,7 +1194,11 @@ void LLViewerTextEditor::openEmbeddedLandmark( LLPointer<LLInventoryItem> item_p void LLViewerTextEditor::openEmbeddedCallingcard( LLInventoryItem* item, llwchar wc ) { - if(item && !item->getCreatorUUID().isNull()) + if (item && !item->getDescription().empty()) + { + LLAvatarActions::showProfile(LLUUID(item->getDescription())); + } + else if (item && !item->getCreatorUUID().isNull()) { LLAvatarActions::showProfile(item->getCreatorUUID()); } |