diff options
Diffstat (limited to 'linden/indra/newview/llpreviewgesture.cpp')
-rw-r--r-- | linden/indra/newview/llpreviewgesture.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp index fdbeb6c..5f657d3 100644 --- a/linden/indra/newview/llpreviewgesture.cpp +++ b/linden/indra/newview/llpreviewgesture.cpp | |||
@@ -4,6 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (c) 2004-2007, Linden Research, Inc. | 5 | * Copyright (c) 2004-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -793,7 +794,7 @@ void LLPreviewGesture::refresh() | |||
793 | mWaitTimeCheck->set(wait_step->mFlags & WAIT_FLAG_TIME); | 794 | mWaitTimeCheck->set(wait_step->mFlags & WAIT_FLAG_TIME); |
794 | mWaitTimeEditor->setVisible(TRUE); | 795 | mWaitTimeEditor->setVisible(TRUE); |
795 | char buffer[16]; /*Flawfinder: ignore*/ | 796 | char buffer[16]; /*Flawfinder: ignore*/ |
796 | snprintf(buffer, sizeof(buffer), "%.1f", (double)wait_step->mWaitSeconds); /*Flawfinder: ignore*/ | 797 | snprintf(buffer, sizeof(buffer), "%.1f", (double)wait_step->mWaitSeconds); /* Flawfinder: ignore */ |
797 | mWaitTimeEditor->setText(buffer); | 798 | mWaitTimeEditor->setText(buffer); |
798 | break; | 799 | break; |
799 | } | 800 | } |
@@ -1042,11 +1043,11 @@ void LLPreviewGesture::loadUIFromGesture(LLMultiGesture* gesture) | |||
1042 | if (!new_step) continue; | 1043 | if (!new_step) continue; |
1043 | 1044 | ||
1044 | // Create an enabled item with this step | 1045 | // Create an enabled item with this step |
1045 | LLScrollListItem* item = new LLScrollListItem(TRUE, new_step); | 1046 | LLSD row; |
1046 | item->addColumn(new_step->getLabel(), LLFontGL::sSansSerifSmall); | 1047 | row["columns"][0]["value"] = new_step->getLabel(); |
1047 | 1048 | row["columns"][0]["font"] = "SANSSERIF_SMALL"; | |
1048 | // Add item to bottom of list | 1049 | LLScrollListItem* item = mStepList->addElement(row); |
1049 | mStepList->addItem(item, ADD_BOTTOM); | 1050 | item->setUserdata(new_step); |
1050 | } | 1051 | } |
1051 | } | 1052 | } |
1052 | 1053 | ||
@@ -1591,12 +1592,11 @@ LLScrollListItem* LLPreviewGesture::addStep(const std::string& library_text) | |||
1591 | } | 1592 | } |
1592 | 1593 | ||
1593 | // Create an enabled item with this step | 1594 | // Create an enabled item with this step |
1594 | LLScrollListItem* step_item = new LLScrollListItem(TRUE, step); | 1595 | LLSD row; |
1595 | std::string label = step->getLabel(); | 1596 | row["columns"][0]["value"] = step->getLabel(); |
1596 | step_item->addColumn(label, LLFontGL::sSansSerifSmall); | 1597 | row["columns"][0]["font"] = "SANSSERIF_SMALL"; |
1597 | 1598 | LLScrollListItem* step_item = mStepList->addElement(row); | |
1598 | // Add item to bottom of list | 1599 | step_item->setUserdata(step); |
1599 | mStepList->addItem(step_item, ADD_BOTTOM); | ||
1600 | 1600 | ||
1601 | // And move selection to the list on the right | 1601 | // And move selection to the list on the right |
1602 | mLibraryList->deselectAllItems(); | 1602 | mLibraryList->deselectAllItems(); |