353da63a07
EXP-915 FIX remove mHidden and mStartFolderID from LLFolderView*
...
cleaned up and refactored inventory code a bit
reviewed by Leyla
2011-06-17 15:24:24 -07:00
6a59861bde
Automated merge up from viewer-development
2010-12-07 14:56:36 -05:00
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
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
cf09d6c58a
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
2010-09-22 03:04:21 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04: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
2f012dd34f
merge
2010-08-25 14:48:18 -05: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
50005b81f7
merge
2010-07-30 10:07:14 -07:00
9b526997d9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07: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
13202e744c
merge
2010-07-14 11:11:31 -05: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
f9b13d8f85
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
2010-06-10 00:45:48 -05:00
f461ae214c
Merge with render-pipeline
2010-06-07 23:05:22 -05: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
aef321ad4a
merge from viewer-trunk
2010-03-31 11:58:09 +01: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
9e0920df2c
Merge from v2 trunk.
2010-01-22 15:18:08 -08: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
a65188d85f
Merge from viewer2. Minor conflict resolved.
2010-01-20 13:54:34 -08: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
b9852dde4b
Merge.
2010-01-13 14:16:24 -08:00
3a578884e7
EXT-3091 [BSI] Loading Texture Text in Build doesn't fit
2010-01-08 16:15:30 -08:00
c9868071b1
Merge from trunk. Conflicts manually resolved in:
...
U indra/llui/lluictrlfactory.cpp
U indra/newview/llinventorybridge.cpp
U indra/newview/llviewertexture.cpp
U indra/newview/llviewertexture.h
2010-01-04 15:31:19 -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
53495d74ee
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
2009-11-17 13:40:11 -08:00
Richard Linden