summaryrefslogtreecommitdiff
path: root/indra/newview/lllocalbitmaps.cpp
AgeCommit message (Collapse)Author
2024-05-15Manual whitespace cleanup (fix_whitespace.py).Nat Goodspeed
2024-05-02Introduce LLLater::getRemaining(handle).Nat Goodspeed
Some timer use cases need to know not only whether the timer is active, but how much time remains before it (next) fires. Introduce LLLater::mDoneTimes to track, for each handle, the timestamp at which it's expected to fire. We can't just look up the target timestamp in mQueue's func_at entry because there's no documented way to navigate from a handle_type to a node iterator or pointer. Nor can we store it in mHandles because of order dependency: we need the mDoneTimes iterator so we can bind it into the Periodic functor for doPeriodically(), but we need the mQueue handle to store in mHandles. If we could find the mQueue node from the new handle, we could update the func_at entry after emplace() -- but if we could find the mQueue node from a handle, we wouldn't need to store the target timestamp separately anyway. Split LLLater::doAtTime() into internal doAtTime1() and doAtTime2(): the first creates an mDoneTimes entry and returns an iterator, the second finishes creating new mQueue and mHandles entries based on that mDoneTimes entry. This lets doPeriodically()'s Periodic bind the mDoneTimes iterator. Then instead of continually incrementing an internal data member, it increments the mDoneTimes entry to set the next upcoming timestamp. That lets getRemaining() report the next upcoming timestamp rather than only the original one. Add LLEventTimer::isRunning() and getRemaining(), forwarding to its LLLater handle. Fix various LLEventTimer subclass references to mEventTimer.stop(), etc. Fix non-inline LLEventTimer subclass tick() overrides for bool, not BOOL. Remove LLAppViewer::idle() call to LLEventTimer::updateClass(). Since LLApp::stepFrame() already calls LLCallbackList::callFunctions(), assume we've already handled that every tick.
2023-11-30Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-mergeAndrey Lihatskiy
# 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
2023-11-06SL-20523 Ensure override gets updated before render materialAndrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #5Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #4Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #3Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #2Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #1Andrey Kleshchev
Update editor in which texture changed to local
2023-09-12 SL-20173 show notification when file is emptyMnikolenko Productengine
2023-08-21SL-20173 show warning notification when trying to add invalid files as local ↵Maxim Nikolenko
texture
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31SL-17653 Clean up unneeded filepicker dependency.Andrey Kleshchev
2022-08-23SL-17653 Local gltf materials #3Andrey Kleshchev
2022-08-23SL-17653 Local gltf materials #2Andrey Kleshchev
2022-03-30SL-16937 New Profile capability, image uploader for testingAndrey Kleshchev
This commit is mostly to simplify cap testing for server side. Plan is to remove LLLocalBitmap and draw texture more directly instead
2019-11-14Fix merge-related compile errorsDave Houlton
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-08-29Merge from lindenlab/viewer-releaseandreykproductengine
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-06-20DRTVWR-493 LLLocalBitmapMgr to Singletonandreykproductengine
2018-10-08SL-9746 [EEP] Local Texture options should work with EEPandreykproductengine
2018-06-13[DRTVWR-476] - add universal head,upper,lower tattoosAnchor Linden
2018-06-08[DRTVWR-476] - create new wearable typeAnchor Linden
2018-05-21MergeAnchor Linden
2018-05-21[DRTVWR-455] - added 5 new bake channelsAnchor Linden
2018-02-27MAINT-8317 Fixed Local Textures for Advanced Lighting Projectors do not keep ↵andreykproductengine
the selected texture.
2016-08-26MAINT-6665 [Contribution] Viewer crashes when setting a local texture from a ↵Mnikolenko Productengine
path containing non-standard characters
2016-05-06merge 4.0.4-release and MAINT-5974Oz Linden
2016-03-29MAINT-6257 Textures loading issues.andreykproductengine
2016-03-16merge changes for DRTVWR-417Oz Linden
2016-03-03MAINT-2199 reverted previous change, refixed missing cloud and ban lineandreykproductengine
2016-02-27MAINT-2199 restored original UI mechanics, removed icons from UI listandreykproductengine
2016-02-18MAINT-2199 In some rare cases priorities can change, it shouldn't affect ↵andreykproductengine
texture list.
2016-02-16MAINT-2199 separating UI elements from in-world textures.andreykproductengine
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-07-17MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or ↵andreykproductengine
selected
2015-06-05Merge from viewer-releaseandreykproductengine
2015-04-28Merge viewer-release, become version 3.7.29Mnikolenko ProductEngine
2015-04-24mergeBrad Payne (Vir Linden)
2015-04-13mergeBrad Payne (Vir Linden)
2015-04-13merge changes for 3.7.27-releaseOz Linden
2015-03-31MAINT-5039 FIXED Viewer crashes at logout if wearing clothing textured with ↵Mnikolenko ProductEngine
a local texture
2015-03-30MAINT-3585 FIXED (Crashes when attempting to upload image.)ruslantproductengine
2015-03-30MAINT-3585 FIXED (Crashes when attempting to upload image.)ruslantproductengine
2015-03-05SL-103 WIP - viewer enforces wearable limits based on total articles of ↵Brad Payne (Vir Linden)
clothing rather than per-type limit. Limit is artificially low for testing, will bump before release.
2014-11-03MAINT-3585 FIXED Viewer Crashes when attempting to upload image.ruslantproductengine
The bug was fixed, the reasone of crash is following. The Core Flow view contain another GL context and will not care about restoring a previous. I restore context manually. This path also contain a minor changes in another files. All changes described here. Сhange's for fix current bug. indra/llwindow/llwindow.h indra/llwindow/llwindowheadless.h indra/llwindow/llwindowmacosx.h indra/llwindow/llwindowsdl.h indra/llwindow/llwindowwin32.h indra/newview/lllocalbitmaps.cpp indra/newview/llviewerdisplay.cpp indra/newview/llviewerdisplay.h Twice mUsage initialization (replace to forward initialization). indra/llcharacter/lljointstate.h Looks like condition should be befor memcopy call, otherwise - possible CRASH. indra/llcommon/llmd5.cpp Unused condition and variables. indra/llmath/llsphere.cpp Looks like should be under if otherwise - possible CRASH indra\llprimitive\llmodel.cpp Useless assert's. indra/llrender/llrender.cpp indra/newview/lldaycyclemanager.cpp
2014-10-19Update to build on Xcode 6.0: remove an unused const variablecallum_linden
2014-06-18Merge downstream codesimon
2014-06-17Merge viewer-release and become version 3.7.9simon
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 17:29:48 +0000