e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
673afb955b
MAINT-4253 FIXED Don't call setSelection() twice.
2014-07-22 11:36:27 +03:00
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
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
dc353c205a
Merge
2014-06-10 20:27:31 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
a1e986e2b0
MAINT-3364 FIXED Call clearSelection() from root_folder
2014-01-10 12:37:01 +02:00
cad40bee13
MAINT-3364 (Texture picker highlights the wrong texture when no texture is found since CHUI.)
2013-11-13 14:56:14 +02:00
852d237370
MAINT-3364 (Texture picker highlights the wrong texture when no texture is found since CHUI.)
2013-11-13 14:56:14 +02:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
876f95295a
FIRE-10125: Texture picker allows dragging of textures while in preview mode
2014-01-28 12:28:30 +01:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
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
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
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
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
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
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
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
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
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
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
119ce81029
Merge viewer bear updates + merge fixes
2013-09-23 22:10:59 -07:00
5519c39beb
Merge Viewer-bear (Materials 3.6.6 RC)
2013-09-16 16:18:33 -07:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
ddb30302f3
Compiler happiness. PAss float instead of double into LLColor4 ctor.
2013-05-01 23:42:41 +02:00
c38b4b2145
Synchronized LLTextureCtrl with LL V3 and tagged stuff properly
2013-04-23 19:52:44 +02:00
96ac71e71f
Only open texture preview floater from texture picker control if texture is not masked
2013-04-23 18:49:47 +02:00
9230cd37c1
Add masking feature to texture picker control; Original implementation by Skills Hak, with permission to use under LGPL
2013-04-23 18:22:10 +02:00
3d0ec3da5b
CHUI-659 : WIP : Verified (tested) and cleaned up some CHUI-101 refactoring code.
2013-01-07 15:32:47 -08:00
1f6e20c5bb
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
2012-09-04 17:43:08 +00: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
1d0498421d
Merge SSA push 5 (part1, pre CHUI stuff)
2013-03-19 16:34:59 -07:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
ae548a1701
FIRE-8298: Fixed apply now checkbox in texture picker has no effect
2012-11-24 13:44:03 +01:00
9a3ed1022f
FIRE-5082: "Transparent" button in Texture Panel
2012-11-06 05:38:04 +01: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
Ansariel