| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  |  | 
|  | Likely specific to headless client | 
|  | * Fixes for secondlife/viewer#3288 override copy related crashes when overrides can be nullptr | 
|  |  | 
|  | DRTVWR-600-maint-A
# Conflicts:
#	indra/llappearance/llavatarappearance.h
#	indra/llimage/llimage.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmath/llvolume.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llrendertarget.cpp
#	indra/llrender/llshadermgr.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llenvironment.cpp
#	indra/newview/llfetchedgltfmaterial.cpp
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloaterimagepreview.h
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llfloaterregioninfo.h
#	indra/newview/llmaniprotate.cpp
#	indra/newview/llmaniptranslate.cpp
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llsurface.cpp
#	indra/newview/llsurface.h
#	indra/newview/llsurfacepatch.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltinygltfhelper.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llviewerwindow.h
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvlcomposition.h
#	indra/newview/llvocache.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp | 
|  | "possible loss of precision" warnings | 
|  |  | 
|  | # Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp | 
|  | # Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterimagepreview.cpp | 
|  |  | 
|  |  | 
|  |  | 
|  | LF, and trim trailing whitespaces as needed | 
|  |  | 
|  | # Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterchangeitemthumbnail.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llvovolume.cpp | 
|  | # Conflicts:
#	indra/llui/lltransutil.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloaterenvironmentadjust.cpp
#	indra/newview/llpaneleditwater.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h | 
|  |  | 
|  | Shift-dropping textures can fail if one of 'early' faces has nomod
material | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | # Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llui/llflatlistview.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawpoolground.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/skins/default/xui/en/menu_inventory.xml | 
|  |  | 
|  |  | 
|  | # Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llvovolume.cpp | 
|  | # Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llagent.cpp
#	indra/newview/llfloaternewfeaturenotification.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llsidepaneltaskinfo.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
#	indra/newview/skins/default/xui/en/menu_inventory.xml | 
|  | DebugInventoryFilters
DebugShowXUINames
DebugSlshareLogTag
DebugStat****
DefaultBlankNormalTexture
DefaultObjectNormalTexture
DefaultObjectSpecularTexture
DefaultUploadCost
DisplayAvatarAgentTarget
DisplayChat
DisplayDebug
DisplayDebugConsole
DisplayIM
DisplayLinden
DisplayRegion
DragAndDropToolTipDelay
DragAndDropDistanceThreshold
DropShadowButton
DropShadowFloater
DropShadowSlider
DropShadowTooltip
UIImgWhiteUUID
UseEnvironmentFromRegion
UseDayCycle
WaterPresetName
SkyPresetName
DayCycleName
DestinationGuideHintTimeout
SidePanelHintTimeout
DisablePrecacheDelayAfterTeleporting | 
|  | attachments
1. Texture picker now updates filter's permissions based on selection
2. Various panels now properly check permissions | 
|  | permission bit is unset | 
|  | no-transfer | 
|  |  | 
|  |  | 
|  |  | 
|  | A New Material created in Inventory should be immediately usable. | 
|  |  | 
|  |  | 
|  | findCategory and move_item_to_marketplacelistings | 
|  | We allow droping no-copy textures and materials into object's inventory, and we allow asigning them from picker, there should be no reason why drag &drop should be different | 
|  |  | 
|  | When in PBR 'mode', defaulted texture drops to diffuse channel | 
|  |  | 
|  | # Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp | 
|  | inventory | 
|  |  | 
|  | And a fix to prevent message spam | 
|  |  | 
|  |  | 
|  |  |