diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 04:38:19 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 04:38:19 +0200 |
| commit | 9a1af101cd89c6b908eb2810d94de706b37bd0ea (patch) | |
| tree | b3abc99610c08b854fe69f5170b3c85bd544bdfc /indra/newview/llfloaterlinkreplace.cpp | |
| parent | baeb14b7562ac926ab39c8abbb6cd910310548d8 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
Diffstat (limited to 'indra/newview/llfloaterlinkreplace.cpp')
| -rw-r--r-- | indra/newview/llfloaterlinkreplace.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterlinkreplace.cpp b/indra/newview/llfloaterlinkreplace.cpp index 595d584799..8ee7a72055 100644 --- a/indra/newview/llfloaterlinkreplace.cpp +++ b/indra/newview/llfloaterlinkreplace.cpp @@ -162,7 +162,7 @@ void LLFloaterLinkReplace::onStartClicked() else { LLSD args; - args["TYPE"] = LLWearableType::getTypeName(source_item->getWearableType()); + args["TYPE"] = LLWearableType::getInstance()->getTypeName(source_item->getWearableType()); params.substitutions(args); LLNotifications::instance().add(params); } |