summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersnapshot.cpp
AgeCommit message (Collapse)Author
2010-06-14EXT-7524 FIXED Save snapshot to inventory results in crashAimee Linden
Moved confirmSavingTexture() and onSavingTextureConfirmed() from LLSnapshotLivePreview to LLFloaterSnapshot::Impl so that the notification confirmation completes before LLFloaterSnapshot is closed.
2010-06-08Fix the windows build (bool -> BOOL) *Grumble*Aimee Linden
2010-06-08EXT-7521 FIXED Snapshot floater not remembering whether to show the advanced ↵Aimee Linden
panel. Also removes some redundant code, and registers UI callbacks for use from XUI. Reviewed by: Tofu
2010-05-28EXT-7498 WIP Hide share to web button until the code behind it is complete.Aimee Linden
2010-04-21Automated mergeRoxie Linden
2010-04-19Unhardcoded snapshot upload price in my fix for EXT-6606 (Set As Profile Pic ↵Vadim Savchuk
uploads and charges user L$10 without confirmation). Reviewed by Richard: https://codereview.productengine.com/secondlife/r/217/ --HG-- branch : product-engine
2010-04-19automated merge with trunkRoxie Linden
2010-04-12Fixed major bug EXT-6606 (Set As Profile Pic uploads and charges user L$10 ↵Vadim Savchuk
without confirmation). Added upload confirmation dialog. Reviewed by Mike: https://codereview.productengine.com/secondlife/r/217/ --HG-- branch : product-engine
2010-04-07Automated mergeRoxie Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07PE merge from pe-viewer-trunkTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-07Fixed major bug EXT-6534 (Snapshot to Disk with Custom Size, selecting ↵Mike Antipov
Constrain Proportions causes snapshot of the active window with a background to the correct size but the window the same size as original, instead of proportionally changing the active window size.) * The reason: completely broken functionality to keep all the GUI controls in sync with the saved settings and Preview image state. Issue occurred while upgrading snapshot/social media floater (changeset (1acc14a5e7ac) New snapshot/social media floater) * Fix: added disabling of floater's buttons depend on snapshot is up to date ("Share Snapshot", "Save Snapshot", "Set As Profile Pic", "Share To Web", "Email Snapshot", "Save To My Inventory", "Save To My Computer"). QA Note: other controls should be checked against necessity to disable them while changing snapshot settings. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/181/ --HG-- branch : product-engine
2010-04-01Automated MergeRoxie Linden
2010-03-25automated mergeLoren Shih
2010-03-24fixing windows line endingsLeyla Farazha
2010-03-24Hooked up Save As Profile PicLeyla Farazha
reviewed by Richard CC# 167
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-03-17Adding error handling to share to web feature.Leyla Farazha
Reviewed by Callum
2010-03-16fixing windows line endingsLeyla Farazha
2010-03-16New snapshot/social media floaterLeyla Farazha
reviewed by Richard
2010-02-04Fixed bug EXT-4806 (Snapshot floater has preview offset).Vadim Savchuk
Removed incorrect vertical offset modification in compact mode. --HG-- branch : product-engine
2010-02-01EXT-4774: Fixed the position of the snapshot preview thumbnail.Lynx Linden
The preview thumbnail no longer floats above the snapshot window when the window is in its small (less) mode.
2010-01-29EXT-4493: Mark snapshot as dirty when changing quality slider.Lynx Linden
2010-01-28CID-380Tofu Linden
Checker: UNINIT_CTOR Function: LLFloaterSnapshot::Impl::Impl() File: /indra/newview/llfloatersnapshot.cpp
2010-01-15EXT-4133 MissingString(AllEstatesYouOwn) when adding/removing from ↵Leyla Farazha
REGION/ESTATE, Estate tab reviewed by James
2009-12-21EXT-3623 - taking a snapshot on windows completely breakd the UIrichard
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24Removed include llnotifications.h from llfloater.h trying to speed buildsJames Cook
Fixed many other includes related to this file. Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-10mergeJames Cook
2009-11-10Sanitize naming of getWindowRect (scaled vs. raw pixels) and ↵James Cook
getWorldViewRect (scaled vs. raw) Reduces chance of future UI bugs related to UI size. Discussed with Richard.
2009-11-09data driven layout of top-level UI elementsrichard
EXT-1219 Side tray slide-out animation cleaned up some layout of bottom tray contents reviewed by James
2009-11-05refactored top level ui into main_view.xmlrichard
2009-11-05mergeangela
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-04EXT-1781 selecting Freeze frame (fullscreen preview) in the snapshot tool ↵angela
locks out mouse-clicks when closed
2009-09-15EXT-610 Cannot change file type in snapshots floater -- to be reviewedJiao Li
2009-09-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-08-28svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3 * EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
2009-08-26svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-04svn merge -r 128442:129343 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also ↵James Cook
UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-05-22svn merge -r121194:121210Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-03-13svn merge -r114093:114412 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833