diff options
| author | callum <none@none> | 2011-10-20 15:03:28 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-20 15:03:28 -0700 |
| commit | 6998c5ebc7aad43d44f1bb6e42e20503c2ff144f (patch) | |
| tree | 916f1c113192211d85a7772b4b62df65f0a613d7 /indra/llui/lltoolbar.cpp | |
| parent | a1561c20e063060a6a54b4e66968404e4cb15d8a (diff) | |
| parent | 4a90d9f3d6d4491aab8b17bc8dc7f3c8ac90de49 (diff) | |
Merge with head
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index bceda9bf54..515605200e 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -821,7 +821,7 @@ LLToolBarButton* LLToolBar::createButton(const LLCommandId& id) if (!commandp) return NULL; LLToolBarButton::Params button_p; - button_p.name = commandp->id().name(); // Make sure to retrieve the name from the command itself, not the passed in id + button_p.name = commandp->name(); button_p.label = LLTrans::getString(commandp->labelRef()); button_p.tool_tip = LLTrans::getString(commandp->tooltipRef()); button_p.image_overlay = LLUI::getUIImage(commandp->icon()); |