aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/lllineeditor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llui/lllineeditor.cpp')
-rw-r--r--linden/indra/llui/lllineeditor.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 453bb50..5f16853 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -223,18 +223,15 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
223 } 223 }
224 mImage = sImage; 224 mImage = sImage;
225 225
226
227 LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_rightclick_text.xml",this); 226 LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_rightclick_text.xml",this);
228 if (!menu) 227 if (!menu)
229 { 228 {
230 menu = new LLMenuGL(LLStringUtil::null); 229 menu = new LLMenuGL(LLStringUtil::null);
231 } 230 }
232 231
233 defineMenuCallbacks(menu); 232 defineMenuCallbacks(menu);
234 mPopupMenuHandle = menu->getHandle(); 233 mPopupMenuHandle = menu->getHandle();
235 menu->setBorderColor(gColors.getColor("MenuItemDisabledColor"));
236 menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor")); 234 menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
237
238} 235}
239 236
240 237
@@ -1344,7 +1341,7 @@ void LLLineEditor::defineMenuCallbacks(LLMenuGL* menu) {
1344 "Select All Text", 1341 "Select All Text",
1345 this, 1342 this,
1346 (void*)context_enable_selectall); 1343 (void*)context_enable_selectall);
1347 menu->setCtrlResponse(1+LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK, 1344 menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
1348 "Select All Text", 1345 "Select All Text",
1349 this, 1346 this,
1350 (void*)context_selectall); 1347 (void*)context_selectall);