Commit Graph

23 Commits (825440785423348c4e9e904f78bb93ddfdd41b9f)

Author SHA1 Message Date
Mnikolenko Productengine 0aaf5284dc Merge branch 'master' into DRTVWR-539
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-02 00:46:10 +02:00
Mnikolenko Productengine 928191f525 SL-15297 performance floater UI update #2 2021-07-19 20:07:03 +03:00
Mnikolenko Productengine 74c6580e5c SL-15297 WIP restore selection after updating the list & don't show avatars in the list as disabled when complexity is not limited 2021-06-25 20:05:07 +03:00
Mnikolenko Productengine f33605f8b1 SL-15297 WIP Implement performance floater - implement complexity bars 2021-06-24 16:17:04 +03:00
Mnikolenko Productengine 9df87dd365 SL-13179 FIXED Sorting residents banned on the parcel by duration is incorrect 2021-05-27 23:51:59 +03:00
andreykproductengine af7cefe031 SL-6109 Cell selection support 2020-06-23 14:49:39 +03:00
andreykproductengine 2532a2ee9e SL-6109 Conflict resolution 2020-06-23 14:48:03 +03:00
andreykproductengine c60b929fbb SL-6109 Mouse support ready 2020-06-23 14:48:03 +03:00
andreykproductengine 31e0cefb6c SL-6109 New cell type with icon and text (and 1 pixel offset for all text cells) 2020-06-23 14:46:15 +03:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden c47c31fdbf EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat 2012-01-31 17:51:43 -08:00
Richard Linden 3a597af700 EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
fixed font metrics rounding error and made corrective adjustments in layout
2012-01-18 16:30:53 -08:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Ychebotarev ProductEngine 0f04222acc fix for normal EXT-1391 Group Info: Avatar name should end with ellipsis if it doesn't fit free space
--HG--
branch : product-engine
2010-03-03 11:43:48 +02:00
James Cook 9ffaacc47e First pass expose inventory item settings in XML (folder_view_item.xml)
Optimized LLFolderViewItem constructor by passing param block as
const ref to avoid copies.
Removed per-item arrow and background images, use defaults.
Removed unneeded static image pointers.
Removed hard-coded rounded_square.tga, replaced with Rounded_Square
Ditto for folder_arrow.tga
Reviewed with Richard.
2010-01-08 17:26:47 -08:00
richard 2b22831dd0 ext-3307 - nearby chat stays scrolled at bottom 2009-12-18 15:18:16 -08:00
Rick Pasetto e3356c0695 some minor changes based on Richard's code review
Code Collab #34
2009-11-11 16:07:02 -08:00
Rick Pasetto d023672e59 Add ToolTip functionality to LLScrollListCell
This change enables a user to set a custom tool tip on a particular
scroll list cell by calling setToolTip().  Then, this tool tip is
used.  If this is not done, the existing tooltip functionality is left
alone.

Reviewed by Richard
2009-11-11 15:08:00 -08:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
Richard Nelson 138bf11322 merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
James Cook 8f7ec64899 Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00