176b886174
merge changes for 5.1.5-release
2018-05-31 17:36:30 -04:00
c0e00cc617
merge changes for 5.1.5-release
2018-05-31 17:35:35 -04:00
40d4e8b2e6
increment viewer version to 5.1.6
2018-05-31 14:32:43 -04:00
a51ce32598
Added tag 5.1.5-release for changeset 2ea47f358b17
2018-05-31 14:32:43 -04:00
d2fa5a53e8
remove unused UNATTENDED cmake variable that generates warnings
2018-05-30 13:14:43 -04:00
837ca22924
set shell nullglob option
...
so that when a glob has no expansion you don't get the glob back (
*.sh expands to empty rather than to "*.sh")
2018-05-30 10:36:23 -04:00
0fedc97f3f
always run tests
2018-05-30 10:32:47 -04:00
39bcae574f
merge
2018-05-30 14:02:18 +01:00
71fa94b366
[MAINT-8693] - fix null check
2018-05-30 05:51:37 +05:30
0a36c8d3be
MAINT-8689 Potential crash fix
2018-06-07 20:10:24 +03:00
1fe32c16fb
Merged in lindenlab/viewer-bear
2018-06-02 02:18:57 +03:00
18bb3f6b86
MAINT-8712 Crash on close in LLWindowWin32
2018-06-01 13:51:03 +00:00
c767c906b2
MAINT-8714 Eliminate viewer duplicated ID nodes
2018-06-01 14:14:02 +03:00
9437d1511e
merge from viewer-release
2018-06-01 01:18:47 +03:00
b1f2b35079
MAINT-8702 FIXED Uploading any item results in opening previous Item Profile instead of Inventory Floater
2018-05-31 18:24:42 +03:00
f2113a037c
MAINT-8700 Remove obsolete code and update 'Save texture' file dialog
2018-05-31 14:59:31 +03:00
31bfc7ff47
MAINT-8700 FIXED The File dialog disconnects the viewer if you do not choose upload files within the first minute
2018-05-30 18:31:30 +03:00
e56be73dc6
merge changes for MAINT-8675
2018-05-29 11:50:14 -04:00
c18a4cb011
merge changes for 5.1.4-release
2018-05-29 11:49:46 -04:00
77344afa8b
additional debug logging for voice startup
2018-05-29 11:46:03 -04:00
177f24f56f
MAINT-8586 Eliminate obsolete xui elements
2018-05-29 17:26:10 +03:00
6b17202a07
Automated merge with ssh://bitbucket.org/lindenlab/viewer-bugsplat
2018-05-26 08:45:19 -04:00
a5c17472fb
SL-823: Fix typo in code that sets up BugSplat.
2018-05-26 08:44:57 -04:00
3ca76065b0
SL-823: Fix minor compile errors in code to read build_data.json.
2018-05-25 19:02:53 -04:00
9e58cb266c
MAINT-8693 Fixed crashes during login if you wear a BOM tattoo layer
2018-05-25 21:11:54 +00:00
8781b36d7e
SL-821: export BUGSPLAT_DB when loaded so child processes can detect.
...
Produce CMake message when BugSplat is engaged so we can detect in build log.
Don't try to copy BugSplat DLLs when NOT engaged.
2018-05-25 16:08:00 -04:00
63fe7d802a
SL-821, SL-826: Use BUGSPLAT_DB from environment on Windows and Mac.
...
On TeamCity, set BUGSPLAT_DB from build-secrets.
Use the presence of $BUGSPLAT_DB, rather than a new CMake BUGSPLAT option, to
control whether CMake searches for BugSplat -- and passes LL_BUGSPLAT into C++.
When BUGSPLAT_DB is present, make viewer_manifest.py set "BugSplat DB" in
build_data.json, and "BugsplatServerURL" in Mac Info.plist.
Make llappviewerwin32.cpp read "BugSplat DB" from build_data.json.
Add placeholders for Mac hooks to suppress BugSplat prompt and send
SecondLife.log.
2018-05-25 12:09:50 -04:00
fadb6c7c65
MAINT-8459 Save favorite places and landmarks to Location Bar history list
2018-05-25 18:00:57 +03:00
86ffcca293
MAINT-8674 Fixed logs
2018-05-25 16:01:59 +03:00
c10f8b1aa4
MAINT-8674 Clean up already requested ids.
2018-05-25 12:34:14 +00:00
bcb5336958
Merged in andreyl_productengine/viewer-neko-marchcat (pull request #613 )
...
MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
2018-05-25 08:35:51 +00:00
a28a3b756d
MAINT-8694 FIXED Typo in logging
2018-05-25 11:32:15 +03:00
b3822148e1
merge Nat's fix for llcorehttp test
2018-05-24 16:25:14 -04:00
1892d7e5cf
Merged in nat_linden/maint-maint-8675
2018-05-24 23:13:15 +03:00
0ebdfaa5fc
Automated merge with ssh://bitbucket.org/nat_linden/maint-maint-8675
2018-05-24 16:07:29 -04:00
ec8ee33939
MAINT-8675: In Darwin-specific CMake, use cp, not cmake -E copy.
...
cmake -E copy does only one file at a time, and older CMake versions don't
handle wildcards. But cmake -E copy is specifically for portability. When the
copy operation itself is Darwin-only, we can count on having 'cp' available.
2018-05-24 16:01:50 -04:00
3d1e368ad9
govern running tests with the LL_TESTS variable, default ON
2018-05-24 15:42:51 -04:00
93e7f9c8e2
Merged in oz_linden/maint-8675
2018-05-24 20:32:09 +03:00
5b943c698a
MAINT-8634 Hide texture UUIDs for non-gods
2018-05-24 18:14:54 +03:00
b247c4e424
SL-821: Force the Mac -rpath linker switch using LINK_FLAGS property
...
instead of the INSTALL_RPATH CMake property, which _should_ have worked.
2018-05-24 08:48:00 -04:00
a0d24f18b7
MAINT-8687 Add a hotkey for Advanced > Set UI Size to Default
2018-05-24 14:02:51 +03:00
809e5563db
Merge
2018-05-24 02:55:22 -07:00
f277aed218
[DRTVWR-455] - add new bake testure and tattoo slots
2018-05-24 01:17:07 -07:00
c665a05b78
Automated merge with ssh://bitbucket.org/oz_linden/maint-8675
2018-05-23 17:10:08 -04:00
c730ae22f8
fix tests broken by argument added to LLTrans::getString
2018-05-23 17:03:34 -04:00
fe8c976abe
MAINT-8675: update expired certs in integration test
2018-05-23 17:02:49 -04:00
43716d5800
SL-821: Try again to add -rpath to Mac executable for BugSplat.
2018-05-23 15:48:58 -04:00
07ebe236a1
SL-824: Update to bugsplat build 515662
2018-05-23 11:31:13 -04:00
f42929db2a
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2018-05-23 11:19:53 -04:00
78dbccf14a
SL-824: Update to bugsplat build 515657
2018-05-23 06:42:23 -04:00
Oz Linden