50d21a75a7
merge
2010-11-15 15:52:54 -08:00
52d3f86438
fixed merging of textures.xml between current skin and base
...
now possible to define new textures in current skin
2010-10-04 18:39:09 -07:00
d65e512fa3
Automated merge up from viewer-development
2010-10-04 11:21:18 -04:00
0edb695ea8
instead of exposing mutable container in LLInitParam::Multiple, just expose access functions, begin(), end(), etc.
...
this allows mutation of param block contents, without being able to change number of elements
2010-09-22 14:48:18 -07:00
fcdd09772f
debug code for SH-115: investigate texture related network traffic between viewer 2.x and 1.23.
2010-09-16 13:13:06 -06:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
65c9914d23
made Params parsers not act as singletons
2010-08-23 11:03:19 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
b9cc3a34da
EXT-7399: FIXED: 2.0.2 with http textures loads textures slower than 1.23.5
2010-08-10 16:43:31 -06:00
540e2d8e5d
EXT-8301: FIXED: crash at LLViewerFetchedTexture::cleanup() [secondlife-bin llviewertexture.cpp]
2010-07-15 15:16:50 -06:00
493d99c684
EXT-8411: FIXED: load unnecessarily large icon textures.
2010-07-14 15:02:44 -06:00
26b03161f5
fix for EXT-7839: texture console is stalled;
...
fix for EXT-7500: Texture Jamming problems with http texture off;
2010-06-30 18:21:08 -06:00
1ec70d45e4
minor typo fixes: texure->texture
2010-05-29 06:23:16 +01:00
7b2e66b4d9
fix for EXT-5869: some UI textures loading delayed or broken in Release mode.
2010-02-27 23:08:35 -07:00
254db516c5
fix for EXT-5710: improve the raw image reloading process in the texture pipeline; EXT-4612: failing assert LLViewerTexture::setDecodePriority: ASSERT (!mInImageList); EXT-4912: Texture alpha mask is not applied on the first frame after decode.
2010-02-24 12:09:22 -07:00
c510fed273
Soften another common llassert() failure to a warning.
2010-01-21 15:39:19 -08:00
a0666bdb70
Turn on llassert() and llverify() for RelWithDebInfo builds.
...
Convert top firing asserts into big warnings.
To be reviewed by Mani.
2010-01-21 14:42:11 -08:00
66f5f2b922
EXT-4470 Several bad assumptions that LL_PATH_PER_SL_ACCOUNT is always good (which it isn't until after login)
...
To be reviewed by Soft!
2010-01-18 14:07:03 -08:00
abe0eb2ba7
HTTP Texture changes:
...
* Fixed bug in llqueuedthread.cpp causing unnecesssary sleeeping
* Fixed an issue that was preventing retries on 503 errors
* Added number of pending creates to Texture View
* Increased time allocated for texture creates
2009-12-17 16:19:00 -08:00
9aa12417cb
ext-3087 - avatar icon is truncated badly
...
reviewed by James
2009-12-08 14:08:58 -08:00
659dc5224e
DEV-42989: Adjust media priority based on app minimization and focus
...
Review #49
This change adjusts each media's priority based on whether the viewer is minimized (media priority becomes HIDDEN) or unfocused (media priority becomes LOW). However, due to the fact that updateMedia() was no longer being called when minimized, I moved its call out of LLViewerTextureList::updateImages() (a seemingly odd place anyway) and into its own idle callback.
2009-12-01 15:38:09 -08:00
f4fdaa8ee9
merge
2009-11-13 18:27:59 -08:00
ffadb3d29f
renamed UIImageDeclaration::scale_rect to scale to be consistent with XML attribute name
2009-11-12 16:13:46 -08:00
f884941a8f
use "LLViewerTexture::EBoostLevel" to replace "S32" for texture boost level.
2009-11-11 14:53:13 -08:00
afe6350160
merge from texture-pipeline
2009-11-06 12:15:41 -08:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
abf77532d8
fix the bug that textuer boost level is mixed with boolean numbers.
2009-11-03 19:42:52 -07:00
53c972a521
* Changes to enable differentiating between icon texture priority and other UI texture priority.
...
* Still need to only request smaller mip maps of icon textures
2009-10-25 23:05:15 -07:00
fdc848cf72
removed unnecessary static variable instantiations to improve compile times
...
moved a bunch of template class statics to cpp files
also added filename parameter to LLXUIParser::readXUI for better debugging of XUI errors
reviewed by James
2009-10-20 22:05:00 +00:00
745845f799
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
...
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
af98aad98d
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3
...
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-26 20:47:27 +00:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
c3cbd04985
svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6
...
QAR-1771 Linux Viewer Autoupdater + XUI-parse refactoring
2009-08-21 21:52:21 +00:00
eb853f55c0
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-08-04 01:12:59 +00:00
ca51e8f33d
Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
...
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
2009-07-27 16:50:01 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
Richard Linden