| Age | Commit message (Collapse) | Author | 
|---|
|  | This removes the "special case" for Mac which was resulting in values a few orders of magnitude smaller than on windows. | 
|  |  | 
|  | Dataserver's version has compression artifacts | 
|  | # Conflicts:
#	indra/newview/llmaterialeditor.cpp | 
|  |  | 
|  | # Conflicts:
#	indra/newview/VIEWER_VERSION.txt | 
|  |  | 
|  | # Conflicts:
#	indra/newview/llspatialpartition.cpp | 
|  | resolution to be. | 
|  | # 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/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llui/llflatlistview.cpp
#	indra/newview/lldrawpoolground.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/llviewergenericmessage.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
#	indra/newview/skins/default/xui/en/floater_stats.xml
#	indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/panel_performance_preferences.xml | 
|  | scale thumbnail textures down to 256 when needed. As we do to chat icons.
# Conflicts:
#	indra/newview/llviewertexture.cpp | 
|  | scale thumbnail textures down to 256 when needed. As we do to chat icons. | 
|  | # 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 | 
|  |  | 
|  |  | 
|  | thumbnail copy&paste only allows square textures and wasn't allowing
none square ones despite those already being used as thumbnails | 
|  |  | 
|  | # Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorymodelbackgroundfetch.cpp | 
|  |  | 
|  | # Conflicts:
#	indra/newview/llappviewer.cpp | 
|  |  | 
|  | LLFetchedGLTFMaterial | 
|  | * SL-19331: Have media updates on the LLImageGL thread even when texture updates are on the main thread. Add config.
Off-thread media updates seem work best performance-wise when using glTexImage2D, not sub_image_lines. Otherwise, there are lots of main thread stalls.
* SL-19331: Bump featuretable
* SL-19331: Cleanup, annotate comment | 
|  | # Conflicts:
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml | 
|  |  | 
|  |  | 
|  | Debt from SL-18221.
Keep init together, after we got the cap; texture should finish loading before it's needed. | 
|  |  | 
|  |  | 
|  |  | 
|  | of frame stalls on main thread without the need for multithreaded GL | 
|  | SL-18869, SL-18772  Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc | 
|  | # Conflicts:
#	doc/contributions.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/colors.xml | 
|  |  | 
|  |  | 
|  | Due to udp texture fetching no longer being present | 
|  |  | 
|  | abilities and remove some more fast timers. | 
|  | Due to udp texture fetching no longer being present | 
|  |  | 
|  | # Conflicts:
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp | 
|  |  | 
|  | Water texture should load only after having caps.
Prefetch textures should load only after having caps.
Prefetch list is now per grid | 
|  | Water texture should load only after having caps.
Prefetch textures should load only after having caps.
Prefetch list is now per grid | 
|  |  | 
|  |  | 
|  | maps, fix for crash on shutdown. | 
|  |  |