Commit Graph

156 Commits (599107a0b4fbff5e23bccc4c5a7dbeb3c2f620e1)

Author SHA1 Message Date
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Mnikolenko ProductEngine bb87365c37 Merge viewer-release, become version 3.7.29 2015-04-28 13:36:35 +03:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Mnikolenko ProductEngine 903d9d1236 MAINT-1961 FIXED Use "TextureLivePreview" setting by default, if mCanPreview was not set manually. 2015-03-04 11:55:18 +02:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
andreykproductengine 5a1f4ac1a7 MAINT-3205 FIXED Normal map thumbnail icon lacks "Multiple" text when last-selected face lacks a normal map 2014-11-27 17:20:45 +02:00
andreykproductengine 4f5ea39c91 MAINT-3208 FIXED Confusing button state when working with multiple textures and the default texture is the last selected. 2014-10-24 17:39:12 +03:00
callum_linden 577a3973ea Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake 2014-10-20 14:00:39 -07:00
Mnikolenko ProductEngine 673afb955b MAINT-4253 FIXED Don't call setSelection() twice. 2014-07-22 11:36:27 +03:00
Mnikolenko ProductEngine b0d773bc18 MAINT-4254 FIXED Don't change selection in Inventory panel when image's uuid is null. 2014-07-21 10:53:01 +03:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Mnikolenko ProductEngine a1e986e2b0 MAINT-3364 FIXED Call clearSelection() from root_folder 2014-01-10 12:37:01 +02:00
MaximB ProductEngine cad40bee13 MAINT-3364 (Texture picker highlights the wrong texture when no texture is found since CHUI.) 2013-11-13 14:56:14 +02:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Graham Linden f1c04467f7 NORSPEC-292 fix issues with managing LLNetworkData::PARAMS_LIGHT_IMAGE when demoting spotlights by removing their tex 2013-07-02 13:12:08 -07:00
Richard Linden a2a6bf20d7 merge with release 2013-06-20 16:46:23 -07:00
Graham Madarasz 96f7f6d01b NORSPEC-258 and NORSPEC-226 make tex picker close refresh build tool UI correctly and fix issues with transition from no-bumps to normal maps 2013-06-11 17:18:20 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Graham Madarasz 3c594c5d57 NORSPEC-183 fix regression in diff map blank texture from NSPEC 152 fix by forcing new BlankImageID to the old default 2013-05-15 10:38:10 -07:00
Graham Madarasz c334a185f3 NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker 2013-05-14 05:59:48 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 8de397b19e SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
prep e0c9174609 merge 2013-03-11 15:05:47 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Brad Payne (Vir Linden) 5a436e46f6 SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed 2013-03-08 17:07:17 -05:00
Merov Linden 3d0ec3da5b CHUI-659 : WIP : Verified (tested) and cleaned up some CHUI-101 refactoring code. 2013-01-07 15:32:47 -08:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
Richard Linden 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
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Richard Linden 1494a1058f CHUI-101 WIP Make LLFolderview general purpose
move llfolderview* into LLUI!
2012-07-03 23:55:39 -07:00
Richard Linden 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
Richard Linden 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
Richard Linden cb865a7e13 CHUI-101 WIP Make LLFolderView general purpose
moved filtering logic to viewmodel
2012-06-27 18:56:10 -07:00
Dave Parks 7f38f620fd MAINT-1204 Fix for crash on selecting a texture anywhere other than the build tools. 2012-06-27 17:16:59 -05:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Richard Linden 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
Richard Linden 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
Richard Linden 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
Richard Linden 86103dd5d4 Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui-folderview 2012-06-15 09:56:47 -07:00
Richard Linden 9940ca5ae7 CHUI-101 WIP Make LLFolderView general purpose
llfolderview refactornig
2012-06-15 09:44:27 -07:00
Paul ProductEngine 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
Oz Linden c7c7726c6f merge changes for drtvwr-135 2012-04-13 17:11:19 -04:00
Vaalith Jinn f71ca07998 storm-64: Local Textures 2012-04-02 09:34:14 -04:00
Oz Linden 633bd44b4a merge changes for vmrg-225 2012-03-09 12:58:50 -05:00