diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-20 12:40:02 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-20 12:40:02 -0700 |
| commit | 4a90d9f3d6d4491aab8b17bc8dc7f3c8ac90de49 (patch) | |
| tree | 34760344f3999c703646c50d0c2b9ce900e958b2 /indra/llui/lltoolbar.cpp | |
| parent | 9560fb7cb2b0b542e7dbf028d40bda2cd9da05c5 (diff) | |
* Moved the name storage on the LLCommandId back to the LLCommand itself.
Reviewed by Merov.
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()); |