Added 'NearbyMedia' floater (accessable via new button in Media Remote popup)
-Floater utilizes a slightly modified LLPanelNearbyMedia, which has fading and the 'minimal' mode disabled when its parent is a floater. -Due to how LL designed LLPanelNearbyMedia, only one instance should ever be allowed at a time. Added LLNameBox. To avoid having dupilcate code, logic in LLTextBox::fromXML had to be moved to LLTextBox::initFromXML. -Perfomed some additional cleanup. 'name' attribute now parsed in LLUICtrl::initFromXML, or as-needed for elements not based off of LLUICtrl. LLSlider now respects current DrawContext Fixed the AO toolbar widget reserving too much width. Made the "wlfAdvSettingsPopup" setting persist, and un-inverted its logic. Altered ui initilization order. Toolbar/overlay panels now constructed further into login process.
This commit is contained in:
@@ -76,7 +76,7 @@ void wlfPanel_AdvSettings::build()
|
||||
|
||||
deleteAllChildren();
|
||||
std::string ButtonState;
|
||||
if (!gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
|
||||
if (gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
|
||||
{
|
||||
LLUICtrlFactory::getInstance()->buildPanel(this, "wlfPanel_AdvSettings_expanded.xml", &getFactoryMap());
|
||||
ButtonState = "arrow_down.tga";
|
||||
@@ -92,7 +92,7 @@ void wlfPanel_AdvSettings::build()
|
||||
void wlfPanel_AdvSettings::refresh()
|
||||
{
|
||||
// [RLVa:KB] - Checked: 2009-09-19
|
||||
if (rlv_handler_t::isEnabled() && !gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
|
||||
if (rlv_handler_t::isEnabled() && gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
|
||||
{
|
||||
if (!findChild<LLView>("use_estate_wl")) return; // Singu Note: Not certain why, but sometimes none of these exist even though the above setting implies they should
|
||||
childSetEnabled("use_estate_wl", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
|
||||
@@ -141,7 +141,7 @@ BOOL wlfPanel_AdvSettings::postBuild()
|
||||
{
|
||||
childSetAction("expand", onClickExpandBtn, this);
|
||||
|
||||
if (!gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
|
||||
if (gSavedSettings.getBOOL("wlfAdvSettingsPopup"))
|
||||
{
|
||||
getChild<LLCheckBoxCtrl>("use_estate_wl")->setCommitCallback(onUseRegionSettings);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user