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

Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Browse Source 
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
	indra/newview/llpaneleditwearable.h
This commit is contained in:
Lirusaito
2012-07-02 04:14:52 -04:00
parent 5f98e24efe 53a570b977
commit 24db228406
92 changed files with 3901 additions and 2196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewermenu.cpp
View File

@@ -1371,7 +1371,11 @@ void init_debug_rendering_menu(LLMenuGL* menu)
&LLPipeline::hasRenderTypeControl,
(void*)LLPipeline::RENDER_TYPE_GRASS, '0', MASK_CONTROL|MASK_ALT|MASK_SHIFT));
//NOTE: Using a static variable, as an unsigned long long cannot fit in the space of a pointer. Pass pointer to callbacks
static U64 cloud_flags = (1ULL<<LLPipeline::RENDER_TYPE_WL_CLOUDS | 1ULL<<LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS);
static U64 cloud_flags = (1ULL<<LLPipeline::RENDER_TYPE_WL_CLOUDS
#if ENABLE_CLASSIC_CLOUDS
| 1ULL<<LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS
#endif
);
sub_menu->addChild(new LLMenuItemCheckGL("Clouds", //This clobbers skyuseclassicclouds, but.. big deal.
&LLPipeline::toggleRenderPairedTypeControl, NULL,
&LLPipeline::hasRenderPairedTypeControl,