a6ba758356
Merge with phoenix-firestorm-lgpl
2016-09-07 01:22:08 +02:00
83865d408b
FIRE-20054: Only update link's HREF to label text if the user can edit the text
2016-09-06 23:40:49 +02:00
dc5a805efd
undo changes to llvertexbuffer.cpp from c727ae93646e
2016-09-06 16:53:32 -04:00
6c46b3caf2
SL-395 - can enable/disable scale lock in mesh upload UI. Feature works.
2016-09-06 16:32:41 -04:00
5edd4cecfc
merge changes for exception handling
2016-09-06 11:07:39 -04:00
8c86c594be
paren fix
2016-09-06 11:01:02 -04:00
72f4c72001
downgrade spammy LLCoros logging to DEBUG
2016-09-06 10:21:28 -04:00
a5adabb4f6
add protections against failed memory allocations in VBO and aligned memory
2016-09-06 10:04:19 -04:00
53f9fbcfb7
add run time error checking to LLImageRaw::scale
2016-09-06 09:11:10 -04:00
ec9b92d274
MAINT-6698 [VOB] "Save" button is always enabled for outfit with non-default image even if there were no changes
2016-09-06 14:07:20 +03:00
4a9d6cd69f
MAINT-6697 make sure we have data to process
2016-09-05 19:31:42 +03:00
fc17f62335
MAINT-6685 [VOB] Outfit Image from an Outfit Gallery disappears after editing outfit
2016-09-05 17:32:50 +03:00
ecd11724ca
Backed out changeset: d3ffc46e9e92
2016-09-05 15:43:31 +03:00
34ced1aa2c
SL-395 - partial support for joint scale locking via flag in skin info
2016-09-02 16:44:57 -04:00
a2875ba53e
merge
2016-09-02 14:34:06 -04:00
1804da89ee
MAINT-5011: Abbreviate __FILE__ path in log_unhandled_exception_().
...
LLError::abbreviateFile() is specifically to avoid cluttering log output with
the prefix of an absolute file path on the original build system, pointless
for anyone trying to read the log.
2016-09-02 14:00:18 -04:00
74ec1116a2
MAINT-6461 crash due to invalid menu pointer during visibility change
2016-09-02 19:20:31 +03:00
9e73d04811
MAINT-6461 crash due to invalid menu pointer during visibility change
2016-09-02 19:20:31 +03:00
d07a8b9965
SL-124 - small comment cleanups
2016-09-02 08:41:22 -04:00
5521066237
SL-109 - added another diagnostic option for skel_tool.py. --slider_info dumps the info about bone-affecting sliders to stdout
2016-09-02 08:15:54 -04:00
d52a5c73bf
FIRE-19836: Teleport offer doesn't play notification sound anymore; Fix an apparent oversight by LL on the way and play notification sound for maturity exceeded and maturity blocked cases
2016-09-02 09:30:06 +02:00
c9bddab122
FIRE-20024: Clicking a group uri does not put focus on an already open and maximized group profile
2016-09-02 08:29:29 +02:00
1ed351e28f
MAINT-5011: Use LL_VLOGS() rather than raw lllog() macro.
...
Raw lllog() doesn't work for varying log level, which is why LL_VLOGS()
exists.
2016-09-01 19:46:39 -04:00
96467f09f2
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
2016-09-01 19:44:38 -04:00
9be4e7e448
MAINT-5232: Introduce LL_VLOGS() macro: log call with variable level.
...
In some places we want to log the same information but with different severity
depending on specifics. In other cases we need to test the availability of the
logging subsystem before engaging it. LL_VLOGS() accepts an LLError::ELevel
argument that can differ with each call, while retaining the desirable feature
of deciding only once for each level.
2016-09-01 19:32:31 -04:00
7203162071
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
2016-09-01 15:22:34 -04:00
31d3d654f1
MAINT-5011: Advise against lllog() instead of (e.g.) LL_INFOS().
2016-09-01 15:21:54 -04:00
9acf7f5733
MAINT-6221 If two animations have the same priority, it's arbitrary which one will take precedence
2016-09-01 19:11:44 +03:00
81b683f83b
MAINT-6686 FIXED [VOB] Outfit Snapshot floater should be resized independently of general Snapshot floater
2016-09-01 16:40:41 +03:00
1bbc523b04
MAINT-5011: Revert to googlemock built on squeeze
2016-08-31 17:22:04 -04:00
3d0383fd14
Backed out changeset 8c0e52a212bb - revert to googlemock 297460
2016-08-31 17:21:53 -04:00
ae214e382b
MAINT-5011: Revert to llceflib built on squeeze
2016-08-31 17:21:00 -04:00
6076f69591
Backed out changeset 538a5b77f08e - revert to llceflib 311349
2016-08-31 17:20:45 -04:00
9a0acaef36
MAINT-5011: Revert to colladadom built on squeeze
2016-08-31 17:19:45 -04:00
b32ae58e4c
Backed out changeset c494a6e0b619 - revert to colladadom 297450
2016-08-31 17:19:31 -04:00
d24f7ed33d
MAINT-5011: Revert to boost built on squeeze
2016-08-31 17:18:41 -04:00
3ce48210ff
Backed out changeset 4cf5551a22a6 - revert to boost 297445
2016-08-31 17:17:48 -04:00
8118762c12
MAINT-5011: Add log tag to LOG_UNHANDLED_EXCEPTION() log messages.
2016-08-31 17:16:43 -04:00
ac1f29a73c
MAINT-6386 Update first-time Viewer Login screen with new LISI screenshots
2016-08-31 23:42:24 +03:00
00fc34a62f
MAINT-6683 fixed wrapping issues of notecard embedded items
2016-08-30 20:13:45 +03:00
a00165aad4
MAINT-6683 fixed wrapping issues of notecard embedded items
2016-08-30 20:13:45 +03:00
d53ec6c2df
MAINT-6682 Viewer crashes when deleting notecards one by one
2016-08-30 16:41:28 +03:00
e3825177f5
Sort lists in RLVa restrictions floater by default
...
--HG--
branch : RLVa
2016-08-30 10:59:05 +02:00
303fbdb6bb
[FIXED] Behaviour callbacks no longer fire
...
-> thankies Ansariel - they're not used as-is in RLVa (or Catznip) but Firestorm hooks into them for various UI enabling/disabling hooks
--HG--
branch : RLVa
2016-11-06 17:10:18 +01:00
6b24122857
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc
2016-08-29 17:06:12 -04:00
dcc9ce132f
Build fix for KDU 7.5+
2016-08-29 21:30:03 +02:00
c2b88ca860
Build fix for KDU 7.5+
2016-08-29 21:30:03 +02:00
20cf275d21
MAINT-5011: Work around gcc 4.7.2 overly (?) picky fatal warning.
2016-08-29 18:51:32 +00:00
0c2442eb68
MAINT-5011: Fix abbreviateFile() test to run under .../indra/ path.
...
This particular test relied on there being exactly one instance of the string
"indra" in the source file's __FILE__ path -- which is usually true, but not
if the developer clones the viewer source repo under a parent directory whose
path itself contains "indra". Fix to handle any number of occurrences.
2016-08-29 18:48:47 +00:00
66aba60ce0
Build fix - now idea how this actually works at all for LL...
2016-08-29 13:01:43 +02:00
Nicky