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

Merge remote-tracking branch 'shyotl/sunshine'

Browse Source 
Conflicts:
	indra/llappearance/llavatarappearance.cpp
	indra/newview/character/avatar_lad.xml
	indra/newview/llagent.cpp
This commit is contained in:
Latif Khalifa
2013-03-26 23:54:36 +01:00
parent 779f697ffb 441b564afe
commit 303840f729
36 changed files with 657 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llviewerobject.cpp
View File

@@ -1269,6 +1269,12 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
mText->setColor(mHudTextColor);
mText->setString(mHudTextString);
}
// [RLVa:KB] - Checked: 2010-03-27 (RLVa-1.4.0a) | Added: RLVa-1.0.0f
if (rlv_handler_t::isEnabled())
{
mText->setObjectText(mHudTextString);
}
// [/RLVa:KB]
setChanged(MOVED | SILHOUETTE);
}
@@ -1649,10 +1655,15 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
coloru.mV[3] = 255 - coloru.mV[3];
mHudTextColor = LLColor4(coloru); //Cache for reset on debug infodisplay toggle.
if(mText->getDoFade()) //Fade is disabled when this is being overridden by debug text.
mText->setColor(mHudTextColor);
mText->setString(mHudTextString);
// [RLVa:KB] - Checked: 2010-03-27 (RLVa-1.4.0a) | Added: RLVa-1.0.0f
if (rlv_handler_t::isEnabled())
{
mText->setColor(mHudTextColor);
mText->setString(mHudTextString);
mText->setObjectText(mHudTextString);
}
// [/RLVa:KB]
setChanged(TEXTURE);
}
else if(mText.notNull())