3d0ec3da5b
CHUI-659 : WIP : Verified (tested) and cleaned up some CHUI-101 refactoring code.
2013-01-07 15:32:47 -08:00
a204059d2e
CHUI-267 FIX Full inventory listing not always shown for test account
...
changed LLFolderViewModelInterface::getFilter() to return a reference, since it is never NULL
removed sort order from filter, which was causing unneeded filtering
2012-08-01 01:14:27 -07:00
3e038cd71b
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-27 12:53:54 -07:00
1494a1058f
CHUI-101 WIP Make LLFolderview general purpose
...
move llfolderview* into LLUI!
2012-07-03 23:55:39 -07:00
1bd52dfbdc
CHUI-101 WIP Make LLFolderView general purpose
...
refactored source files, moving logic into llfolderviewmodel*.cpp
filter logic tweaks
purging and moving inventory now properly cleans up view model
2012-07-02 17:57:29 -07:00
062cae9a48
CHUI-101 WIP Make LLFolderView general purpose
...
cleaned up some stale TODOs
worked on getting initial inventory display to work consistently
2012-06-29 15:44:08 -07:00
cb865a7e13
CHUI-101 WIP Make LLFolderView general purpose
...
moved filtering logic to viewmodel
2012-06-27 18:56:10 -07:00
7f38f620fd
MAINT-1204 Fix for crash on selecting a texture anywhere other than the build tools.
2012-06-27 17:16:59 -05:00
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
3882e9c177
CHUI-101 WIP Make LLFolderview general purpose
...
more compilation fixes, just need to add getName() back to LLInventoryFilter et al
2012-06-20 00:19:05 -07:00
9e49fb558f
CHUI-101 WIP Make LLFolderview general purpose
...
added more casts to LLFolderViewModelItemInventory, etc. to fix compile errors
2012-06-19 22:36:12 -07:00
379eec8841
CHUI-101 WIP Make LLFolderView general purpose
...
continuing fixing build errors
renamed llfoldervieweventlistener.h to llfolderviewmodel.h
2012-06-15 13:35:39 -07:00
86103dd5d4
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui-folderview
2012-06-15 09:56:47 -07:00
9940ca5ae7
CHUI-101 WIP Make LLFolderView general purpose
...
llfolderview refactornig
2012-06-15 09:44:27 -07:00
890c583289
MAINT-119 FIXED (PUBLIC]no-transfer textures not searchable via texture picker)
...
- Implemented Richard's and Leo's spec
- Also fixed an issue when applying no-transfer texture for an object using texture picker, creates redundant copies of the texture in the object's content
2012-05-22 20:01:22 +03:00
c7c7726c6f
merge changes for drtvwr-135
2012-04-13 17:11:19 -04:00
f71ca07998
storm-64: Local Textures
2012-04-02 09:34:14 -04:00
633bd44b4a
merge changes for vmrg-225
2012-03-09 12:58:50 -05:00
93c570b38b
STORM-1809 The word "Multiple" does NOT show in the edit window when editing prims or linksets with mixed textures in LL V3
2012-02-08 14:27:55 -05:00
c47c31fdbf
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
2012-01-31 17:51:43 -08:00
88a90aabcb
Automated merge with http://hg.secondlife.com/viewer-development
2011-07-07 13:34:13 -07:00
c7bca4602e
STORM-1305 WIP Fixed texture control to not display hand cursor outside of the texture.
...
Also click outside of the texture will not show the picker anymore.
2011-06-22 21:14:38 +03:00
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
Merov Linden