Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

You're all so special.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-05-12 09:13:44 -04:00
parent 1e0243aa3d
commit 235693f134
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterurldisplay.cpp
View File

@@ -48,7 +48,7 @@ LLFloaterURLDisplay::LLFloaterURLDisplay(const LLSD& sd)
{ {
mFactoryMap["place_details_panel"] = LLCallbackMap(LLFloaterURLDisplay::createPlaceDetail, this); mFactoryMap["place_details_panel"] = LLCallbackMap(LLFloaterURLDisplay::createPlaceDetail, this);
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml", &getFactoryMap()); LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml", &getFactoryMap());
this->setVisible(false); setVisible(false);
// If positioned at 0,0 the teleport button is behind the toolbar. // If positioned at 0,0 the teleport button is behind the toolbar.
LLRect r = getRect(); LLRect r = getRect();

2
indra/newview/llnotify.cpp
View File

@@ -533,6 +533,7 @@ void LLNotifyBox::close()
die(); die();
if (not_tip) if (not_tip)
{ {
--sNotifyBoxCount;
if (LLNotifyBox* front = gNotifyBoxView->getFirstNontipBox()) if (LLNotifyBox* front = gNotifyBoxView->getFirstNontipBox())
{ {
gNotifyBoxView->showOnly(front); gNotifyBoxView->showOnly(front);
@@ -541,7 +542,6 @@ void LLNotifyBox::close()
view->setFocus(true); view->setFocus(true);
gFocusMgr.triggerFocusFlash(); // TODO it's ugly to call this here gFocusMgr.triggerFocusFlash(); // TODO it's ugly to call this here
} }
--sNotifyBoxCount;
} }
} }