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

6
indra/newview/app_settings/keywords.ini
View File

@@ -885,11 +885,11 @@ return Leave current function or event handler
# Comment
[one_sided_delimiter .8, .3, .15]
// Comment:Non-functional commentary or disabled code
[two_sided_delimiter_esc .8, .3, .15]
[two_sided_delimiter .8, .3, .15]
/* */ Comment:Non-functional commentary or disabled code
# String literals
[two_sided_delimiter_esc 0, .2, 0]
" " String literal
[double_quotation_marks 0, .2, 0]
" String literal
#functions are supplied by the program now

1
indra/newview/llappviewer.cpp
View File

@@ -689,6 +689,7 @@ bool LLAppViewer::init()
// Widget construction depends on LLUI being initialized
LLUI::initClass(&gSavedSettings,
&gSavedPerAccountSettings,
&gSavedSettings,
&gColors,
LLUIImageList::getInstance(),

3
indra/newview/llfloaterstats.cpp
View File

@@ -160,7 +160,6 @@ void LLFloaterStats::buildStats()
stat_barp->mPerSec = FALSE;
stat_barp = render_statviewp->addStat("New Objs", &(LLViewerStats::getInstance()->mNumNewObjectsStat), "DebugStatModeNewObjs");
stat_barp->setLabel("New Objs");
stat_barp->setUnitLabel("/sec");
stat_barp->mMinBar = 0.f;
stat_barp->mMaxBar = 1000.f;
@@ -169,7 +168,6 @@ void LLFloaterStats::buildStats()
stat_barp->mPerSec = TRUE;
stat_barp = render_statviewp->addStat("Object Cache Hit Rate", &(LLViewerStats::getInstance()->mNumNewObjectsStat), std::string(), false, true);
stat_barp->setLabel("Object Cache Hit Rate");
stat_barp->setUnitLabel("%");
stat_barp->mMinBar = 0.f;
stat_barp->mMaxBar = 100.f;
@@ -186,7 +184,6 @@ void LLFloaterStats::buildStats()
LLStatView *texture_statviewp = render_statviewp->addStatView(params);
stat_barp = texture_statviewp->addStat("Cache Hit Rate", &(LLTextureFetch::sCacheHitRate), std::string(), false, true);
stat_barp->setLabel("Cache Hit Rate");
stat_barp->setUnitLabel("%");
stat_barp->mMinBar = 0.f;
stat_barp->mMaxBar = 100.f;

4
indra/newview/llpreviewscript.cpp
View File

@@ -597,11 +597,11 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate)
}
const LLTextSegment* segment = NULL;
std::vector<const LLTextSegment*> selected_segments;
std::vector<const LLTextSegmentPtr> selected_segments;
mEditor->getSelectedSegments(selected_segments);
// try segments in selection range first
std::vector<const LLTextSegment*>::iterator segment_iter;
std::vector<const LLTextSegmentPtr>::iterator segment_iter;
for (segment_iter = selected_segments.begin(); segment_iter != selected_segments.end(); ++segment_iter)
{
if((*segment_iter)->getToken() && (*segment_iter)->getToken()->getType() == LLKeywordToken::WORD)

2
indra/newview/llviewertexteditor.cpp
View File

@@ -869,7 +869,7 @@ BOOL LLViewerTextEditor::handleHover(S32 x, S32 y, MASK mask)
// Check to see if we're over an HTML-style link
if( !mSegments.empty() )
{
const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
if( cur_segment )
{
if(cur_segment->getStyle()->isLink())