From 40f9e12bdf1a39f0ec7f10b717b33e030806ed04 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sat, 26 Apr 2014 10:17:47 -0400 Subject: [PATCH] Fix for Issue 1472, prevent what was probably a null pointer in a bind Oddly, this only happened to some people, but on any OS, which leads me to believe that initialization order may need some looking at, but that's not terribly important now. Removes toolbar toggle from floater dictionary, in favor of using setting toggle Since we could always just hook up a control to a button if we wanted to add such a button somewhere anyhow, this has no effect on future either. --- indra/newview/llmenucommands.cpp | 2 -- indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index f00089379..8dbaa756d 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -102,7 +102,6 @@ #include "llmakeoutfitdialog.h" #include "llmoveview.h" // LLFloaterMove #include "lltextureview.h" -#include "lltoolbar.h" #include "lltoolgrab.h" #include "lltoolmgr.h" #include "lluictrlfactory.h" @@ -211,7 +210,6 @@ struct MenuFloaterDict : public LLSingleton registerFloater("sound_explorer", boost::bind(LLFloaterExploreSounds::toggle), boost::bind(LLFloaterExploreSounds::visible)); registerFloater("test", boost::bind(LLFloaterTest::show, (void*)NULL)); // Phoenix: Wolfspirit: Enabled Show Floater out of viewer menu - registerFloater("toolbar", boost::bind(toggle_control, "ShowToolBar"), boost::bind(&LLToolBar::getVisible, gToolBar)); registerFloater("WaterSettings", boost::bind(LLFloaterWater::show), boost::bind(LLFloaterWater::isOpen)); registerFloater("web", boost::bind(LLFloaterWebContent::showInstance, "dict web", LLFloaterWebContent::Params())); registerFloater("Windlight", boost::bind(LLFloaterWindLight::show), boost::bind(LLFloaterWindLight::isOpen)); diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 462427138..73199bf03 100644 --- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -321,8 +321,8 @@ mouse_opaque="true" name="separator" width="211" /> - - + +