7373fd91fa
Merge remote-tracking branch 'origin/main' into DRTVWR-489
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-08-24 01:23:52 +03:00
f45e888c90
Some small tweaks after merge with Viewer release
2023-05-17 11:31:45 -07:00
033b04f388
Merge branch 'main' into DRTVWR-582-maint-U
...
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
2023-05-17 18:05:05 +03:00
daca555592
SL-19609 Urls aren't dispatched according to the indicated grid
2023-04-19 20:06:37 +03:00
a6daa3a26d
SL-19432 External group links dont load in SL
2023-03-31 17:47:07 +03:00
7ebaa2d2e5
Merge branch contribution/emoji into DRTVWR-489-emoji
2022-11-09 23:25:02 +01:00
5440464a9c
Merge branch 'contribution/emoji'
2022-08-28 00:08:38 +02:00
38cc06e43a
SL-17785 FIXED World Map scrolls too slowly when searching for a region.
2022-07-18 16:53:43 +03:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
9bca1aa8fb
SL-15232: Clang format
2022-04-05 11:55:34 -07:00
c6cba3a67d
SL-15232: Clean up LLWorldMapView a bit.
...
Avoid a static variable hack and convert a few related variables/methods to non-static as well
2022-04-05 11:55:34 -07:00
d3a616122f
SL-15232: Test to scroll mouse wheel to map position on main map/minimap
2022-04-05 11:55:34 -07:00
8b92652806
SL-16386 replace gutted LLRender::setAlphaRejectSettings() with explicit flush()
2021-11-30 17:04:35 -07:00
91fa31c065
Downstream merge from lindenlab/viewer-serval
2019-11-12 04:24:35 +02:00
418308bc7c
Characters can have more than one representation in LLFontFreetype
...
* By default all viewer text will use B/W glyphs
* Added temporary use_color attribute to LLTextBase for testing
2019-11-06 12:34:26 +01:00
7c9e92f494
SL-12016 Mini-map avatar icon (Z-position) fix
2019-09-26 19:24:54 +03:00
be7713cab2
Merged in lindenlab/viewer-release
2019-08-14 15:02:56 +03:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
91edfab36b
Merged in default (pull request #56 )
...
SL-10898[Mac] Camera spins and pulls back when using alt+zoom with mouse
Approved-by: Maxim Nikolenko
Approved-by: Andrey Lihatskiy
2019-05-23 14:34:10 +00:00
0dd7ac4a8d
SL-10898[Mac] Camera spins and pulls back when using alt+zoom with mouse
2019-05-21 20:09:23 +03:00
1470e82c89
Merged in lindenlab/viewer-release
2019-04-02 21:51:54 +03:00
f632b4deae
Fixed ( #3 )
2019-03-13 17:35:35 +02:00
9a0f376708
SL-8963 Fixed Long name of region overlaps with next one on the World map
2019-01-03 16:45:17 +02:00
acc86a9139
SL-9766 [Render] [Mac] Alt + left mouse click has severely impaired functions
...
SL-10019 - [Mac] [Render] Right-click context menu immediately disappears when clicking any place in the ‘Inventory’ floater
SL-9984 - [Retina] Camera frustum, do not display correctly on "WORLD MAP" window.
SL-10027 - [Mac] [Render] Add toggle for Retina support to mitigate FPS loss
Re-FIX for Retina support.
2018-11-26 18:02:44 +02:00
f3a42d070e
SL-9984 - [Retina] Camera frustum, do not display correctly on "WORLD MAP" window.
2018-10-31 18:11:00 +02:00
f1d4e788e7
SL-967 simplify viewer log file field syntax
...
MAINT-8991: only escape log message characters once, add unit test
remove extra log line created by LL_ERRS
document that tags may not contain spaces
2018-08-29 16:43:45 -04:00
5356e8b81a
SL-10043 FIXED Viewer crashes when double-clicking 'For sale' parcel icon on World map in some cases
2018-11-12 17:24:03 +02:00
dedaabe9ec
MAINT-1251 Fixed Search Error when Double Clicking on Sales Tags in WorldMap
2017-12-20 18:46:41 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
577a3973ea
Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-10-20 14:00:39 -07:00
a5568f942b
Merge downstream version 3.7.8 code
2014-05-07 15:28:13 -07:00
6ca7c588a8
MAINT-3871 FIXED Recent issues with dragging the World Map.
2014-03-28 19:09:38 +02:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
b1c943859b
MAINT-3250 FIXED [TUI] Dragging on the Map does not working correctly
2013-10-23 18:11:56 +03:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -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
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
1d8e3997c8
Pull and merge latest viewer-beta
2013-03-22 14:17:26 -07:00
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05:00
8de397b19e
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
c294c7c474
CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux
2013-03-16 16:09:50 -07:00
e8dfa28697
Rollback Maestro interp changes
2013-03-14 14:12:26 -07:00
9150757c81
More fixes for gcc-4.6 breakage
2013-03-13 21:01:50 +00:00
1586107e87
SH-3944 WIP CHUI merge fixing
...
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
Andrey Kleshchev