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

ERenderName enum had elements swap around. Doesn't match our saved settings (driven by preferences floater), so reverting and commenting.

Browse Source
This commit is contained in:
Shyotl
2011-10-04 00:34:52 -05:00
parent 6841b0cf47
commit 07165f014f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llvoavatar.cpp
View File

@@ -207,11 +207,14 @@ const LLColor4 DUMMY_COLOR = LLColor4(0.5,0.5,0.5,1.0);
const F32 DERUTHING_TIMEOUT_SECONDS = 30.f; const F32 DERUTHING_TIMEOUT_SECONDS = 30.f;
//Singu note: FADE and ALWAYS are swapped around from LL's source to match our preference panel.
// Changing the "RenderName" order would cause confusion when 'always' setting suddenly gets
// interpreted as 'fade', and vice versa.
enum ERenderName enum ERenderName
{ {
RENDER_NAME_NEVER, RENDER_NAME_NEVER,
RENDER_NAME_ALWAYS, RENDER_NAME_FADE,
RENDER_NAME_FADE RENDER_NAME_ALWAYS
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------