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

Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Browse Source
This commit is contained in:
Lirusaito
2012-04-24 21:33:52 -04:00
parent a5faea64d9 75ef768e7f
commit fd183e01b5
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llui/llpanel.cpp
View File

@@ -478,6 +478,16 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory *fac
{
if(!factory->builtPanel(panelp))
panelp->initPanelXML(node, parent, factory);
else
{
LLRect new_rect = panelp->getRect();
// override rectangle with embedding parameters as provided
panelp->createRect(node, new_rect, parent);
panelp->setOrigin(new_rect.mLeft, new_rect.mBottom);
panelp->setShape(new_rect);
// optionally override follows flags from including nodes
panelp->parseFollowsFlags(node);
}
}
return panelp;

2
indra/newview/llfloatertools.cpp
View File

@@ -999,7 +999,7 @@ void commit_select_tool(LLUICtrl *ctrl, void *data)
S32 show_owners = gSavedSettings.getBOOL("ShowParcelOwners");
LLCheckBoxCtrl* group = (LLCheckBoxCtrl*)ctrl;
std::string selected = group->getValue().asString();
std::string selected = group->getName();
if (selected == "radio position")
{
LLFloaterTools::setEditTool( LLToolCompTranslate::getInstance() );