Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
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
Nat Goodspeed f130b648b4 DRTVWR-418: Use $LL_BUILD to set most switches in 00-Common.cmake.
Going forward, the intention is to set in 00-Common.cmake only switches not
already set for ALL viewer-related libraries in
https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables.

To that end, remove all switches redundant with settings from that file.
Remove redundancies within 00-Common.cmake.
Remove cruft testing for gcc versions older than 4.3.
2016-12-19 18:55:31 -05:00
AndreyL ProductEngine db8eb0f995 Merged in lindenlab/viewer-lynx 2016-12-20 00:25:34 +02:00
Nat Goodspeed 40fb9d3e58 DRTVWR-418: Use U32 for int (and hex) of HttpStatus in 64-bit too.
Turns out that Monty didn't intend for the int-flavored representation of
HttpStatus to expand to 64 bits even when unsigned long is that wide. So
change the implicit conversion operator, and its uses, to U32 instead. That
produces a consistent toHex() result for both 32-bit and 64-bit builds.
2016-12-19 16:30:19 -05:00
Nat Goodspeed 1df282efa1 DRTVWR-418: Fix streamtools test.
When std::istream::good() returns false, presumably we can no longer rely on
get() returning valid data. Certain streamtools tests were assuming that get()
would return the empty string at EOF, but in fact it appears that it left the
previous buffer contents unmodified.
2016-12-19 15:58:52 -05:00
andreykproductengine ccff36c8ee MAINT-7009 backing out changeset 638ac620a500 (MAINT-4576) 2016-12-19 20:06:11 +02:00
AndreyL ProductEngine 946b28ad76 Merged STORM-2142 2016-12-19 19:18:53 +02:00
andreykproductengine b05a8c3403 MAINT-7017 Stop All was preventing media from playing 2016-12-19 17:48:07 +02:00
andreykproductengine 41d72dab39 MAINT-6761 Video that is not playing or paused should be stopped 2016-12-19 16:55:31 +02:00
Nat Goodspeed fd79bb9c7d DRTVWR-418: Merge backout of TYPE_INDEX / TYPE_MAX change 2016-12-17 11:09:48 -05:00
Nat Goodspeed 4c95587dc3 Backed out changeset bb47510bda62: don't change TYPE_MAX.
Ruslan points out that changing TYPE_MAX could lead to extra (useless) render
passes. We will have to solve the TYPE_INDEX > TYPE_MAX problem another way.
2016-12-17 11:09:09 -05:00
Nat Goodspeed 1298961066 DRTVWR-418: Update dubious llvertexbuffer.cpp cast comment.
Ruslan assures me that in fact this usage is valid.
2016-12-17 11:07:20 -05:00
Nat Goodspeed 050294a23c DRTVWR-418: Fix a (correct) clang correctness complaint.
LLStatGraph::Threshold has an operator<(const Threshold& other) -- but because
the method itself wasn't marked const, it could only be used on a non-const
instance. This change fixes a case when it was applied to const instances.
2016-12-16 19:14:55 -05:00
Nat Goodspeed c1ae63a872 DRTVWR-418: Work around dubious cast from S32 to GLvoid*
when passing -- something -- to glVertexAttribPointerARB() in
LLVertexBuffer::setupVertexArray().
2016-12-16 19:08:24 -05:00
Nat Goodspeed a4b0159d57 DRTVWR-418: Adjust HttpStatus::toHex() test for 64-bit result. 2016-12-16 19:05:59 -05:00
Nat Goodspeed 93268cb47a DRTVWR-418: Put TYPE_INDEX within TYPE_MAX: stop undefined indexing.
LLVertexBuffer::TYPE_INDEX was past TYPE_MAX, which is used to set the maximum
sizes of various (scattered) arrays, bleh. The alarm bells that this SHOULD
set off are indeed correct: TYPE_INDEX was being used to index at least one of
those arrays, meaning we've been indexing past the end of that array, meaning
undefined behavior.

