Mats UI.
Includes Chalice Yao's pause agent on attachment selection in LLSelectMgr::updateSelectionCenter() Includes some of Cinder Roxley's enhancements to the build floater for materials (flip buttons, sync materials, consistent control hiding) Includes Ansariel Hiller's fix for FIRE-8298 [BUG-869] [MAINT-1961], since this updates lltexturectrl.* to have related behaviors. Switches from using MIN_MANHATTAN_DIST for threshold in LLToolDragAndDrop to using the existing DragAndDropDistanceThreshold debug, like upstream. Translators: panel_tools_texture.xml should now be translated, floater_tools.xml should have the old panel removed. strings.xml now has "use_texture" string. notifications.xml Now has "LivePreviewUnavailable" alert. (don't forget to translate the ignoretext)
This commit is contained in:
@@ -413,6 +413,7 @@ public:
|
||||
static void setRenderHighlights(BOOL val);
|
||||
static void toggleRenderHighlights(void* data);
|
||||
static BOOL getRenderHighlights(void* data);
|
||||
static void setRenderHighlightTextureChannel(LLRender::eTexIndex channel); // sets which UV setup to display in highlight overlay
|
||||
|
||||
static void updateRenderDeferred();
|
||||
static void refreshCachedSettings();
|
||||
@@ -837,6 +838,10 @@ public:
|
||||
static BOOL sRenderBeacons;
|
||||
static BOOL sRenderHighlight;
|
||||
|
||||
// Determines which set of UVs to use in highlight display
|
||||
//
|
||||
static LLRender::eTexIndex sRenderHighlightTextureChannel;
|
||||
|
||||
//debug use
|
||||
static U32 sCurRenderPoolType ;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user