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

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

Browse Source 
Cleaned up LLKeyWords
Cleaned up LLStatBar
Added per-account setting access to ui library
Added LLUICachedControl
Updated LLUIString
This commit is contained in:
Shyotl
2013-05-20 00:36:34 -05:00
parent df404c42d0
commit c5fc945f33
24 changed files with 628 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/llui/llui.cpp
View File

@@ -61,6 +61,7 @@ std::map<std::string, std::string> gTranslation;
std::list<std::string> gUntranslated;
/*static*/ LLControlGroup* LLUI::sConfigGroup = NULL;
/*static*/ LLControlGroup* LLUI::sAccountGroup = NULL;
/*static*/ LLControlGroup* LLUI::sIgnoresGroup = NULL;
/*static*/ LLControlGroup* LLUI::sColorsGroup = NULL;
/*static*/ LLUIAudioCallback LLUI::sAudioCallback = NULL;
@@ -116,6 +117,7 @@ bool handleShowXUINamesChanged(const LLSD& newvalue)
}
void LLUI::initClass(LLControlGroup* config,
LLControlGroup* account,
LLControlGroup* ignores,
LLControlGroup* colors,
LLImageProviderInterface* image_provider,
@@ -126,10 +128,12 @@ void LLUI::initClass(LLControlGroup* config,
{
LLRender2D::initClass(image_provider, scale_factor);
sConfigGroup = config;
sAccountGroup = account;
sIgnoresGroup = ignores;
sColorsGroup = colors;
if (sConfigGroup == NULL
|| sAccountGroup == NULL
|| sIgnoresGroup == NULL
|| sColorsGroup == NULL)
{
@@ -287,6 +291,20 @@ void LLUI::glRectToScreen(const LLRect& gl, LLRect *screen)
glPointToScreen(gl.mRight, gl.mBottom, &screen->mRight, &screen->mBottom);
}
LLControlGroup& LLUI::getControlControlGroup (const std::string& controlname)
{
if(sConfigGroup->controlExists(controlname))
return *sConfigGroup;
if(sAccountGroup->controlExists(controlname))
return *sAccountGroup;
//if(sIgnoresGroup->controlExists(controlname)) //Identical to sConfigGroup currently.
// return *sIgnoresGroup;
if(sColorsGroup->controlExists(controlname))
return *sColorsGroup;
return *sConfigGroup;
}
// static
void LLUI::setHtmlHelp(LLHtmlHelp* html_help)
{