The enum that defines both TYPE_INDEX and TYPE_MAX provides a helpful comment
indicating what things must be updated when modifying the enum. (Far better to
define things centrally in a single place... but another time.) Update the
designated arrays to include a final TYPE_INDEX entry. Contents of those
entries are wild guesses -- but even wild guesses are better than completely
indeterminate data.
2016-12-16 17:03:45 -05:00
Oz Linden 17ca7fc38d merge latest integrations from callum 2016-12-16 09:09:48 -05:00
Nat Goodspeed aa5a591aa7 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2016-12-16 08:55:38 -05:00
Oz Linden 058ac4ba50 merge updates from nat 2016-12-16 08:18:08 -05:00
Mnikolenko Productengine cc9ad710c2 MAINT-6899 Reduce width of floater tabs 2016-12-16 12:42:27 +02:00
Callum Prentice c9f6905e60 Pull in an updated version of FMODEx with crash fixes (version 4.44.61 -> 4.44.64) 2016-12-15 16:24:50 -08:00
Nat Goodspeed 89cd49f60f DRTVWR-418: -Wl,-no_compact_unwind switch breaks exception catching!
In a clang 64-bit compile, with that switch set in CMAKE_CXX_LINK_FLAGS, we
cannot catch any user exception. This shows up right away because TUT relies
on internal exceptions to walk through test<n>() test methods, but of course
being unable to catch any exceptions in the viewer would be just as bad.

A quick Google search turned up lots of people mentioning -no_compact_unwind
without finding any documentation about what it's supposed to be good for. But
since no tests work with it, whereas they work without it -- kill it.
2016-12-15 16:41:30 -05:00
Callum Prentice 067468885a BUG-41027 (FIX) Changing login location at the login screen crashes the viewer 2016-12-15 10:58:23 -08:00
Cinder a6cda1ee06 STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login. 2016-12-15 09:34:04 -06:00
Mnikolenko Productengine e62444c0e7 MAINT-7443 FIXED Able to Block a user with Lastname Linden 2017-05-29 11:30:07 +03:00
andreykproductengine fe49c1e8a5 MAINT-1139 Catch Windows crash on Saving snapshot 2017-05-26 15:11:37 +03:00
andreykproductengine bb8609fa94 MAINT-5100 Fixed viewer not finding sky files at login 2017-05-25 18:09:52 +03:00
Mnikolenko Productengine 561cee12d8 MAINT-2585 Make permission request notifications permanent until action taken 2017-05-25 16:51:45 +03:00
Mnikolenko Productengine 7021f95b5b MAINT-7436 FIXED [viewer-neko] Crash occurs when trying to highlight non-existent(or removed item) using SLURI 2017-05-24 17:28:30 +03:00
andreykproductengine 5db0af5327 MAINT-7419 Workaround for some purge and trash issues, stuck descendants count 2017-05-22 20:24:45 +03:00
Mnikolenko Productengine b4e5435217 MAINT-7434 FIXED SLURL instead of username appears in "have said something new" text for some messages 2017-05-24 11:06:21 +03:00
Andrey Lihatskiy a01b7fc281 Merged in andreyl_productengine/viewer-neko-marchcat (pull request #275)
MAINT-7396 [JigglyPuff] Agent that is not estate owner or estate manager shouldn't be able to toggle estate access settings.

Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: simon_linden <simon@lindenlab.com>
Approved-by: Rider Linden <rider@lindenlab.com>
2017-05-23 16:51:51 +00:00
AndreyL ProductEngine c33fb844ab MAINT-7396 [JigglyPuff] Agent that is not estate owner or estate manager shouldn't be able to toggle estate access settings. 2017-05-23 06:36:16 +03:00
AndreyL ProductEngine aa5b15c940 Merged in lindenlab/viewer-bear 2017-05-22 22:04:24 +03:00
AndreyL ProductEngine 2c0dfcdf49 Merged in lindenlab/viewer-release 2017-05-22 22:03:09 +03:00
AndreyL ProductEngine f0566985b8 Merged in lindenlab/viewer-bear 2017-05-22 21:25:09 +03:00
Mnikolenko Productengine f34bee5966 MAINT-1094 FIXED after triggering a menu with control-F10, clicking in-world should move keyboard focus in-world 2017-05-22 16:45:33 +03:00
Mnikolenko Productengine c102bcf0ad build fix 2017-05-22 11:44:41 +03:00
AndreyL ProductEngine f5e0a536c1 MAINT-7431 Fixed crash in LLAccordionCtrlTab::showAndFocusHeader() 2017-05-22 03:29:01 +03:00
username = daianakproductengine c9f9e93889 MAINT-2060 Fixed Double Freeze when clicking on Help>About Second Life 2017-05-19 20:28:59 +03:00