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

Merge branch 'master' of https://github.com/siana/SingularityViewer

Browse Source 
Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.

Resolved Conflicts:
	indra/llcommon/CMakeLists.txt

Proximity: addition of two independent things. Just included both.
This commit is contained in:
Aleric Inglewood
2011-05-13 23:55:06 +02:00
parent ea2cc3e0de ea31271ac1
commit 41f13dbf46
36 changed files with 647 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloatercustomize.cpp
View File

@@ -1386,14 +1386,18 @@ LLScrollingPanelParam::LLScrollingPanelParam( const std::string& name,
else
{
//Kill everything that isn't the slider...
for(child_list_t::const_iterator it = getChildList()->begin();it!=getChildList()->end();)
child_list_t to_remove;
child_list_t::const_iterator it;
for (it = getChildList()->begin(); it != getChildList()->end(); it++)
{
if((*it)!=slider && (*it)->getName() != "panel border")
if ((*it) != slider && (*it)->getName() != "panel border")
{
llinfos << "removing: " << (*it)->getName() << llendl;
removeChild((*(it++)),TRUE);
to_remove.push_back(*it);
}
else ++it;
}
for (it = to_remove.begin(); it != to_remove.end(); it++)
{
removeChild(*it, TRUE);
}
slider->translate(0,PARAM_HINT_HEIGHT);
reshape(getRect().getWidth(),getRect().getHeight()-PARAM_HINT_HEIGHT);