diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-19 10:18:57 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-19 10:18:57 -0400 |
| commit | 5b8c1851f2b565fddaab28e23add62f621f15082 (patch) | |
| tree | d8525d0f5dd985efb86dcb50e752e19d59a7fb2d /indra/newview/llviewerattachmenu.cpp | |
| parent | 94fde578cd845b1a648e66ecf184e7a24beaad6d (diff) | |
| parent | 3bb5d368a21e2645222f0f5fa57b0a0abb236084 (diff) | |
automated merge
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"; |