diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-16 11:23:30 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-16 11:23:30 +0100 |
| commit | 94cae52bb791b8ceef4d55eed8c8726e63572b61 (patch) | |
| tree | 08955536d1fafbe3c00f260b9786b7bec01fa617 /indra/newview/llviewerattachmenu.cpp | |
| parent | 565d5dc1a9a4617874710ce7ede82a30c203f03f (diff) | |
| parent | a97485fa60f1b1f29d8109b79450ab993880529c (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llviewerattachmenu.cpp')
| -rw-r--r-- | indra/newview/llviewerattachmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerattachmenu.cpp b/indra/newview/llviewerattachmenu.cpp index f7f5ec72fd..f683bd8674 100644 --- a/indra/newview/llviewerattachmenu.cpp +++ b/indra/newview/llviewerattachmenu.cpp @@ -84,7 +84,7 @@ void LLViewerAttachMenu::populateMenus(const std::string& attach_to_menu_name, c LLSD cbparams; cbparams["index"] = curiter->first; - cbparams["label"] = attachment->getName(); + cbparams["label"] = p.name; p.on_click.function_name = "Object.Attach"; p.on_click.parameter = LLSD(attachment->getName()); p.on_enable.function_name = "Attachment.Label"; |