livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,220 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

172 Commits (719a2d31dc29f3260b45c89862dd67f314331ed5)

Author SHA1 Message Date
Ansariel a9c29b4b81 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llmenugl.h
#	indra/llui/lltexteditor.cpp
#	indra/newview/llfloaterbump.cpp
#	indra/newview/llfloaterbump.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llnetmap.cpp
 2022-10-20 10:51:25 +02:00
Rye Mutt bbd8df15de Fix menu leaks and lazy creation in text editing and scroll lists 2022-10-19 16:28:03 -04:00
Ansariel 2253723705 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 14:13:23 +02:00
Ansariel 9563ab543b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-25 11:56:38 +02:00
Andrey Lihatskiy a4c6c7059f Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llvoicevivox.cpp
 2021-06-25 00:51:02 +03:00
Ansariel 618057fa04 Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-05-01 00:29:48 +02:00
Ansariel 885215519d Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
Brad Payne (Vir Linden) d15156d4e0 SL-14862 - catching more commands in LLUIUsage 2021-02-18 14:24:54 +00:00
Ansariel 14fb8f66f8 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-24 16:34:12 +02:00
Andrey Kleshchev a5c8b1cbe2 SL-13729 Performance of LLUI and LLRender2D #2 2020-09-17 20:39:45 +03:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Ansariel 9a2e9c5abb Different approach of fixing the "Bad interval range" warning log spam 2015-11-27 08:49:20 +01:00
Ansariel cdc1e7df5f Fix toolbar buttons executing although the button is actually disabled 2015-11-20 14:34:12 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel d942732010 Remove unnecessary include 2015-11-02 11:11:52 +01:00
Ansariel 2b4c4718d5 Let's use llceil instead of ceilf 2015-11-01 17:33:38 +01:00
Ansariel b7eb465cdc FIRE-5317: Fixed size buttons in bottom toolbar are too big 2015-11-01 16:33:04 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Ansariel a38473a663 Clean up some formatting at sight 2014-09-11 18:19:11 +02:00
Ansariel 4a8392f14b FIRE-5552: Disabled toolbar buttons cannot be moved 2014-09-11 13:05:09 +02:00
Stinson Linden 001621dfc2 MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null. 2014-05-05 23:24:34 +01:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Nicky 9c7ab535d4 Adjust for changes in LLUI after merge, 2014-06-10 11:17:28 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08:00
simon 4acc2dc273 Merge viewer-release 2014-02-10 15:42:25 -08:00
Oz Linden 52ec6f9af0 remove excessively complex fixes for MAINT-2914 and MAINT-3142 2013-11-26 15:09:55 -05:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
maksymsproductengine cfcf6d9bd4 MAINT-3163 FIXED Since CHUI, floaters can be moved totally underneath bottom toolbar buttons and "lost". 2013-09-26 00:34:00 +03:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
dmitrykproductengine f8e5ae8006 MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6 (280797) 2013-10-04 14:04:31 +03:00
simon 90d1c5b367 Merge downstream code for CHUIStorm 2013-08-26 15:45:09 -07:00
maksymsproductengine 01a7002228 MAINT-3163 FIXED Since CHUI, floaters can be moved totally underneath bottom toolbar buttons and "lost". 2013-09-26 00:34:00 +03:00
Richard Linden e340009fc5 second phase summer cleaning 
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
 2013-08-09 17:11:19 -07:00
dmitry 48f702029f MAINT-2914 FIXED Mousing over UI elements does not make them light up 2013-08-02 18:00:08 +03:00
Mnikolenko ProductEngine 0cf9597bd5 CHUI-926 FIXED FUI button will stay highlight(orange) if there are unread IMs when the conversation floater is minimized. 2013-06-11 15:30:31 +03:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
prep@lindenlab.com 0f24668b0a Merged in Chui beta6+ fixes 2013-03-29 10:37:58 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 68f9f656cd merge with viewer-release 2013-03-22 00:44:59 -07:00
Gilbert Gonzales abf1bf79f2 CHUI-881 ([CHUIBUG]Viewer crashes when user drag and drop the participant from the people floater to the one of the tool bars): Problem was that the item dragged from the people list was not of type inventoryitem. Instead of casting to an inventoryitem and checking if the item being dragged is a widgit, instead look at the cargo type (which also specifies that the dragged item is a widgit but doesn't need to typecast). 2013-03-21 16:16:54 -07:00
Richard Linden 7b4d27ecbc SH-3931 WIP Interesting: Add graphs to visualize scene load metrics 
collapsed Orientation enums to all use LLView::EOrientation
added ability to display stat bar horizontally
 2013-03-14 19:36:50 -07:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
AlexanderP ProductEngine f944608ab9 CHUI-707: "Chat" toolbar button stop flashing after setting toolbar buttons view to "Icons only": save/restore flashing states 2013-02-06 20:00:43 +02:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00