Commit Graph

191 Commits (092a09074795b4dcaec3c37febef7b43bae7c461)

Author SHA1 Message Date
Ansariel df4205dc46 Merge viewer-bear 2016-04-02 03:52:29 +02:00
andreykproductengine 0e155c51a9 MAINT-6257 Textures loading issues. 2016-03-29 18:52:54 +03:00
andreykproductengine 30f9287645 MAINT-2199 reverted previous change, refixed missing cloud and ban line 2016-03-03 00:15:33 +02:00
andreykproductengine b3e7fff9ae MAINT-2199 restored original UI mechanics, removed icons from UI list 2016-02-27 16:06:54 +02:00
Ansariel a45d3d8421 Merge Viewer-Bear 2015-06-20 15:35:15 +02:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03: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
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +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
Ansariel e52d57cba2 Merge LL V3.7.23 2015-01-15 15:44:43 +01: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
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -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
MaximB ProductEngine 852d237370 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
Ansariel 876f95295a FIRE-10125: Texture picker allows dragging of textures while in preview mode 2014-01-28 12:28:30 +01: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
Tank_Master 119ce81029 Merge viewer bear updates + merge fixes 2013-09-23 22:10:59 -07:00
Tank_Master 5519c39beb Merge Viewer-bear (Materials 3.6.6 RC) 2013-09-16 16:18:33 -07:00
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Nicky ddb30302f3 Compiler happiness. PAss float instead of double into LLColor4 ctor. 2013-05-01 23:42:41 +02:00
Ansariel c38b4b2145 Synchronized LLTextureCtrl with LL V3 and tagged stuff properly 2013-04-23 19:52:44 +02:00