Ansariel
|
e1dffbcab5
|
Re-apply Nicky's changes to the crashlogger
|
2016-04-20 18:15:43 +02:00 |
|
Ansariel
|
acb6326869
|
Merge viewer-quickgraphics
|
2016-04-20 18:09:48 +02:00 |
|
Oz Linden
|
ecdb190d70
|
MAINT-6322 fix merge error that prevented crash dumps from being located for upload (and add better logging)
|
2016-04-20 11:52:00 -04:00 |
|
Oz Linden
|
85c9754a63
|
disable additional_packages for Linux in the BuildParams
|
2016-04-19 10:00:25 -04:00 |
|
Ansariel
|
f05415929d
|
Remove merchant outbox
|
2016-04-19 09:21:11 +02:00 |
|
Oz Linden
|
1b83b4c8da
|
MAINT-6316 remove duplicate Marketplace listings menu entry
|
2016-04-18 14:56:13 -04:00 |
|
Oz Linden
|
50616d150b
|
MAINT-6236 clean up unused version values in localized strings
|
2016-04-18 14:49:25 -04:00 |
|
Ansariel
|
829ecc1cd1
|
Fix rev 496 merge error
|
2016-04-14 14:08:16 +02:00 |
|
Ansariel
|
e925c73ecc
|
Merge Firestorm LGPL
|
2016-04-14 13:18:41 +02:00 |
|
Ansariel
|
4abe10db36
|
Restore crash report user settings and (hopefully) make them actually work again after they got broken in the breakpad merge (see FIRE-6914)
|
2016-04-14 13:17:17 +02:00 |
|
Ansariel
|
da9446dcd8
|
Merge viewer-quickgraphics
|
2016-04-14 13:03:39 +02:00 |
|
Oz Linden
|
3f7c999c30
|
merge changes for OPEN-292
|
2016-04-13 14:43:12 -04:00 |
|
Oz Linden
|
57488bc381
|
add logging around crash reporting, with minor code cleanups
|
2016-04-13 14:41:38 -04:00 |
|
Ansariel
|
82695084b2
|
Merge Firestorm LGPL tip
|
2016-04-13 08:18:42 +02:00 |
|
Oz Linden
|
ed38b5c923
|
merge changes for MAINT-5974
|
2016-04-08 11:32:48 -04:00 |
|
Ansariel
|
f3d970a5a7
|
Threaded filepickers for snapshot to disk
|
2016-04-07 16:57:55 +02:00 |
|
Ansariel
|
42acac2fe5
|
Remove some pointlessly added code
|
2016-04-07 14:16:52 +02:00 |
|
Ansariel
|
77ef10e049
|
OPEN-292: More removal of orphaned legacy script upload methods
|
2016-04-07 10:04:05 +02:00 |
|
Nicky
|
58e4b9b03b
|
LLCalcParser did confuse newer version and let to std::bind being picked instead of phoenix::bind.
|
2016-04-06 13:00:24 +02:00 |
|
Nicky
|
2987b6d06f
|
x64 installer update.
|
2016-04-06 12:59:30 +02:00 |
|
Oz Linden
|
f0107eb8aa
|
fix merge error that broke reading avatar complexity reports from simulator
|
2016-04-05 17:01:15 -04:00 |
|
Oz Linden
|
aca2085e0e
|
upgrade llphysicsextenstions to work around a new clang recursion check
|
2016-04-05 13:50:16 -04:00 |
|
Ansariel
|
d5e1729483
|
Merge viewer-quickgraphics
|
2016-04-05 18:08:58 +02:00 |
|
Oz Linden
|
b30f2b6ffa
|
Merged in Ansariel/391-blizzard-496-merge-cleanup (pull request #27)
Fix old merge issue in LLLiveLSLEditor::draw()
|
2016-04-05 09:07:32 -04:00 |
|
Ansariel
|
a58c35f758
|
Fix mesh upload floater comboboxes
|
2016-04-05 12:54:22 +02:00 |
|
Ansariel
|
366ace2f02
|
Merge viewer-quickgraphics
|
2016-04-05 12:45:05 +02:00 |
|
Ansariel
|
2a40a3cc7c
|
Merge viewer-quickgraphics
|
2016-04-05 12:00:17 +02:00 |
|
Ansariel
|
e25e95b10e
|
Fix old merge issue in LLLiveLSLEditor::draw()
|
2016-04-05 11:28:43 +02:00 |
|
Ansariel
|
298fa0828e
|
Remove code duplication caused by merge with 4.0.3
|
2016-04-05 11:25:01 +02:00 |
|
Ansariel
|
2797c5938a
|
Merge Firestorm LGPL
|
2016-04-05 10:47:23 +02:00 |
|
Oz Linden
|
4b5be54063
|
merge changes for MAINT-6236 and other translations
|
2016-04-04 17:22:17 -04:00 |
|
Oz Linden
|
9be58e915a
|
merge with 4.0.3-release
|
2016-04-04 15:53:09 -04:00 |
|
Ansariel
|
867f29deb7
|
Re-allow bulk upload of raw files
|
2016-04-03 13:02:41 +02:00 |
|
Ansariel
|
5d899512c8
|
Bring back AIS filter (Kitty said we totally need this because AIS is broken)
|
2016-04-03 01:55:21 +02:00 |
|
Ansariel
|
8fe42955e3
|
Appearance-SyncAttach: Re-add missing UUID parsing for the CreateInventory AIS command (hopefully...)
|
2016-04-02 18:31:58 +02:00 |
|
Ansariel
|
b268729469
|
Remove remainders of actual AIS filter functionality - we always allow all AIS operations and this will also help with future merges
|
2016-04-02 17:49:41 +02:00 |
|
Ansariel
|
a1681b7d6c
|
Re-implement FSUseAis3Api debug setting
|
2016-04-02 17:42:06 +02:00 |
|
Ansariel
|
5e59f81b34
|
Make LSL bridge callback funktion boost::bind-able
|
2016-04-02 17:29:14 +02:00 |
|
Ansariel
|
d022fd6c15
|
Restore pasting to Received Items folder
|
2016-04-02 12:39:44 +02:00 |
|
Ansariel
|
cc6293fbd6
|
Re-enable server appearance update request on rebake until syncCofVersionAndRefresh has been ported to Coroutine
|
2016-04-02 04:28:41 +02:00 |
|
Ansariel
|
3afead682e
|
Clear open merge issue in FSFloaterVoiceControls
|
2016-04-02 04:25:41 +02:00 |
|
Ansariel
|
f6d9ddd905
|
Fix merge issues
|
2016-04-02 04:21:36 +02:00 |
|
Nicky
|
e252cfaa12
|
Merge
|
2016-04-01 21:37:51 +02:00 |
|
Nicky
|
e3d3ed35f7
|
Merge.
|
2016-04-01 18:40:22 +02:00 |
|
Nicky
|
e71f62e0b9
|
Merge.
|
2016-04-01 18:37:30 +02:00 |
|
Nicky
|
91c918cd0c
|
Fix for merge error.
|
2016-04-01 14:51:40 +02:00 |
|
Nicky
|
a50faa943c
|
Merge.
|
2016-04-01 12:59:37 +02:00 |
|
Ansariel
|
f5e66c65f7
|
Merge viewer-quickgraphics
|
2016-03-31 22:07:26 +02:00 |
|
Ansariel
|
1ca7437292
|
Transplant settings improvements to sanity check types
|
2016-03-31 21:52:47 +02:00 |
|
Ansariel
|
007cb590ba
|
Merge Firestorm LGPL
|
2016-03-31 18:55:05 +02:00 |