58ceaacafd
SL-16698 Replace tabs with spaces in Scripts
2022-05-13 19:31:47 +03:00
2b93c5cf07
LL, please fire your UX/UI person! Thank you!
2022-05-13 11:04:25 +02:00
c6568e81a4
Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/panel_profile_classifieds.xml
# indra/newview/skins/default/xui/en/panel_profile_picks.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2022-05-13 10:46:20 +02:00
1f486a3441
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-05-13 10:41:56 +02:00
d734801775
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-05-12 23:15:15 +02:00
924e347a6f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-05-12 23:07:12 +02:00
26ee1cc148
SL-15312 New group visibility toggle.
2022-05-12 23:44:47 +03:00
c21efc97e7
Update notifications for other languages
2022-05-12 22:42:27 +02:00
b8ee2c395e
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-05-12 22:39:39 +02:00
404ec2ea66
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-05-12 22:38:07 +02:00
8a8458ec51
Update German translation
2022-05-12 22:36:39 +02:00
266b5bd20c
Merged in SL-12238 (pull request #979 )
...
SL-12238
Approved-by: Andrey Kleshchev
2022-05-12 17:24:55 +00:00
44f70be1e4
Merged DRTVWR-544-maint into SL-12238
2022-05-12 17:09:30 +00:00
8f4c9db85c
FIRE-31653: fix crash when pressing ctrl+f in group ban panel by adding search field
2022-05-12 18:19:24 +02:00
915de3eb55
Merge remote-tracking branch 'origin/SL-17243' into DRTVWR-544-maint
2022-05-12 16:06:37 +03:00
57ae9c4dc4
SL-17243 - moved inventory warnings to a map
2022-05-12 13:39:01 +01:00
4cfcbca748
SL-12238 - error message to match new limits
2022-05-11 18:17:20 -07:00
3cefd6bd17
SL-12238 - bump terrain texture size limit to 1024
2022-05-11 15:33:42 -07:00
3915c8417d
SL-17243 - ViewerStats includes details on warning conditions in inventory, if any are encountered.
2022-05-11 21:19:55 +01:00
1e84d0e649
SL-15312 Profiles tweaks
...
Fix loading indicators to be at the center of picls and classified
Hide classifieds and picks related buttons for other agents
10px distance from image
Fix chat history menu button not working
Changed 'partner' field behavior
Prevent selection of disabled FL text field
2022-05-11 22:10:12 +03:00
6309500557
SL-17356 Viewer changes for Premium Plus support
2022-05-11 21:05:46 +03:00
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
7565e734d2
SL-2243 - match server physics shape calculation re mesh dimensions
2022-05-10 14:57:24 -07:00
3cd356f063
Replace fs_try_path with path_optional
2022-05-10 19:17:02 +02:00
c9407feece
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-05-10 19:14:02 +02:00
4d993db23f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-05-10 19:10:53 +02:00
f0fa74fde7
SL-17376 Do not fail build if vcruntime140_1 is missing
...
If there is no vcruntime140_1 in the build system, it is likely that file is not required for the viewer to run.
2022-05-10 18:53:33 +03:00
67caeafccb
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-05-10 17:27:35 +02:00
c6443ee2bf
Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer
2022-05-10 17:27:06 +02:00
d149a3b782
FIRE-31628 Use OpenSim collision sounds when in OpenSim
2022-05-10 15:13:10 +01:00
c0adc5e181
SL-17376 Fix viewer failing due to missing vcruntime140_1
2022-05-09 21:22:22 +03:00
76beebae68
SL-15312 Fixed picks tabs being too thin
2022-05-09 20:53:21 +03:00
89eb0fc5a6
FIRE-31642 French translation update, by Laurent Bechir
2022-05-08 17:05:21 +02:00
39ab2fb3fe
SL-16937 Replace sendAvatarPropertiesUpdate with profile cap in preferences
...
To avoid data loss, old api trims profile descriptions
2022-05-08 13:31:50 +03:00
6b0427dbc2
- Slightly better documentation string for --configuration, as this really is used for the configs build subdirectory.
...
- Always pass the correct configuration for --buildtype
- Use 'buildtype' when determining defbug/release/... build. --configuration should not be used for this, as it is the subdirectories name (CMAKE_CFG_INTDIR)
2022-05-08 01:34:21 +02:00
62053e1e88
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-05-07 18:10:29 +02:00
42820f834f
Remove unused LL_ARCH/LL_ARCH_DIR
2022-05-07 17:29:16 +02:00
07a7c4e190
ADDRESS_SIZE auto detection was broken with python3, fix this.
...
- Simplify detection by using regex
- OSX is always 64 bit
2022-05-07 17:23:20 +02:00
d6c170a66d
Cache ENV{LL_BUILD} to LL_BUILD_ENV:
...
- ENV{LL_BUILD} takes precedence
- if ENV{LL_BUILD} is not set but LL_BUILD-ENV is, set ENV{LL_BUILD} to
the cached version
- error if none of the two is set
Caching the variable and reusing it lets cmake run when not called by
autobuild itself. This happens when xcode or visual studio detect it
needs to be re rerun and call it for the "cmake" target. Not having
LL_BUILD then makes those targets fail.
2022-05-07 17:00:27 +02:00
09e38c5caa
Remove logging.
2022-05-07 17:00:01 +02:00
767464a262
Adapt gnerator expression usage to work on OSX.
2022-05-07 02:19:51 +02:00
ca24fc11ea
SL-17375 Crash at LLViewerOctreeEntry::getSpatialExtents()
...
access violation, 'this' was null
2022-05-06 20:55:41 +03:00
3c215ee885
SL-17356 Viewer changes for Premium Plus support
2022-05-06 10:22:49 +03:00
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
77d10601c7
SL-16916: Fix incorrect defaults for minimap rotation and minimap scale
2022-05-05 10:36:26 -07:00
43517c5adc
SL-17244 Fix 'empty leaf' crashes
2022-05-05 19:41:56 +03:00
bfbff7df50
FIRE-31631, FIRE-31632 Updated French (Laurent Bechir) and Russian (Romka Swallowtail) translations for MFA merge
2022-05-05 18:26:16 +02:00
3b92b326b8
Merge branch 'master' into starlight
2022-05-05 16:44:12 +02:00
711799a7d5
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-05-05 11:28:38 +02:00
a3f0779309
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-05-05 11:21:37 +02:00
Mnikolenko Productengine