b9ea8cc0b5
final(?) merge to revert snapshot floater to 2.0.1 level.
2010-06-15 14:55:05 +01:00
9fd6bab430
Backed out changeset 1acc14a5e7ac
2010-06-15 14:51:03 +01:00
90250cb36d
merge backout.
2010-06-15 14:49:26 +01:00
5ad91abfdf
Backed out changeset b447707f20f5
2010-06-15 14:49:16 +01:00
f8c91bad6b
merge backout.
2010-06-15 14:48:31 +01:00
f4b7164752
Backed out changeset 1c66b34b7fbe
2010-06-15 14:48:14 +01:00
472b7a94c0
merge backout.
2010-06-15 14:47:51 +01:00
565d177156
Backed out changeset c9dd9852d76b
2010-06-15 14:47:38 +01:00
bc0b401359
Backed out changeset d632626f9b11
2010-06-15 14:45:51 +01:00
dea3e7623a
Fixed major bug EXT-6534 (Snapshot to Disk with Custom Size, selecting 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-07 10:26:32 +03:00
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
0a56031bd3
automated merge
2010-03-25 20:15:51 -04:00
1337c7dcb0
fixing windows line endings
2010-03-24 18:21:02 -07:00
7480e06934
Hooked up Save As Profile Pic
...
reviewed by Richard CC# 167
2010-03-24 16:39:59 -07:00
fc49539b36
EXT-2959 : Full out camera functions from llagent to llagentcamera
...
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
11e6e208d4
Adding error handling to share to web feature.
...
Reviewed by Callum
2010-03-17 14:21:58 -07:00
fd6d1e2164
fixing windows line endings
2010-03-16 11:40:17 -07:00
41ed9b3bcb
New snapshot/social media floater
...
reviewed by Richard
2010-03-16 11:00:36 -07:00
3fa2acc0df
Fixed bug EXT-4806 (Snapshot floater has preview offset).
...
Removed incorrect vertical offset modification in compact mode.
--HG--
branch : product-engine
2010-02-04 19:21:12 +02:00
17b7d606b1
EXT-4774: Fixed the position of the snapshot preview thumbnail.
...
The preview thumbnail no longer floats above the snapshot window when
the window is in its small (less) mode.
2010-02-01 14:21:05 +00:00
a328cdc830
EXT-4493: Mark snapshot as dirty when changing quality slider.
2010-01-29 17:34:44 +00:00
7bd7f0d0ff
CID-380
...
Checker: UNINIT_CTOR
Function: LLFloaterSnapshot::Impl::Impl()
File: /indra/newview/llfloatersnapshot.cpp
2010-01-28 10:44:34 -08:00
56af8f1639
EXT-4133 MissingString(AllEstatesYouOwn) when adding/removing from REGION/ESTATE, Estate tab
...
reviewed by James
2010-01-15 13:33:23 -08:00
5b978865e3
EXT-3623 - taking a snapshot on windows completely breakd the UI
2009-12-21 17:54:15 -08:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
458430be91
Removed include llnotifications.h from llfloater.h trying to speed builds
...
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
bc4b49735c
merge
2009-11-10 14:36:25 -08:00
0f6242d9fd
Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
...
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
4eb72a12a2
data driven layout of top-level UI elements
...
EXT-1219 Side tray slide-out animation
cleaned up some layout of bottom tray contents
reviewed by James
2009-11-09 15:29:47 -08:00
fac0b6836a
refactored top level ui into main_view.xml
2009-11-05 20:36:15 -08:00
95738da3d8
merge
2009-11-05 11:41:07 +08:00
b806edf4ac
Redo Bao's broken merge
2009-11-04 14:59:23 -08:00
bf092de246
EXT-1781 selecting Freeze frame (fullscreen preview) in the snapshot tool locks out mouse-clicks when closed
2009-11-04 15:58:49 +08:00
a4486b258c
EXT-610 Cannot change file type in snapshots floater -- to be reviewed
2009-09-15 09:34:17 +00:00
58bce2d205
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-09 01:26:44 +00:00
51500f82e2
svn merge 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-28 22:30:09 +00:00
af98aad98d
svn merge 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-26 20:47:27 +00:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
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-24 20:04:52 +00:00
eb853f55c0
svn merge -r 128442:129343 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-08-04 01:12:59 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
d6101558a1
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also 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-07-06 21:58:04 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
9dfe0ca9a0
svn merge -r121194:121210
...
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-22 09:58:47 +00:00
cc92525b0d
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
...
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-05-04 17:43:26 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
1aa0416aef
svn merge -r114093:114412 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-03-13 21:28:40 +00:00
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (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
2009-02-18 21:10:16 +00:00
e188badaf2
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
...
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
2009-02-03 17:56:26 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
667ca55bad
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2009-01-05 18:59:12 +00:00
Tofu Linden