livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DEV-53094 FIX Selecting texture picker causes viewer to crash 

overzealous elimination of xml parsing
meow-7.2.2
Richard Nelson 2010-09-08 19:00:50 -07:00
parent dbc4973102
commit e7884bbab5
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatercolorpicker.cpp
View File

@ -107,6 +107,8 @@ LLFloaterColorPicker::LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show
mCanApplyImmediately ( show_apply_immediate ),
mContextConeOpacity ( 0.f )
{
buildFromFile ( "floater_color_picker.xml");
// create user interface for this picker
createUI ();

1
indra/newview/llfloaternotificationsconsole.cpp
View File

@ -251,6 +251,7 @@ LLFloaterNotification::LLFloaterNotification(LLNotification* note)
: LLFloater(LLSD()),
mNote(note)
{
buildFromFile("floater_notification.xml");
}
BOOL LLFloaterNotification::postBuild()

1
indra/newview/llpanelmaininventory.cpp
View File

@ -642,6 +642,7 @@ LLFloaterInventoryFinder::LLFloaterInventoryFinder(LLPanelMainInventory* invento
mPanelMainInventory(inventory_view),
mFilter(inventory_view->getPanel()->getFilter())
{
buildFromFile("floater_inventory_view_finder.xml");
updateElementsFromFilter();
}

1
indra/newview/lltexturectrl.cpp
View File

@ -196,6 +196,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
mContextConeOpacity(0.f),
mSelectedItemPinned( FALSE )
{
buildFromFile("floater_texture_ctrl.xml");
mCanApplyImmediately = can_apply_immediately;
setCanMinimize(FALSE);
}