Commit Graph

37254 Commits (e6fc3528fdfd2a251571ef86f321e321865d4592)

Author SHA1 Message Date
andreykproductengine 596018361c MAINT-965 FIXED Teleport to friend location in world map omits Z value 2016-12-26 19:08:46 +02:00
andreykproductengine 4fc012fbfa Reverted changeset 409b67af8faf (MAINT-6901) 2016-12-23 15:16:50 +02:00
Nat Goodspeed eff6bbea59 DRTVWR-418: Emit less confusing error message when LL_BUILD not set.
When LL_BUILD is not in the environment at autobuild configure time, important
macros such as LL_WINDOWS aren't set. That means that platform-dependent
macros such as LL_TYPEOF() aren't defined, which can produce obscure errors
like this:

indra\llcommon\llunittype.h(51): error C2226: syntax error :
unexpected type 'S' (packages\llphysicsextensions\stub\LLPhysicsExtensionsStubImpl.cpp)
10>          indra\llcommon\llunittype.h(52) :
see reference to class template instantiation 'LLResultTypeAdd<S,T>' being compiled

Make the CMake logic fail with a more readily-understood error in that case.
2016-12-22 16:12:21 -05:00
Nat Goodspeed 5bb619da97 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2016-12-22 15:12:31 -05:00
Nat Goodspeed eaeadf71e0 DRTVWR-418: If we don't produce a symbol file, don't try to upload it. 2016-12-22 15:11:37 -05:00
Oz Linden 0131e8a081 one more try... also fixing setting of viewer_channel without quotes 2016-12-22 13:54:39 -05:00
Oz Linden 9c0536f099 remove the xcodebuild -quiet because Xcode 7 doesn't do it 2016-12-22 12:59:30 -05:00
Oz Linden b7d798069e merge trunk changes 2016-12-22 12:22:40 -05:00
Oz Linden 6ef555414d try again to actually fix the installer name function for Mac (and maybe Linux?) 2016-12-22 11:50:33 -05:00
Oz Linden be69197e0d merge changes from project trunk 2016-12-22 11:16:55 -05:00
andreykproductengine f08e6b873c MAINT-7024 Release notes page was requested prior to proxy initialization. 2016-12-22 17:34:40 +02:00
Oz Linden e9f5ed6591 fix installer name function for Mac (and maybe Linux?) 2016-12-22 10:18:48 -05:00
Nat Goodspeed aa2aa5e2da DRTVWR-418: Migrate HAVOK suppression from autobuild.xml to build.sh.
Turns out that without HAVOK, we can't build the PhysicsExtensions_TPV; but
the viewer's build.sh is unaware of CMake switches set in autobuild.xml.
Passing those CMake overrides in build.sh allows us to test that setting
elsewhere in build.sh to skip the PhysicsExtensions_TPV step -- instead of
failing the build.
2016-12-21 20:51:18 -05:00
Nat Goodspeed 7a83f26323 DRTVWR-418: Temporarily disable Mac generate_breakpad_symbols.py. 2016-12-21 19:11:58 -05:00
AndreyL ProductEngine 8f0cee0842 Merged in lindenlab/viewer-bear 2016-12-22 00:01:30 +02:00
AndreyL ProductEngine 29ff62c05d Merged in lindenlab/viewer-lynx 2016-12-22 00:00:58 +02:00
Oz Linden 04c7a7a64a try using xcodebuild -quiet 2016-12-21 16:40:23 -05:00
Brad Payne (Vir Linden) bffe9d87ce merge 2016-12-21 16:24:49 -05:00
Brad Payne (Vir Linden) 971ea9f3d7 MAINT-7005 - added ability to set base priority and joint priority in anim_tool.py 2016-12-21 16:18:51 -05:00
Nat Goodspeed 546ead3d61 DRTVWR-418: Update to llphysicsextensions 501678, 501679 2016-12-21 16:02:31 -05:00
Callum Prentice 60cbea4963 Automated merge with lindenlab/viewer64 and lindenlab/nat_viewer64 2016-12-21 11:22:39 -08:00
Nat Goodspeed a2a5bdf4b5 DRTVWR-418: Use ensure_equals() on iffy lerp test to display values. 2016-12-21 13:17:18 -05:00
Nat Goodspeed 594221790b DRTVWR-418: Fix a couple unused-variable fatal warnings in local builds.
If the only use of a variable is within llassert(), have to make the
declaration conditional on SHOW_ASSERT rather than guesswork about release
builds.
2016-12-21 12:46:28 -05:00
Callum Prentice 84bf05e003 Automated merge with head of lindenlab/nat_viewer64 2016-12-21 09:04:26 -08:00
Nat Goodspeed 03d65d4ec4 DRTVWR-418: Deal with fatal warning 'unsafe mix of bool and BOOL' 2016-12-21 11:33:58 -05:00
Andrey Kleshchev c496269f59 Merged in MAINT-3609 2016-12-21 18:08:59 +02:00
Nat Goodspeed b3212f873d DRTVWR-418: Harmless change to kick the TeamCity build. 2016-12-21 10:43:42 -05:00
Mnikolenko Productengine 18c4639812 MAINT-7021 Add minimum width for statistics floaters 2016-12-21 13:09:07 +02:00
AndreyL ProductEngine e48af9ba0f MAINT-7020 llui/llfloater.cpp should not access settings 2016-12-21 06:57:49 +02:00
Nat Goodspeed 1cbdfce396 DRTVWR-418: Avoid constructing symlink cycle for CEF framework. 2016-12-20 21:27:40 -05:00
Callum Prentice d34530fd07 DRTVWR-418 fix BOOL/bool comparison that errors out as as warning on VS 2013 builds 2016-12-20 16:28:53 -08:00
Oz Linden 725ba32d08 don't add llcorehttp to all tests 2016-12-20 17:18:56 -05:00
Nat Goodspeed 7359ec3ed8 DRTVWR-418: Temporarily suppress Havok in darwin64 builds. 2016-12-20 16:46:06 -05:00
Nat Goodspeed e575abe99f DRTVWR-418: Create CEF framework symlink from LLCefLib Helper.app.
Without that symlink, the helper app can't find CEF and we get no web content.
2016-12-20 16:44:51 -05:00
Nat Goodspeed a1a395b679 DRTVWR-418: Make viewer_manifest.py copy current libexpat.1.dylib. 2016-12-20 15:42:57 -05:00
Nat Goodspeed 8643954c70 DRTVWR-418: Update GLOD with build that's really 64-bit on Mac. 2016-12-20 15:11:20 -05:00
Nat Goodspeed be3e3fca32 DRTVWR-418: Fix libhunspell references to reflect current package. 2016-12-20 15:05:02 -05:00
Oz Linden c20e57c48f move debugging globals to the "lowest" library they are referenced in 2016-12-20 14:41:46 -05:00
Nat Goodspeed 6bc9504248 DRTVWR-418: Rationalize LLPipeline API.
Someone evidently figured every static LLPipeline method should have at least
one void* parameter. There were methods requiring void* parameters that were
completely ignored.

