4e904d615c
Automated merge with head of lindenlab/nat_viewer64
2017-01-03 09:27:30 -08:00
da1b3c6d39
Automated merge with head of lindenlab/viewer64
2017-01-03 09:27:12 -08:00
892d3207d6
Merged in lindenlab/viewer-lynx
2017-01-03 17:31:57 +02:00
af3aad098d
MAINT-900 fixed male gestures spelling mistake
2017-01-03 16:22:58 +02:00
ea65bc80c3
MAINT-7026 Teleport history info panel is shown when it shouldn't be after certain actions
2016-12-30 16:26:01 +02:00
6c023787cd
MAINT-2450 PRIM_MEDIA_PERMS_CONTROL shouldn't disable mouse wheel scrolling
2016-12-28 19:58:32 +02:00
c79dc296ad
MAINT-406 Ban and access limits no longer showing
2016-12-28 15:50:19 +02:00
ca5c706f64
MAINT-4097 User never de-clouds with a large inventory after inventory fetch
2016-12-27 20:15:08 +02:00
7191d43bdb
MAINT-1970 Inaccurate menu label in menu_gesture_gear
2016-12-27 16:57:48 +02:00
05c2c408a4
MAINT-3027 remove CameraAspectRatio from Debug Settings
2016-12-27 16:10:42 +02:00
92d84a9c36
MAINT-7022 Crash in LLFloaterIMContainer::visibleContextMenuItem()
2016-12-27 12:04:51 +02:00
596018361c
MAINT-965 FIXED Teleport to friend location in world map omits Z value
2016-12-26 19:08:46 +02:00
4fc012fbfa
Reverted changeset 409b67af8faf (MAINT-6901)
2016-12-23 15:16:50 +02:00
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
5bb619da97
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2016-12-22 15:12:31 -05:00
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
0131e8a081
one more try... also fixing setting of viewer_channel without quotes
2016-12-22 13:54:39 -05:00
9c0536f099
remove the xcodebuild -quiet because Xcode 7 doesn't do it
2016-12-22 12:59:30 -05:00
b7d798069e
merge trunk changes
2016-12-22 12:22:40 -05:00
6ef555414d
try again to actually fix the installer name function for Mac (and maybe Linux?)
2016-12-22 11:50:33 -05:00
be69197e0d
merge changes from project trunk
2016-12-22 11:16:55 -05:00
f08e6b873c
MAINT-7024 Release notes page was requested prior to proxy initialization.
2016-12-22 17:34:40 +02:00
e9f5ed6591
fix installer name function for Mac (and maybe Linux?)
2016-12-22 10:18:48 -05:00
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
7a83f26323
DRTVWR-418: Temporarily disable Mac generate_breakpad_symbols.py.
2016-12-21 19:11:58 -05:00
8f0cee0842
Merged in lindenlab/viewer-bear
2016-12-22 00:01:30 +02:00
29ff62c05d
Merged in lindenlab/viewer-lynx
2016-12-22 00:00:58 +02:00
04c7a7a64a
try using xcodebuild -quiet
2016-12-21 16:40:23 -05:00
bffe9d87ce
merge
2016-12-21 16:24:49 -05:00
971ea9f3d7
MAINT-7005 - added ability to set base priority and joint priority in anim_tool.py
2016-12-21 16:18:51 -05:00
546ead3d61
DRTVWR-418: Update to llphysicsextensions 501678, 501679
2016-12-21 16:02:31 -05:00
60cbea4963
Automated merge with lindenlab/viewer64 and lindenlab/nat_viewer64
2016-12-21 11:22:39 -08:00
a2a5bdf4b5
DRTVWR-418: Use ensure_equals() on iffy lerp test to display values.
2016-12-21 13:17:18 -05:00
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
84bf05e003
Automated merge with head of lindenlab/nat_viewer64
2016-12-21 09:04:26 -08:00
03d65d4ec4
DRTVWR-418: Deal with fatal warning 'unsafe mix of bool and BOOL'
2016-12-21 11:33:58 -05:00
c496269f59
Merged in MAINT-3609
2016-12-21 18:08:59 +02:00
b3212f873d
DRTVWR-418: Harmless change to kick the TeamCity build.
2016-12-21 10:43:42 -05:00
18c4639812
MAINT-7021 Add minimum width for statistics floaters
2016-12-21 13:09:07 +02:00
e48af9ba0f
MAINT-7020 llui/llfloater.cpp should not access settings
2016-12-21 06:57:49 +02:00
1cbdfce396
DRTVWR-418: Avoid constructing symlink cycle for CEF framework.
2016-12-20 21:27:40 -05:00
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
725ba32d08
don't add llcorehttp to all tests
2016-12-20 17:18:56 -05:00
7359ec3ed8
DRTVWR-418: Temporarily suppress Havok in darwin64 builds.
2016-12-20 16:46:06 -05:00
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
a1a395b679
DRTVWR-418: Make viewer_manifest.py copy current libexpat.1.dylib.
2016-12-20 15:42:57 -05:00
8643954c70
DRTVWR-418: Update GLOD with build that's really 64-bit on Mac.
2016-12-20 15:11:20 -05:00
be3e3fca32
DRTVWR-418: Fix libhunspell references to reflect current package.
2016-12-20 15:05:02 -05:00
c20e57c48f
move debugging globals to the "lowest" library they are referenced in
2016-12-20 14:41:46 -05:00
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
Callum Prentice