Commit Graph

44604 Commits (6fb787cd10ea840a9d099715e7462bb5f29c5e6b)

Author SHA1 Message Date
Cosmic Linden 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
Mnikolenko Productengine eaf9171aca SL-17404 Adjust 'More' button width 2022-05-19 11:18:05 +03:00
Brad Payne (Vir Linden) b3bfe05494 SL-10025 - via Cathy Foil, all bones now have standard alias 'avatar_' + name.
# Conflicts:
#	scripts/content_tools/anim_tool.py
2022-05-18 23:31:08 +03:00
Brad Payne (Vir Linden) 307db06310 SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator.
# Conflicts:
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llvoavatar.cpp
#	scripts/content_tools/anim_tool.py
2022-05-18 23:30:02 +03:00
Brad Payne (Vir Linden) 4413f9be87 SL-288, SL-10163 - error reporting for animation upload failures. 2022-05-18 23:26:01 +03:00
Brad Payne (Vir Linden) f7edcab9c3 SL-288, SL-10163 - allow joint aliases, but otherwise reject upload of animations containing invalid joint names
# Conflicts:
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llvoavatar.cpp
2022-05-18 23:25:51 +03:00
Howard Stearns d35f4536cc Merged in SL-2243 (pull request #978)
SL-2243 - match server physics shape calculation re mesh dimensions

Approved-by: Andrey Kleshchev
2022-05-11 17:27:40 +00:00
Howard Stearns 7565e734d2 SL-2243 - match server physics shape calculation re mesh dimensions 2022-05-10 14:57:24 -07:00
Sabrina Shanman bb8bcce96e Merged in SL-16916 (pull request #971)
SL-16916: Fix incorrect defaults for minimap rotation and minimap scale

Approved-by: Andrey Lihatskiy
2022-05-05 18:04:38 +00:00
Cosmic Linden 77d10601c7 SL-16916: Fix incorrect defaults for minimap rotation and minimap scale 2022-05-05 10:36:26 -07:00
Andrey Kleshchev d647b75310 SL-17314 Location and label desync
Example: User can rename item in inventory, then attempt to save new landmark and changes will be lost
2022-05-05 01:05:01 +03:00
Andrey Kleshchev ad8634856d SL-17314 Don't focus inventory when handling landmark creation 2022-05-04 22:23:03 +03:00
Andrey Lihatskiy 0e4ffe41bc Merge branch 'master' into DRTVWR-548-maint-N 2022-05-04 18:50:43 +03:00
Nat Goodspeed bc7e2fb7e7 Increment viewer version to 6.5.6
following promotion of DRTVWR-550
2022-05-04 11:37:24 -04:00
Andrey Kleshchev 0569eb776c SL-16053 Landmark shouldn't be saved into location history 2022-05-03 22:25:46 +03:00
Mnikolenko Productengine ddaa0d84cc SL-17206 FIXED Unable to move an avatar after fall on the ground 2022-04-29 19:06:22 +03:00
Brad Kittenbrink 56a1bc850b SL-17223 fix unit tests with new method stub implementation 2022-04-25 13:44:38 -07:00
Brad Kittenbrink 372a04dd51 Fix for SL-17223 save mfa_hash protected store immediately so it doesn't get lost in case of crash 2022-04-25 12:35:07 -07:00
Andrey Lihatskiy b5406352e9 DRTVWR-548 post-merge build fix 2022-04-19 00:01:52 +03:00
Brad Kittenbrink e9921e77b0 Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa 2022-04-18 13:29:25 -07:00
Andrey Lihatskiy 16494f4400 Merge branch 'master' into DRTVWR-548-maint-N 2022-04-18 20:38:56 +03:00
Nat Goodspeed d031662435 Increment viewer version to 6.5.5
following promotion of DRTVWR-540
2022-04-18 13:25:21 -04:00
Andrey Kleshchev efb9df04c3 SL-16831 Don't wait for an updater on login failure unles it's the cause of failure 2022-04-15 20:53:21 +03:00
Andrey Kleshchev 7e0e58c55f SL-17092 Fix a gesture upload crash 2022-04-07 11:11:39 +03:00
Mnikolenko Productengine 651610d754 SL-17167 FIXED Crash in LLFloaterHoverHeight::onSliderMoved 2022-04-06 21:04:38 +03:00
Sabrina Shanman 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
Sabrina Shanman 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
Sabrina Shanman 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
Sabrina Shanman 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
Cosmic Linden 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
Cosmic Linden 9bca1aa8fb SL-15232: Clang format 2022-04-05 11:55:34 -07:00
Cosmic Linden bd87a5b942 SL-17058: Convert frustum on minimap to arc from triangle 2022-04-05 11:55:34 -07:00
Cosmic Linden 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
Cosmic Linden 288fbe2317 SL-15232: Fix top/right edges of main map not being scrollable 2022-04-05 11:55:34 -07:00
Cosmic Linden d3a616122f SL-15232: Test to scroll mouse wheel to map position on main map/minimap 2022-04-05 11:55:34 -07:00
Cosmic Linden 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
Cosmic Linden 6013e68ea2 SL-16918: Fix unneeded assignment to centered in LLNetMap::draw() 2022-04-05 11:55:33 -07:00
Cosmic Linden 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
Andrey Lihatskiy 1497177868 Merge remote-tracking branch 'origin/SL-16950' into DRTVWR-540-maint 2022-04-05 18:01:45 +03:00
Mnikolenko Productengine 322320a90f SL-16668 Enable/disable appropriate menu items in context menu 2022-03-30 18:29:33 +03:00
Mnikolenko Productengine d97105663f SL-17091 FIXED Walk/Run/Fly buttons are not clickable 2022-03-29 18:07:06 +03:00
Andrey Kleshchev d5f2537764 SL-16831 Fix unit test 2022-03-29 17:30:50 +03:00
Andrey Kleshchev 3feb92046f SL-16831 Viewer stalls for 10 seconds before displaying a login failure
# Conflicts:
#	indra/newview/llstartup.cpp
2022-03-29 16:22:11 +03:00
Nat Goodspeed 73e668139d SL-17079: Merge 'sl-17079' into DRTVWR-550-mfa for Mac updater fix. 2022-03-28 17:43:43 -04:00
Nat Goodspeed 9e2f571687 SL-17079: Merge 'sl-17079' into DRTVWR-540-maint for updater fix. 2022-03-28 16:43:22 -04:00
Nat Goodspeed f17f5ff272 SL-13792: Merge 'brad/viewer-manifest-codesign-fix' into sl-17079 2022-03-25 17:28:29 -04:00
Nat Goodspeed 9d7f8156c6 SL-17079: Update to viewer-manager build 569958 2022-03-25 15:53:28 -04:00
Mnikolenko Productengine 0d280ae112 SL-17030 show particle age info 2022-03-24 17:49:55 +02:00
Mnikolenko Productengine b3cd910e75 SL-17037 Center map on current location after teleporting 2022-03-23 15:37:58 +02:00
Brad Kittenbrink c8eb9f54c4 More DRTVWR-550 Teamcity build fix. another piece of python2 syntax leftover in an error handling block 2022-03-22 17:49:24 -07:00