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

BUILDFIX - miscellaneous stuff missed in the merge

master
Richard Linden 2013-11-12 11:42:06 -08:00
parent b668852987
commit 6ddfc8031c
13 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llmodaldialog.cpp
View File

@ -195,7 +195,7 @@ BOOL LLModalDialog::handleHover(S32 x, S32 y, MASK mask)
if( childrenHandleHover(x, y, mask) == NULL )
{
getWindow()->setCursor(UI_CURSOR_ARROW);
LL_DEBUGS(LLERR_USER_INPUT) << "hover handled by " << getName() << LL_ENDL;
LL_DEBUGS("UserInput") << "hover handled by " << getName() << LL_ENDL;
}
LLView* popup_menu = LLMenuGL::sMenuContainer->getVisibleMenu();

13
indra/llui/llmultifloater.cpp
View File

@ -67,14 +67,13 @@ void LLMultiFloater::buildTabContainer()
}
}
void LLMultiFloater::onOpen(const LLSD& key)
void LLMultiFloater::onClose(bool app_quitting)
{
// if (mTabContainer->getTabCount() <= 0)
// {
// // for now, don't allow multifloaters
// // without any child floaters
// closeFloater();
// }
if(isMinimized())
{
setMinimized(FALSE);
}
LLFloater::onClose(app_quitting);
}
void LLMultiFloater::draw()

2
indra/llui/llmultifloater.h
View File

@ -44,7 +44,7 @@ public:
void buildTabContainer();
virtual BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void onClose(bool app_quitting);
virtual void draw();
virtual void setVisible(BOOL visible);
/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);

11
indra/llxml/llcontrol.h
View File

@ -395,7 +395,6 @@ class LLCachedControl
public:
LLCachedControl(LLControlGroup& group,
const std::string& name,
const T& default_value,
const std::string& comment = "Declared In Code")
{
@ -406,6 +405,16 @@ public:
}
}
LLCachedControl(LLControlGroup& group,
const std::string& name)
{
mCachedControlPtr = LLControlCache<T>::getInstance(name);
if (mCachedControlPtr.isNull())
{
mCachedControlPtr = new LLControlCache<T>(group, name);
}
}
operator const T&() const { return mCachedControlPtr->getValue(); }
operator boost::function<const T&()> () const { return boost::function<const T&()>(*this); }
const T& operator()() { return mCachedControlPtr->getValue(); }

11
indra/newview/llfasttimerview.cpp
View File

