fb1238a1ce
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.cpp
# indra/newview/llenvironment.cpp
2020-11-13 18:26:56 +02:00
00764cc236
SL-14079 crash accessing LLHUDText
...
LLHUDObject has a lot of deriveds stored as LLPointer<LLHUDObject>, no-virtual destructor is unlikely to be cause of the crash, but might be related
2020-10-14 23:16:35 +03:00
177ad21ade
SL-13729 Performance of LLUI and LLRender2D
2020-09-17 19:59:48 +03:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
1df7760d31
SL-9632 add uniform and code to supress atmospherics in all shaders that could be used by HUDs
...
Make sky and cloud shaders use common scaleSoftClip implementation in gammaF.glsl
2018-09-14 21:52:52 +01:00
b0e5bee0b4
MAINT-8723 - Selecting mesh objects make several HUD-related items invisible
...
FIXED (from FS Ansariel patches)
2018-06-07 18:46:03 +03:00
8db7540908
MAINT-6649 PRIM_TEXT/llSetText upper draw distance limit
2016-08-19 11:58:32 +03:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
9197a8652e
MAINT-6110 FIXED No hovertext (PRIM_TEXT/llSetText) on child prim
2016-03-09 15:25:58 +02:00
35b499a0be
MAINT-6110 Show hovertext on attached objects
2016-02-23 12:08:29 +02:00
b1d8df9ea2
MAINT-6110 FIXED No hovertext (PRIM_TEXT/llSetText) on child prims
2016-02-05 11:32:48 +02:00
f44b24aadd
MAINT-5851 PRIM_TEXT/llSetText has no upper draw distance limit
2016-01-06 13:06:58 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
202a2c4daa
Update to build on Xcode 6.0: remove unused const variables
2014-10-19 15:28:52 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
86dc7c4f6d
added comments to magic numbers
2012-01-18 16:32:37 -08:00
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
50d21a75a7
merge
2010-11-15 15:52:54 -08:00
ad033a4b35
sync up to viewer-developer
2010-10-15 09:52:11 +01:00
393c819477
VWR-21967 There's lots of ::renderForSelect() code that we don't need any more.
...
VWR-22088 Remove underlying ::renderForSelect() code (render-pipeline)
2010-10-10 15:25:11 +01:00
6e471d395f
removed dead code
2010-10-04 16:38:03 -07:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
0ee6a6025c
Name tag color and position hackery for demo
2010-03-10 15:41:30 -08:00
8527463c15
More name-tag vs. hud-text cleanup
2010-03-09 16:44:34 -08:00
7337b4b05b
More harmonization of LLHUDNameTag vs. LLHUDText
...
Eliminating now-unused code from LLHUDText
2010-03-09 15:23:16 -08:00
717a4800f1
Break name tag code out into LLHUDNameTag
...
Start by duplicating the LLHUDText code, then stripping out
functionality that only needs to exist in one place (like
force-based juggling of name tag positions)
2010-03-09 14:28:48 -08:00
18ebacefcf
Merge with viewer 2 beta 4
2010-03-08 10:54:23 -08:00
36c35bca26
Support multiple fonts, colors and styles in name tags
...
Simplified LLHUDText string API to be UTF8 only
Added per-text segment font support
Changed LLVOAvatar invalidateNameTag to clearNameTag
2010-02-25 17:06:17 -08:00
644c5cadbf
Name tags of friends appear in green.
...
Refactored LLVOAvatar idleUpdateNameTag into smaller functions
Eliminated unused LLHUDText::setUsePixelSize
2010-02-10 12:04:03 -08:00
7885748497
Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3
2010-02-23 17:08:06 -08:00
651b14fcae
Backed out davep's UI optimization. changeset 3134cb7bb181
2010-02-12 21:04:51 -08:00
979ddb2ec9
No more matrix ops in UI code.
2010-02-04 23:41:54 -06:00
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
4966073030
moved clipping logic inside LLFontGL::maxDrawableChars controlled by EWordWrapStyle
...
fixes regression introduced in 3eef5ce9ae1e6fc62b9b52ce859501dd4e70fadf
reviewed by Brad
2010-01-06 12:23:56 -08:00
1bbd259f2d
EXT-3878 - Menus disappear when UI Size is < 1.00
...
EXT-3647 - Auto-scrolling of IMs should resume when user types in chat
EXT-3877 - Pinning two levels of menus prevents movement using arrow keys
EXT-1303 - Hyperlink text wraps in the middle of a word
reviewed by James
2010-01-06 11:17:38 -08:00
0f6242d9fd
Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
...
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
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
73a97010e6
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-07-21 00:57:23 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
d6101558a1
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
...
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
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
1aa0416aef
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
...
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
6db6d81b0a
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
...
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-03-05 00:29:27 +00:00
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
...
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
Andrey Lihatskiy