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

Rename inner scope floater var to satisfy MSVC

Browse Source
This commit is contained in:
Melanie
2013-06-19 16:54:41 +02:00
parent 76219cd459
commit 94cfa613ec
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/hippofloaterxml.cpp
View File

@@ -363,23 +363,23 @@ bool HippoFloaterXmlImpl::execute(LLFloater *floater, LLUICtrl *ctrl,
if (HippoFloaterXmlImpl *floaterp = dynamic_cast<HippoFloaterXmlImpl*>(ctrl)) {
floaterp->mIsNotifyOnClose = set;
} else {
HippoFloaterXmlImpl *floaterp = static_cast<HippoFloaterXmlImpl*>(floater);
HippoFloaterXmlImpl *thisFloater = static_cast<HippoFloaterXmlImpl*>(floater);
if (set) {
notice_ptr_t connptr(new notice_connection_t(ctrl->setCommitCallback(boost::bind(&notifyCallback, _1, floater), ctrl)));
floaterp->mNotices[ctrl] = connptr;
thisFloater->mNotices[ctrl] = connptr;
} else {
floaterp->mNotices.erase(ctrl);
thisFloater->mNotices.erase(ctrl);
}
}
} else if (key == "picker") {
bool set = (value != "0");
if (!dynamic_cast<HippoFloaterXmlImpl*>(ctrl)) {
HippoFloaterXmlImpl *floaterp = static_cast<HippoFloaterXmlImpl*>(floater);
HippoFloaterXmlImpl *thisFloater = static_cast<HippoFloaterXmlImpl*>(floater);
if (set) {
notice_ptr_t connptr(new notice_connection_t(ctrl->setCommitCallback(boost::bind(&pickerCallback, _1, floater), ctrl)));
floaterp->mNotices[ctrl] = connptr;
thisFloater->mNotices[ctrl] = connptr;
} else {
floaterp->mNotices.erase(ctrl);
thisFloater->mNotices.erase(ctrl);
}
}
}