3c4cf5a309
STORM-677 ADDITIONAL_FIX Force textures inside texture picker to be 100% opaque while the control is in a focused floater.
...
Besides, made LLFloater handle opacity more like other controls do.
2010-12-01 15:46:57 +02:00
393514f3dc
STORM-677 FIXED Made texture picker control transparent if the floater it resides in is transparent.
...
Also added transparency support to the texture picker floater.
2010-11-25 23:26:55 +02:00
e7884bbab5
DEV-53094 FIX Selecting texture picker causes viewer to crash
...
overzealous elimination of xml parsing
2010-09-08 19:00:50 -07:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
124bc854dd
moved buildFloater out of lluictrlfactory to llfloater.cpp
2010-08-16 17:44:23 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
6a1fefac22
Redo the same merge as in changeset "2026f824953f", but this time with feeeeling.
2010-08-02 16:59:20 -07:00
19c0d6d4ea
Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1
2010-07-30 10:11:55 -04:00
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
6e88f198ed
EXT-5403 FIXED texture picker to scroll to selected texture initially after being open.
...
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/736/ .
--HG--
branch : product-engine
2010-07-22 19:02:17 +03:00
76a9c1214f
merge
2010-07-30 10:07:14 -07:00
566e3969f9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
5d85dad85f
Reverted changeset 2bb10eae42bf
2010-07-15 12:31:08 -07:00
38d763b34f
EXT-5403 FIXED Disabled auto selecting first filtered item because it takes away selection from the item set by LLTextureCtrl owning the texture picker floater.
...
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/679/ .
--HG--
branch : product-engine
2010-07-12 16:46:50 +03:00
167e57d138
EXT-5403 FIXED Removed marking filter applied to inventory panel as default to fix scrolling to currently selected texture.
...
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/679/ .
--HG--
branch : product-engine
2010-07-01 17:49:46 +03:00
9ddf271cfd
EXT-7827 FIXED (Search floater with capital characters in search field opens from 'Pick: Texture' floater)
...
Changed 'upper_case_search_string' to the 'search_string'
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/674/
--HG--
branch : product-engine
2010-06-30 18:19:46 +03:00
d42dd9a1c1
EXT-7046 FIX User profile using wrong placeholder/generic profile pic art
2010-06-24 14:12:35 -07:00
e89611291e
EXT-7504 WIP Force decloud after timeout using lower res textures
...
EXT-7526 FIXED Add baked texture information to texture view
First attempt at low res textures after timeout.
Added debug setting to control whether low res texture timeout is used.
Added baked texture load information to texture view debug display.
Trivial name changes to some variables.
2010-05-27 18:59:28 -04:00
8246801651
EXT-7439 FIXED reduce size of avatar textures floater
...
Texture elements are now smaller so the floater doesn't consume the entire viewer window space.
2010-05-21 13:34:21 -04:00
955473266e
AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statistics
...
Fixed memory leak.
Prettied up formatting for debug readouts.
Added more notifications for rez and cloud time.
2010-05-18 15:15:08 -04:00
46d799ab51
automated merge
2010-05-18 10:18:03 -04:00
77068bcf31
EXT-7385 FIXED Show load and discard level for loading textures
...
More debugging information is now shown for loading textures
2010-05-17 20:41:30 -04:00
4683283a66
EXT-7045 FIX miss one more texture setup place.
...
Also remove redundant variable and do some refactoring.
Reviwed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/391/
--HG--
branch : product-engine
2010-05-17 18:36:53 +03:00
5861a2faf2
EXT-3414 : Move static backgroundfetch methods and variables to llinventorymodel subclass
...
Created LLInventoryModelBackgroundFetch file for handling background fetch.
2010-03-30 11:49:15 -04:00
ba3bbb2131
Fixed bug EXT-4583 ([BSI] Changing group image via drag and drop from Inventory floater doesn't trigger "save" button to become active).
...
Modified LLTextureCtrl's no_commit_on_selection paramater behavior so that
the widget gets dirty only on DnD or when the OK button is pressed in the picker.
This is needed for panels that rely on LLTextureCtrl::isDirty() to enable their "Apply" button.
--HG--
branch : product-engine
2010-01-22 18:06:53 +02:00
8758fac712
Fixed bug EXT-4369 ([BSI] Changing image in "Pick" doesn't trigger "Save Pick" button to be active)
...
* Changed the Save button to react on texture picker commit, not on selection.
* Added an optional "no_commit_on_selection" parameter to LLTextureCtrl
to commit only when user presses the OK button in the picker or changes
the texture via DnD, i.e. browsing in the picker doesn't commit.
--HG--
branch : product-engine
2010-01-20 19:49:41 +02:00
17a72e5e51
fix for normal EXT-3997 IM and Profile pictures never fully rez, or are too-low resolution
...
no idea why this(...a bit different set of flags and forceToSaveRawImage(0)...) do the job...just copy/past from LLPreviewTexture.
--HG--
branch : product-engine
2010-01-15 18:53:38 +02:00
3a578884e7
EXT-3091 [BSI] Loading Texture Text in Build doesn't fit
2010-01-08 16:15:30 -08:00
754801f669
fixed minor bug EXT-3627 'Loading..' is shown over second life icon in view profile panel
...
--HG--
branch : product-engine
2009-12-22 17:32:30 +02:00
acdce23299
Header file cleanup
...
Removed unnecessary "#include llinventorymodel.h" now that llinventoryobserver was split from llinventorymodel.
--HG--
branch : avatar-pipeline
2009-11-13 17:47:00 -05:00
b806edf4ac
Redo Bao's broken merge
2009-11-04 14:59:23 -08:00
abf77532d8
fix the bug that textuer boost level is mixed with boolean numbers.
2009-11-03 19:42:52 -07:00
310a7b60f7
Merge conflict resolution for previous commit.
...
--HG--
branch : avatar-pipeline
2009-11-02 16:22:18 -05:00
bde7d67066
EXT-1866 : Inventory Side Panel
...
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel
Porting over changes from svn Inventory Panel work.
2009-11-02 15:39:55 -05:00
432e243e1a
EXT-1352 Add image art to floater backgrounds.
...
Implemented "legacy_header_height" hack to account for new art being 25 pixels
tall instead of legacy 18 pixels -- it auto-sizes the floaters to be taller.
Made all floaters have resize handles, just disable and make invisible if unused.
This simplifies the floater construction logic. Floater header height now lives
in floater.xml, not as a global saved setting. Reviewed with Richard.
2009-10-29 15:37:25 -07:00
6f66cdf7a1
EXT-1325 Texture Picker does not open
...
EXT-1264 'Zoom in' world context menu opens IM session
reviewed by Richard
2009-10-08 00:31:01 +00:00
ec84b639ed
EXT-1339 Create onClose method in LLFloater, and remove most bindings to mCloseSignal. In the vast majority of cases, mCloseSignal is being bound to an onClose function. Just make it virtual and be done with it. Renamed a couple of LLPanel close methods to onClosePanel() to distinguish them. Reviewed with Richard.
2009-10-07 20:54:31 +00:00
ada0f4fa22
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
...
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +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
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
8f7ec64899
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
...
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
52aeaa3284
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
...
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +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
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
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
e1d8dac25a
svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
...
Resolving QAR-1051 Merge featurettes batch #4
2008-12-15 21:21:19 +00:00
Vadim ProductEngine