livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,645 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

51645 Commits (1a1dbd8e322c6a61566cecea94db1eedd94de6c8)

Author SHA1 Message Date
Andrey Lihatskiy 8a3780405f Merged in natty_linden/viewer-webprofileurl (pull request #16) 
MAINT-6731 Use web profile URLs from the grid configuration
 2016-09-16 18:43:42 +03:00
Andrey Lihatskiy c7f92169e1 Merged in Ansariel/viewer-bear-coro-namefix (pull request #14) 
Fix HttpCoroutineAdapter name for clarity
 2016-09-16 18:30:37 +03:00
Ansariel eb6d5e7004 Merge cleanup 2016-09-16 15:07:42 +02:00
Ansariel ca897c4e14 Merge viewer-bear 2016-09-15 23:56:53 +02:00
Ansariel c04b9df0bb Merge Firestorm LGPL 2016-09-15 23:56:09 +02:00
Ansariel f0366fa155 Merge latest fixes from viewer-vob that didn't get into viewer-release yet 2016-09-15 23:32:34 +02:00
Ansariel 8ba72e3fdc Merge LL viewer-release 4.0.8 2016-09-15 22:35:45 +02:00
Ansariel 5b483b8b38 Merge Firestorm LGPL 2016-09-15 22:34:54 +02:00
AndreyL ProductEngine 8c5e92a399 Merged in pavelkproductengine/visual-outfit-browser 2016-09-15 23:22:58 +03:00
AndreyL ProductEngine c2b6620572 Merged in lindenlab/viewer-release 2016-09-15 23:21:15 +03:00
Oz Linden 51bb369a39 increment viewer version to 4.0.9 2016-09-15 15:31:31 -04:00
Oz Linden 7d20fbdb66 Added tag 4.0.8-release for changeset 45eaee56883d 2016-09-15 15:31:31 -04:00
Ansariel abf6750189 FIRE-20026: Pictures might get uploaded multiple times after a timeout occurs 2016-09-15 21:19:46 +02:00
andreykproductengine f0c469b649 MAINT-6734 Fixed processData() crash in LLMeshHeaderHandler 2016-09-15 19:22:10 +03:00
Ansariel cccc2f771b FIRE-20075: Fix wording for ad-hoc conferences; patch by Mister Acacia 2016-09-15 14:34:49 +02:00
Natty Linden 98cb925185 MAINT-6731 Use web profile URLs from the grid configuration 2016-09-14 15:53:58 -07:00
Ansariel 0c7abda3c8 Merge bento-box 2016-09-14 23:25:42 +02:00
Ansariel 6e5b38f92d Merge Firestorm LGPL 2016-09-14 23:23:12 +02:00
Rider Linden 51236b7c9c Merge 2016-09-14 09:55:18 -07:00
Mnikolenko Productengine 3c8cc4d2ac MAINT-6723 FIXED [VOB] Crash in LLOutfitGallery::buildItemPanel(int) 2016-09-14 18:27:54 +03:00
andreykproductengine da23e0f925 MAINT-6726 Fixed LLLineEditor menus staying in memory forever 2016-09-13 20:32:34 +03:00
andreykproductengine a195406e48 MAINT-6726 Fixed LLLineEditor menus staying in memory forever 2016-09-13 20:32:34 +03:00
Ansariel 78407979d4 Backed out changeset 1117ffe42799 (FIRE-11920: Always enable replace outfit from inventory) - there is a better fix from LL coming up in next merge 2016-09-13 18:55:58 +02:00
Brad Payne (Vir Linden) 0ed6b643d3 SL-455 - avatar_lad.xml small fixes for asymmetry bugs 2016-09-13 06:42:33 -04:00
Mnikolenko Productengine 07cc376831 MAINT-6718 Can't Wear - Replace current outfits. 2016-09-13 13:02:20 +03:00
Ansariel b6b18ba91c Make this less intrusive and fix a minor labelling issue 2016-09-13 09:51:28 +02:00
Brad Payne (Vir Linden) a11538e034 SL-455 - skel_tool.py check for avatar_lad.xml slider symmetries 2016-09-12 16:50:32 -04:00
Ansariel 6894e68cc9 Update German translation 2016-09-12 21:01:54 +02:00
Ansariel e18d32ee13 Merge viewer-bear 2016-09-12 20:58:57 +02:00
Ansariel eb20aefd07 Merge Firestorm LGPL 2016-09-12 20:23:20 +02:00
Brad Payne (Vir Linden) 5cd545c40e SL-455 - Fix for slider bug: body width on mTail6 had wrong scales. 2016-09-12 10:50:26 -04:00
Brad Payne (Vir Linden) b5bbb9f5d5 SL-109 - in skel_tool.py, added check for bone drivers that don't do anything. 2016-09-12 10:48:35 -04:00
andreykproductengine ff118b7d21 MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase 2016-09-12 17:45:12 +03:00
andreykproductengine 50ed0db1ff MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase 2016-09-12 17:45:12 +03:00
Mnikolenko Productengine 94f65c53a1 SL-444 Add Abuse Report Submision Confirmation Pop up 2016-09-12 12:04:05 +03:00
callum@lindenlab.com 921cfa355c MAINT-6462 Built-in browser plays video vertically flipped 2016-09-09 11:46:50 -07:00
andreykproductengine 8bb95eb8f8 MAINT-6711 "Object view" rotates around the avatar 2016-09-09 16:17:43 +03:00
Ansariel 646b30898d FIRE-20053: Fix inconsistent behavior of shortcuts for appearance and teleport history sidepanel floaters when minimized compared to normal floaters 2016-09-08 12:08:23 +02:00
Ansariel 6e8baed93e FIRE-20025: Persist sort order and column of region tracker 2016-09-08 11:25:32 +02:00
Callum Prentice 4a95c4b36c Restore version of CEF that has the correct Y flipping enabled - (2526/chrome47 version - soon to be replaced with 2704/chrome 51) 2016-09-07 16:13:09 -07:00
Ansariel 788bd9e477 Merge viewer-vob 2016-09-07 21:42:28 +02:00
Ansariel ae36738018 Merge Firestorm LGPL 2016-09-07 21:12:12 +02:00
Nat Goodspeed c7cb6636c4 MAINT-6584, MAINT-5011: Change new 'throw' to LLTHROW() 
to be consistent with new exception conventions.
 2016-09-07 10:57:07 -04:00
Nat Goodspeed dd1a0218b1 Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc 2016-09-07 10:46:28 -04:00
Mnikolenko Productengine 1de6e0830c MAINT-6699 FIXED [VOB] Crash in LLSnapshotLivePreview::getBigThumbnailImage() 2016-09-07 17:26:07 +03:00
AndreyL ProductEngine 464d70c546 Dummy commit to fix the teamcity builds 2016-09-07 08:08:19 +03:00
Nat Goodspeed 2d3c5fb060 Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc 2016-09-06 20:52:57 -04:00
Nat Goodspeed 67c401047a MAINT-5011: Ensure BlockTimer::mStartTime is unconditionally set. 
Previous logic could possibly leave mStartTime uninitialized, producing fatal
warnings with gcc 4.7.
 2016-09-06 20:48:16 -04:00
Nat Goodspeed fe49126d45 MAINT-5011: Commit backing out BlockTimer warning suppression. 2016-09-06 20:42:27 -04:00
Nat Goodspeed bfb400ccd7 Backed out changeset c30d8774c404: remove warning suppression 
for possibly-uninitialized data member in BlockTimer::BlockTimer.

NickyD suggested a real fix.
 2016-09-06 20:41:23 -04:00