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
f9f11a7782
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 18:40:01 +02:00
ad0aa3422f
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-04-19 00:23:41 +02:00
07040f7eb0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 00:15:01 +02:00
b5406352e9
DRTVWR-548 post-merge build fix
2022-04-19 00:01:52 +03:00
16494f4400
Merge branch 'master' into DRTVWR-548-maint-N
2022-04-18 20:38:56 +03:00
d031662435
Increment viewer version to 6.5.5
...
following promotion of DRTVWR-540
2022-04-18 13:25:21 -04:00
40aeff848c
[FIRE-31581] - OpenSim Hypergrid hop causes inifinite loop in voice reconnect.
2022-04-15 02:22:43 +01:00
199db94c3b
[FIRE-31552] Glowing, 100% transparent prims now glow again
...
restore glow behaviour aligned with LL viewer.
(also minor whitespace change on voavatar cos annoying.)
2022-04-11 01:23:31 +01:00
24542062c5
[FIRE-31567]+more - A few bake fixes for opensim (Ubit, Beq and Rye)
2022-04-10 17:48:11 +01:00
7e0e58c55f
SL-17092 Fix a gesture upload crash
2022-04-07 11:11:39 +03:00
651610d754
SL-17167 FIXED Crash in LLFloaterHoverHeight::onSliderMoved
2022-04-06 21:04:38 +03:00
6367d1f02a
Merged in SL-17058 (pull request #934 )
...
SL-17058: Convert frustum on minimap to arc from triangle
Approved-by: Andrey Lihatskiy
2022-04-05 20:26:18 +00:00
c7d137067c
Merged in SL-15232 (pull request #933 )
...
SL-15232: Scroll mouse wheel to main map
Approved-by: Andrey Lihatskiy
2022-04-05 20:22:24 +00:00
268da74192
Merged in SL-16916 (pull request #932 )
...
SL-16916: Update minimap context menu
Approved-by: Andrey Lihatskiy
2022-04-05 19:10:26 +00:00
26d23e2e6d
Merged in SL-16918 (pull request #898 )
...
SL-16918: Improve click and drag on minimap
Approved-by: Andrey Lihatskiy
2022-04-05 19:02:04 +00: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
9bca1aa8fb
SL-15232: Clang format
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
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
288fbe2317
SL-15232: Fix top/right edges of main map not being scrollable
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
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
6013e68ea2
SL-16918: Fix unneeded assignment to centered in LLNetMap::draw()
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
1497177868
Merge remote-tracking branch 'origin/SL-16950' into DRTVWR-540-maint
2022-04-05 18:01:45 +03:00
c85eaa9aa6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-05 10:10:53 +02:00
3ab692e00c
FIRE-31074: Setting double-click actions via Advanced/Developer menu or CTRL-Shift-D shortcut doesn't work anymore
2022-04-05 10:10:37 +02:00
9bfcd7f470
Attempt to fix linux compiles
2022-04-05 00:08:47 -07:00
411f15635f
Do not copy all 32 bit dynamic sos as this causes problems with output device enumeration.
...
This will cause issues with the AppImage, so disable creation of the Appimage.
2022-04-03 17:52:20 +02:00
6da40d7ad4
Workaround for newer glibc, linking against libraries build on older versons results in missing symbols.
2022-04-03 01:13:04 +02:00
c0354a25c7
Don't use memset on non pop classes/structs.
2022-04-01 17:38:16 +00:00
d898151f25
Linux; update glib, fmodstudio and kdu
2022-04-01 15:25:40 +00:00
c006abd7fb
Update German translation
2022-03-31 12:25:10 +02:00
99c14e9db4
Update German translation
2022-03-31 12:24:00 +02:00
e893185d20
Remove invalid tooltips for mini map
2022-03-31 12:17:13 +02:00
81ec1bfb81
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-03-31 12:13:57 +02:00
76d9ed53a6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-31 09:57:42 +02:00
322320a90f
SL-16668 Enable/disable appropriate menu items in context menu
2022-03-30 18:29:33 +03:00
d97105663f
SL-17091 FIXED Walk/Run/Fly buttons are not clickable
2022-03-29 18:07:06 +03:00
9e2f571687
SL-17079: Merge 'sl-17079' into DRTVWR-540-maint for updater fix.
2022-03-28 16:43:22 -04:00
4ae2ce7d92
Update FMOD Studio to 2.02.06 on Mac
2022-03-28 17:19:25 +02:00
2a4cecdc6c
Update FMOD Studio to 2.02.06 on Windows
2022-03-28 11:15:02 +02:00
b93ebdbe45
[BUG-231970] Fix for mesh uploader preview not refreshing
2022-03-28 01:30:18 +01:00
f17f5ff272
SL-13792: Merge 'brad/viewer-manifest-codesign-fix' into sl-17079
2022-03-25 17:28:29 -04:00
9d7f8156c6
SL-17079: Update to viewer-manager build 569958
2022-03-25 15:53:28 -04:00
97dd49f023
FIRE-31486; Make UTF8 the default clipboard format
2022-03-25 18:23:44 +01:00
6fd157dfc9
FIRE-31482: Don't LL_ERRS out if parcel detail request fails in legacy search
2022-03-25 15:29:30 +01:00
0d280ae112
SL-17030 show particle age info
2022-03-24 17:49:55 +02:00
b146e70ce7
FIRE-31487 French translation update, by Laurent Bechir
2022-03-24 16:28:26 +01:00
Ansariel