summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2021-02-16SL-14725 Validate trackball elevationAndrey Kleshchev
2021-02-16SL-14725 Add elevation and azimuth to local lightingAndrey Kleshchev
2021-02-15SL-14725 Rotation sliders for sun and moon panelsAndrey Kleshchev
2021-02-03SL-14796 After teleporting, add notation into Nearby ChatAndrey Kleshchev
2021-02-01Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-12-07Revert "SL-14270 Crash accessing deleted 'parent' via callback from child"Andrey Kleshchev
There are random inventory's buildViewsTree crashes in branch with SL-14270 commit and there doesn't seem to be anything else inventory related that could have caused those. Reverting commits to see if it fixes crashes.
2020-12-03SL-14270 A bit of cleanup #3Andrey Kleshchev
Just in case and for clarity
2020-11-24Revert "SL-13479 Avatar menu tweaks"Andrey Lihatskiy
This reverts commit 05ce7511aa6ffebe78676d714a621a1fe04c66e2.
2020-11-24SL-13479 Avatar menu tweaksMnikolenko Productengine
2020-11-23DRTVWR-513 Resolved merge conflict from merge with DRTVWR-507Andrey Kleshchev
See changes from SL-13119 and SL-13190
2020-11-21SL-14368 Expanding the 'People' floater to the right does not expand the ↵Andrey Kleshchev
displayed values
2020-11-13Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-11-12Mac buildfixAndrey Lihatskiy
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-06SL-14270 Crash fixAndrey Kleshchev
2020-11-05SL-14270 A bit of cleanup #2Andrey Kleshchev
2020-11-05SL-14270 A bit of cleanup #1Andrey Kleshchev
2020-11-05SL-14270 Crash accessing deleted 'parent' via callback from childAndrey Kleshchev
2020-10-14Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-10-14Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatermodelpreview.cpp
2020-10-07SL-14030 FIXED Clicking in Places > My Landmarks scrolls the Places window.Mnikolenko Productengine
2020-10-06SL-14030 FIXED Clicking in Places > My Landmarks scrolls the Places window.Mnikolenko Productengine
2020-10-02SL-14050 Remove all Help question marks from Viewer UIMnikolenko Productengine
2020-09-28Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterbuycurrency.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.h # indra/newview/skins/default/xui/en/floater_buy_currency.xml
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-23SL-13335 Friendlier L$ Buy flow when no payment method on fileMnikolenko Productengine
2020-09-23SL-13852 Add visibility options to inventory search resultsMnikolenko Productengine
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merged master (DRTVWR-503) into DRTVWR-482Andrey Kleshchev
2020-09-09Revert "SL-12475 add Inventory Favorites tab"Andrey Lihatskiy
This reverts commit 92499ce1b43fd60ce7aad71d12f9eef0cef04f7f. # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h
2020-09-09SL-12475 add Inventory Favorites tabmaxim_productengine
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp
2020-08-25SL-13498 Crash at ~LLPersistentNotificationChannelAndrey Kleshchev
Callstack is clearly broken since it points to LLNotifications::instance().clear(); after 'Goodbye!', my suspicion is that something reinitialized singleton so I fixed cleanup and added some logging to see if there is a dupplicate init
2020-08-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-08-11Merged master into DRTVWR-482Andrey Kleshchev
2020-07-23SL-13642 Get rid of that ugly ignore -Wdelete-incompleteAndrey Lihatskiy
Get rid of that ugly '#pragma clang diagnostic ignored "-Wdelete-incomplete"' by making sure the delete always happens inside llview.cpp, where the type of LLView is known.
2020-07-22There was an idiom to test with LL_DARWIN if the compiler used is clang. ↵Nicky Dasmijn
This is not correct, as clang is available on all 3 platforms. The correct way to check for this is via __clang__ (https://clang.llvm.org/docs/LanguageExtensions.html#builtin-macros)
2020-07-21Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llerror.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp
2020-07-21Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml
2020-07-20Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llimprocessing.cpp
2020-07-15SL-5894 #3 WIP enumerate devices to flaoter, let floater set deviceAndrey Kleshchev
temp
2020-07-08SL-13479 Avatar menu tweaksMnikolenko Productengine
2020-06-24Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/llcommon/llkeybind.cpp # indra/llcommon/llkeybind.h
2020-06-23Reverted SL-6109 keybinding changesAndrey Kleshchev
Changes were moved to DRTVWR-514
2020-06-11SL-13433 Add tests for new url entryMnikolenko Productengine
2020-06-11SL-13433 Viewer should recognizes ipv6 linksMnikolenko Productengine
2020-06-03SL-13364 FIXED Viewer crashes when opening Spell Check floater when ↵Mnikolenko Productengine
"SpellCheck" is FALSE