[Floater Flexibility] Part one: Refactor all floaters to work with the dictionary in one way or another.

This commit is contained in:
Inusaito Sayori
2014-03-25 00:23:56 -04:00
parent ee610ceb3f
commit f37d83abe1
22 changed files with 219 additions and 512 deletions

View File

@@ -50,6 +50,7 @@
#include "llviewerwindow.h"
#include "pipeline.h"
#include "rlvactions.h"
#include <sstream>
@@ -175,13 +176,12 @@ LLFloaterEnvSettings* LLFloaterEnvSettings::instance()
if (!sEnvSettings)
{
sEnvSettings = new LLFloaterEnvSettings();
sEnvSettings->open();
sEnvSettings->setFocus(TRUE);
}
return sEnvSettings;
}
void LLFloaterEnvSettings::show()
{
if (RlvActions::hasBehaviour(RLV_BHVR_SETENV)) return;
LLFloaterEnvSettings* envSettings = instance();
envSettings->syncMenu();
@@ -189,7 +189,10 @@ void LLFloaterEnvSettings::show()
//LLUICtrlFactory::getInstance()->buildFloater(envSettings, "floater_env_settings.xml");
//envSettings->initCallbacks();
envSettings->open();
if (envSettings->getVisible())
envSettings->close();
else
envSettings->open();
}
bool LLFloaterEnvSettings::isOpen()