@ -413,7 +413,7 @@ void LLFastTimerView::draw()
mAllTimeMax = llmax(mAllTimeMax, mRecording.getLastRecording().getSum(FTM_FRAME));
mHoverID = NULL;
mHoverBarIndex = -1;
}
}
void LLFastTimerView::onOpen(const LLSD& key)
{
@ -429,6 +429,10 @@ void LLFastTimerView::onOpen(const LLSD& key)
}
}
void LLFastTimerView::onClose(bool app_quitting)
{
setVisible(FALSE);
}
void saveChart(const std::string& label, const char* suffix, LLImageRaw* scratch)
{
@ -936,10 +940,7 @@ void LLFastTimerView::doAnalysis(std::string baseline, std::string target, std::
return ;
}
}
void LLFastTimerView::onClickCloseBtn(bool)
{
setVisible(false);
}
void LLFastTimerView::printLineStats()
{

2
indra/newview/llfasttimerview.h
View File

@ -62,10 +62,10 @@ public:
virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
virtual void draw();
virtual void onOpen(const LLSD& key);
virtual void onClose(bool app_quitting);
LLTrace::BlockTimerStatHandle* getLegendID(S32 y);
private:
virtual void onClickCloseBtn(bool app_quitting = false);
void drawTicks();
void drawLineGraph();
void drawLegend();

9
indra/newview/llfloaterimcontainer.cpp
View File

@ -2133,14 +2133,7 @@ BOOL LLFloaterIMContainer::isFrontmost()
// This is intentional so it doesn't confuse the user. onClickCloseBtn() closes the whole floater.
void LLFloaterIMContainer::onClickCloseBtn(bool app_quitting/* = false*/)
{
// Always unminimize before trying to close.
// Most of the time the user will never see this state.
if(isMinimized())
{
LLMultiFloater::setMinimized(FALSE);
}
LLFloater::closeFloater(app_quitting);
LLMultiFloater::closeFloater(app_quitting);
}
void LLFloaterIMContainer::closeHostedFloater()

6
indra/newview/llpersistentnotificationstorage.cpp
View File

@ -79,9 +79,9 @@ void LLPersistentNotificationStorage::saveNotifications()
data.append(notification->asLLSD(true));
if (data.size() >= gSavedSettings.getS32("MaxPersistentNotifications"))
{
llwarns << "Too many persistent notifications."
LL_WARNS() << "Too many persistent notifications."
<< " Saved " << gSavedSettings.getS32("MaxPersistentNotifications") << " of " << history_channel->size()
<< " persistent notifications." << llendl;
<< " persistent notifications." << LL_ENDL;
break;
}
@ -147,7 +147,7 @@ void LLPersistentNotificationStorage::loadNotifications()
if (processed_notifications >= gSavedSettings.getS32("MaxPersistentNotifications"))
{
llwarns << "Too many persistent notifications."
<< " Processed " << gSavedSettings.getS32("MaxPersistentNotifications") << " of " << data.size() << " persistent notifications." << llendl;
<< " Processed " << gSavedSettings.getS32("MaxPersistentNotifications") << " of " << data.size() << " persistent notifications." << LL_ENDL;
break;
}
}

2
indra/newview/llscenemonitor.cpp
View File

@ -699,7 +699,7 @@ LLSceneMonitorView::LLSceneMonitorView(const LLRect& rect)
setCanClose(true);
}
void LLSceneMonitorView::onClickCloseBtn()
void LLSceneMonitorView::onClose(bool app_quitting)
{
setVisible(false);
}

2
indra/newview/llscenemonitor.h
View File

@ -115,7 +115,7 @@ public:
virtual void onVisibilityChange(BOOL visible);
protected:
virtual void onClickCloseBtn();
virtual void onClose(bool app_quitting=false);
};
extern LLSceneMonitorView* gSceneMonitorView;

2
indra/newview/llsceneview.cpp
View File

@ -51,7 +51,7 @@ LLSceneView::LLSceneView(const LLRect& rect)
setCanClose(true);
}
void LLSceneView::onClickCloseBtn(bool)
void LLSceneView::onClose(bool)
{
setVisible(false);
}

2
indra/newview/llsceneview.h
View File

@ -38,7 +38,7 @@ public:
virtual void draw();
protected:
virtual void onClickCloseBtn(bool app_qutting = false);
virtual void onClose(bool app_qutting = false);
};

8
indra/newview/llvoavatar.cpp
View File

@ -5517,10 +5517,10 @@ void LLVOAvatar::addChild(LLViewerObject *childp)
{
if (!attachObject(childp))
{
llwarns << "addChild() failed for "
LL_WARNS() << "addChild() failed for "
<< childp->getID()
<< " item " << childp->getAttachmentItemID()
<< llendl;
<< LL_ENDL;
// MAINT-3312 backout
// mPendingAttachment.push_back(childp);
}
@ -5652,10 +5652,10 @@ void LLVOAvatar::lazyAttach()
{
if (!attachObject(cur_attachment))
{ // Drop it
llwarns << "attachObject() failed for "
LL_WARNS() << "attachObject() failed for "
<< cur_attachment->getID()
<< " item " << cur_attachment->getAttachmentItemID()
<< llendl;
<< LL_ENDL;
// MAINT-3312 backout
//still_pending.push_back(cur_attachment);
}