f2f79ca9ce
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llvocache.cpp
# indra/newview/pipeline.cpp
2023-09-07 15:44:27 +02:00
b064b04077
Modern C++ thank you! Kokua can yoink the old stuff...
2023-09-03 19:35:23 +02:00
70e4fcaf94
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-06-27 12:21:43 +02:00
c8b7e97b45
More of "What is all this old crap?"
2023-06-25 18:37:32 +02:00
53f9163f52
Let's see if this fixes the issue with map texture not being rendered on minimap after teleport
2023-05-20 00:16:12 +02:00
1bdfb7df70
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-01 15:16:40 +01:00
b185f4730a
FIRE-32339: Fix mini map can't be dragged anymore
2022-10-25 11:33:29 +02:00
b388f738c4
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-10-21 12:38:02 +02:00
8b0d341aca
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 12:34:53 +02:00
58d6265662
SL-18423 Post-merge: restore RyeMutt's fix from SL-18412
2022-10-20 22:52:41 +03:00
e0ace0c722
Merge branch 'master' into DRTVWR-570-maint-Q
...
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
2022-10-20 22:34:11 +03:00
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
5456af4c8c
Fix various menu leaks and lazy creation in chiclets, bump floater, media controls, and the mini map
2022-10-19 16:28:34 -04:00
55f51f4829
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-31 17:02:33 +02:00
88d936111a
Small optimization for minimap - and use a big hammer on the contact sets to chuck c++17 code in while at it
2022-08-13 01:13:02 +02:00
7cc7b74778
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-05-26 11:48:40 +02:00
5cdd8cdb6e
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-05-26 11:43:21 +02:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
6fb787cd10
SL-17463: Set the default for MiniMapRotate back to true (enable minimap rotation by default), but set MiniMapRotate to false for new installs
2022-05-20 11:56:31 -07:00
f990515d35
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterhoverheight.cpp
# indra/newview/llfloatermap.cpp
# indra/newview/llfloatermap.h
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/colors.xml
# indra/newview/skins/default/xui/en/menu_mini_map.xml
2022-04-19 21:50:14 +02:00
d4cadd53d4
SL-17058: Remove redundant minimap frustum color, hopefully fixing mac build.
...
So THAT's why the frustum transparency was different when rotating...
2022-04-05 11:55:34 -07:00
bd87a5b942
SL-17058: Convert frustum on minimap to arc from triangle
2022-04-05 11:55:34 -07:00
f2b57ac03b
SL-16916: Grey out "About Land" button in minimap context menu when land info is likely unavailable
2022-04-05 11:55:33 -07:00
f1b7ba6c28
SL-16916: Update minimap context menu with new options and reworded existing options
...
Map rotation: Split minimap "Rotate Map" context menu option into two options: "North at top" and "Camera at top"
Zoom:
- Adjust minimap context menu zoom presets: New presets are "far", "medium", "close", and "very close"
- Change default minimap zoom level from 128 to 64
- Currently selected minimap zoom level is now checked
About Land: Add "About Land" button to minimap context menu
Reword: Rearrange and adjust capitalization of the various context menu options
Code change: Remove unused zoom handling code in LLFloaterMap
2022-04-05 11:55:33 -07:00
6013e68ea2
SL-16918: Fix unneeded assignment to centered in LLNetMap::draw()
2022-04-05 11:55:33 -07:00
81ec1bfb81
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-03-31 12:13:57 +02:00
39e553fc11
SL-16918: Re-add "Auto-center map" button to minimap context menu, enable minimap auto-center by default again
2022-03-03 17:12:50 -08:00
fcbd928679
SL-16918: Minimap navigation improvements: Drag without holding shift, remove auto center, click button to re-center
2022-03-03 17:12:50 -08:00
0e927e92f3
SL-16824: Fix minimap tooltip hint not updating until viewer restart (double click to show map vs double click to teleport)
2022-03-03 12:30:59 -08:00
81da0dd2db
SL-16824: Change minimap hover tooltip. Show parcel name, owner name, and/or for sale info when available. Remove "shift-drag to pan" hint.
2022-03-03 12:30:58 -08:00
898079a39b
SL-16857: Display parcel borders on the minimap, enable by default, right click context menu option to disable
2022-02-23 17:14:38 -08:00
8c2deb6f8d
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/lltracker.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
2022-02-22 14:52:56 +01:00
9f10853c03
SL-16887 FIXED Crash in LLNetMap::draw
2022-02-21 16:07:58 +02:00
028941652b
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
2021-12-01 22:29:25 +01:00
8b92652806
SL-16386 replace gutted LLRender::setAlphaRejectSettings() with explicit flush()
2021-11-30 17:04:35 -07:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00:00
50575bbcfb
Remove more avoidable per-frame getInstance calls
2020-10-16 20:05:32 +02:00
cddc7cb040
Merge branch 'rlva/development'
2020-09-19 13:31:34 +02:00
aebcd1855d
Change RLVa string constants over to opt-in constexpr string_views (but keep char* by default)
2020-09-16 01:35:44 +02:00
57feec9763
Merge branch 'viewer/build' of rlva/development
2020-03-21 11:26:59 +01:00
1ca7b29edf
Merge branch 'appearance/misc' into rlva/development
2019-12-27 15:49:47 +01:00
fd4b8a7bb1
Merge Firestorm LGPL
2019-11-12 18:45:02 +01:00
91fa31c065
Downstream merge from lindenlab/viewer-serval
2019-11-12 04:24:35 +02:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
146d527104
Merge viewer-neko
2019-10-09 22:05:52 +02:00
7c9e92f494
SL-12016 Mini-map avatar icon (Z-position) fix
2019-09-26 19:24:54 +03:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
fa5290386e
FIRE-22954 Make each chat range ring in the minimap optional
2018-08-21 08:20:24 -07:00
d046a9d965
FIRE-17460 Add Whisper Chat Ring to Minimap
2018-08-18 16:31:40 -07:00
Ansariel