More to the point, there were methods whose callers have a U32 in hand -- and
which want to use a U32 -- but which bizarrely forced callers to cast to void*
just so the method could cast back to U32. In a 64-bit compile, this isn't
merely pointless, it's erroneous. Change all such methods to accept U32;
remove (void*) casts from call sites.

While at it, fix LLPipeline API to use bool, true, false rather than their
obsolete all-caps predecessors. Once you eat that first potato chip... :-P
2016-12-20 11:44:16 -05:00
Oz Linden 498ffa1ace merge changes from project trunk 2016-12-20 11:14:51 -05:00
Nat Goodspeed bcb4f2900b DRTVWR-418: operator comparison methods should be const.
clang has started to reject our non-const comparison operator methods used
within standard algorithms.
2016-12-20 11:01:17 -05:00
Nat Goodspeed 65cf4912f6 DRTVWR-418: Another fix for std::string::find() return type. 2016-12-20 10:42:22 -05:00
andreykproductengine 07a201094a MAINT-3609 The sun was jumping acros the sky at set time 2016-12-20 17:19:54 +02:00
Nat Goodspeed 573287b50f DRTVWR-418: Fix API for LLTracker::stopTracking().
The signature for LLTracker::stopTracking() was silly: it accepted a void* for
the sole purpose of testing whether it was NULL. In other words, the parameter
was really a bool in void* clothing. Most callers passed NULL.

What got ugly was when you wanted to pass 'true', or a variable bool value.
Such values had to be cast to void*. In 64-bit land, the compiler correctly
flags that as extremely dubious practice.

But it's entirely unnecessary. Since stopTracking() wants a bool, change its
parameter to bool. Everybody wins.

(While at it, change a few related method params from BOOL to builtin bool.)
2016-12-20 09:44:10 -05:00
Nat Goodspeed 2499f6bcff DRTVWR-418: Casting pointer to BOOL is just wrong.
Since BOOL is simply a typedef for int, casting a 64-bit pointer to 32-bit int
is correctly diagnosed by the compiler as an error.

What works is to cast the pointer to (lowercase) bool, the builtin type, which
engages the compiler's test for "is this pointer NULL?"
2016-12-20 09:39:31 -05:00
Mnikolenko Productengine eee5f574fd MAINT-7012 FIXED Crash in LLPanelEditWearable::isDirty() 2016-12-20 16:38:18 +02:00
Nat Goodspeed 42b8895c54 DRTVWR-418: Untangle LLWLParamKey, LLWLAnimator circularity.
LLWLAnimator stores a std::map<F32, LLWLParamKey>. But llwlanimator.h only
forward-declared LLWLParamKey, begging the question of how this ever compiled
on any previous platform.

LLWLParamKey was declared for real in llwlparammanager.h, so the obvious fix
is to #include "llwlparammanager.h" in llwlanimator.h. Unfortunately this
doesn't work because llwlparammanager.h already #includes "llwlanimator.h".

As the dependency is specifically on LLWLParamKey, which isa LLEnvKey, which
is declared in llenvmanager.h, move LLWLParamKey to llenvmanager.h. Then we
can #include "llenvmanager.h" in llwlanimator.h instead of merely forward-
declaring LLWLParamKey.

This migration compiles LLWLParamKey in a context in which LLTrans isn't
visible. It's not really clear why all LLWLParamKey's methods are inline, but
toString() -- the method that requires LLTrans -- isn't going to be fast in
any case. Break toString() out to llenvmanager.cpp, and #include "lltrans.h"
there.
2016-12-20 09:33:40 -05:00
Nat Goodspeed c992a6df9f DRTVWR-418: std::string::find() returns std::string::size_type.
Storing it in a U32 and then comparing it to std::string::npos isn't going to
work in 64 bit land.
2016-12-20 09:20:38 -05:00
Nat Goodspeed 553f9843b0 DRTVWR-418: Update to darwin64 llceflib with libc++, not libstdc++. 2016-12-19 23:00:34 -05:00
Nat Goodspeed 555259e50f DRTVWR-418: Avoid casting sa_sigaction to unsigned int for comparing.
It's not really clear to me why the original coder felt it necessary to cast
the two sigaction::sa_sigaction fields to unsigned int in the first place, but
in a 64-bit clang compile, that discards information.
2016-12-19 22:51:40 -05:00