1ed76c382e
MAINT-5011: Add llexception_test.cpp with tests (and conclusions).
...
llexception_test.cpp is an unusual test source in that it need not be verified
on every build, so its invocation in indra/llcommon/CMakeLists.txt is
commented out with that remark. Its purpose is to help a developer decide what
base class(es) to use for LLException, how to throw and how to catch.
Our current conclusions are written up as comments in llexception_test.cpp.
Added CRASH_ON_UNHANDLED_EXCEPTION() and LOG_UNHANDLED_EXCEPTION() macros to
llexception.h -- macros to log __FILE__, __LINE__ and __PRETTY_FUNCTION__ of
the catch site. These invoke functions in llexception.cpp so we don't need to
#include llerror.h for every possible catch site.
2016-08-17 10:45:06 -04:00
7104ededb5
FIX INTL-224 Viewer Set45 translation for bento-box in 9 languages
2016-08-16 17:47:49 -07:00
b0d64742a1
Merge viewer-vob
2016-08-16 23:15:32 +02:00
948ba69369
Sync llpanelsnapshotinventory.cpp with upstream
2016-08-16 23:15:13 +02:00
2ea16530f6
Merge Firestorm LGPL
2016-08-16 23:10:13 +02:00
39a0c35814
merge
2016-08-16 15:39:04 -04:00
6d2770290e
merge
2016-08-16 15:34:18 -04:00
05e77c5f26
Merge VOB with 4.0.8-release
2016-08-16 20:40:57 +03:00
b240c494c4
Re-delete VSTool.exe invocations from autobuild.xml.
...
The CMake invocations are controlled by UNATTENDED -- these were not. Let
CMake do it if it must be done.
2016-08-16 11:03:03 -04:00
d85bc7de7f
MAINT-6637 DebugAvatarAppearanceMessage incorrectly reports all avatars received COF version as -1
2016-08-16 17:48:52 +03:00
0f06168991
MAINT-6655 Group inspector doesn't support default icon.
2016-08-17 20:35:00 +03:00
c5d3925fbd
Updated Polish translation
2016-08-16 16:07:58 +02:00
9044a8b815
merge
2016-08-15 17:27:52 -04:00
f8f79c20ef
merge
2016-08-15 17:21:18 -04:00
b0c434fadf
Set CMake UNATTENDED variable to suppress VSTool in TC builds.
2016-08-15 17:15:31 -04:00
454da876dc
Backed out changeset e187a6b45ce6: restored VSTool et al.
2016-08-15 17:12:37 -04:00
ab4a681034
merge
2016-08-15 16:16:41 -04:00
b25ee9095d
Remove VSTool, its build info and all invocations.
...
VSTool manipulates the SecondLife.sln solution file for the convenience of a
developer subsequently running Visual Studio interactively. But the cost of
having it sometimes break TeamCity automated builds is too high -- especially
since we never expect to run Visual Studio interactively on a TC build host.
Also remove the CMake UNATTENDED variable that controlled it.
2016-08-15 14:13:56 -04:00
ffb27ed5ae
Merge bento-box
2016-08-15 16:55:40 +02:00
304b9726de
Merge Firestorm LGPL
2016-08-15 16:42:36 +02:00
57da9bcd1b
merge from viewer-release
2016-08-15 09:52:06 -04:00
70d1445b71
Merge with phoenix-firestorm-lgpl
2016-08-14 22:11:52 +02:00
b6e00e7152
Windows x86; Kill quicktime plugin.
2016-08-14 21:46:00 +02:00
2eadb31a05
Merge cleanup
2016-08-13 23:35:56 +02:00
f47958bd2b
Merged with default tip (Revision 56b0f696bd47)
...
--HG--
branch : Viewer-Build
2016-08-13 13:30:12 +02:00
76e0f641ce
Remove accidental debug leftover.
2016-08-12 20:50:29 +02:00
85a13b53f5
MAINT-6631 - reluctantly, added support for animation of collision volumes, to avoid breaking existing content.
2016-08-12 14:20:44 -04:00
1be22985af
Use NSIS for installation.
2016-08-12 16:55:26 +02:00
be8241270e
FIRE-19851: [BUG-37637] DebugAvatarAppearanceMessage incorrectly reports all avatars received COF version as -1
2016-08-12 13:22:20 +02:00
856f060d0a
FIRE-19799: Place details window keeps 'Loading...' estate information
2016-08-12 13:04:50 +02:00
64b9599f82
Winodws x64 - vlc binary.
2016-08-12 13:01:25 +02:00
cf812e60d2
Do not add /FIXED:NO to windows builds.
2016-08-12 12:07:43 +02:00
99cb6d04c2
Merge viewer-vob
2016-08-12 08:25:48 +02:00
3b51603c40
Undo mixing CMake output to stdout and stderr - we prefer unmangled output
2016-08-12 01:18:34 +02:00
97045e4f45
Merge viewer-bear
2016-08-12 00:38:23 +02:00
ef59928719
Clean up
2016-08-12 00:33:45 +02:00
18da7f067b
Merge Firestorm LGPL
2016-08-12 00:32:35 +02:00
34d0a43ec6
Merge Firestorm LGPL
2016-08-11 23:43:21 +02:00
cb89140d29
Merge LL release 4.0.7
2016-08-11 23:42:52 +02:00
fb1e569757
Merged in lindenlab/viewer-release
2016-08-11 22:59:39 +03:00
54b4ba2edc
Update German translation
2016-08-11 21:50:26 +02:00
b18cee4f33
Merge viewer-bear
2016-08-11 21:48:43 +02:00
6ff420d705
merge changes for 4.0.7-release
2016-08-11 15:36:09 -04:00
4fb100ac7a
increment viewer version to 4.0.8
2016-08-11 15:31:41 -04:00
e4a1b2c940
Added tag 4.0.7-release for changeset 33981d8130f0
2016-08-11 15:31:41 -04:00
29630be624
Merged in lindenlab/viewer-lynx
2016-08-11 21:14:29 +03:00
0b459defb2
Correct previous commit to include the original code so it doesnt get lost in merges.
2016-08-11 05:08:13 -07:00
0c114b17d7
Fix wording for the avatar render settings floater
2016-08-11 13:20:57 +02:00
d8e2714504
Change log message to not print out every time (prevents log spam when holding down the 5 key on the numberpad with numlock off).
2016-08-11 02:43:09 -07:00
0054c93c3f
Merge Firestorm LGPL
2016-08-11 00:17:47 +02:00
Nat Goodspeed