dc353c205a
Merge
2014-06-10 20:27:31 -07:00
a7111940bc
Replace childSetText with childSetValue and add missing includes for LLViewerRegion.
2014-06-10 12:34:16 +02:00
a773cdd6f7
Fix linux build
2014-01-08 02:36:12 +00:00
dd1bd943b9
MAINT-3592 (Viewer opening square textures should set the 1:1 size constraint)
2014-01-02 22:29:46 +02:00
39e76aaea8
MAINT-3592 (Viewer opening square textures should set the 1:1 size constraint)
2014-01-01 03:43:56 +02:00
e0031d94c3
Performance improvement in texture preview: Only set image dimensions if they actually changed and not per frame
2014-01-27 16:02:36 +01:00
b1d6816362
Added avatar name cache connection handling to LLPreviewTexture
2014-01-27 15:49:42 +01:00
0f04623c8c
Make multi texture preview behave nicely (images fit into the multi floater and multi floater adjusts its size depending on current image)
2014-01-27 15:30:49 +01:00
76825bf956
Undo MAINT-2897 and use our own texture format selection
2013-11-24 11:45:24 +01:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
be9d946375
MAINT-2897 MAINT-2897 Need to be able to save textures from inventory as PNG
2013-08-14 11:32:23 +03: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
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
997335972b
Guard against crashing.
2013-08-24 19:39:39 +02:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
2bcd4323ac
FIRE-10803 : Fix for upload info not fetched on texture preview floater until reopening
...
Bug manifested itself when previewing a texture that was allready loaded and saved in VFS but not yet fetched into memory.
Fix was to add a loaded texture callback that updated the floater.
2013-06-30 22:41:31 -04:00
fc1b766c21
Allow to use user-defined default save format for textures: PNG as an option, not only TGA
...
Used in the texture preview floater or context menu in inventory
2013-05-09 18:17:11 +02:00
1f6e20c5bb
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
2012-09-04 17:43:08 +00: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
0618a95167
Modified texture preview floater for AnsaStorm skin
2012-11-27 09:46:29 +01:00
c7a2bd2acb
Texture preview bugfixes. Text now wraps instead of flowing outside the floater. Text can now be highlighted and copied to
...
clipboard. Added copy uuid button. Fixed some alightments issues.
2012-11-26 23:36:40 -05:00
16206de42f
Disabled line editors for non-editable data in texture preview floater
2012-11-22 18:10:54 +01:00
0c3c333a82
Show asset ID on texture preview floater in case of sufficient permissions
2012-11-22 12:52:35 +01:00
6a76412540
Image metadata reader: Fixed floater height calculation and added crashfix
2012-11-22 11:27:43 +01:00
0733dd92c9
Image metadata reader: Separate uploader name and upload date and use line editors so the text doesn't float over floater boundaries and can be scrolled
2012-11-22 11:13:03 +01:00
299da2f646
Image metadata reader: Switch to HTTP based avatarname cache and display full avatar name (including display name)
2012-11-22 10:34:56 +01:00
eaa3a51a19
Texture comment metadata support.
...
Currently extracts the comment out of the texture if it exists and decodes any <letter>=<value> embedded in the comment.
Currenly LL uses this to id the uploader and time uploaded.
This will be used by the export feature in the future.
2012-11-21 23:36:37 -05:00
71e61766f5
Merge up to 26006 / c02c9b228b5a (FS tip).
2012-01-19 19:43:35 +01:00
3ed0520ac4
Fixed wrong panel height in texture preview floater that prevented buttons from being clickable at full height
2012-01-19 17:57:43 +01:00
1714747536
After merge compare FS tree agsindt V/dev.
...
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
6e857441b1
Fixed full perm textures cannot be saved from preview floater anymore (FIRE-4734)
2012-01-15 01:18:31 +01:00
f8e3d70c1d
Preserve minimum floater size for texture preview floater
2012-01-13 16:33:59 +01:00
9d1c6fd66f
Reworked the texture preview floater: Now opens in full resolution (if viewer windows allows it) and doesn't show unused space for disabled buttons (FIRE-1163)
2012-01-09 20:04:11 +01:00
49fa618fd7
Open texture preview floater when clicking on disabled texture picker. Original implementation by Henri Beauchamp (Cool VL) with permission to use under LGPL (Fixes FIRE-1796)
2012-01-07 00:33:40 +01:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
968a26799b
EXP-737 : Fix texture dimensions display in image preview
2011-04-20 20:32:57 -07:00
4af7e9eb64
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
2011-01-21 16:25:23 -07:00
c46cbafb15
fix for SH-761: Texture Saving Does Not Work
2011-01-18 16:46:33 -07:00
ee538257d3
STORM-622 FIXED Texture picker screws up when multiple textures are opened.
...
Reason:
In viewer 2 ability was added to set aspect ratio while previewing textures. It was achieved by resizing the floater containing a texture, instead of proportionally resize the texture. The problem happened when multifloater was opened with texture preview floaters and for some floaters textures were not loaded yet. After texture was loaded, the floater (in multifloater) which contained just loaded texture resized to fit with the new texture's size and texture preview floaters screwed up from the multifloater.
Solution:
Proportionally resizing a texture inside the floater instead of the floater itself.
Also two issues was fixed: 1. when floater resized the texture streched in the floater and lost its proportions. 2. When docking texture floater to the multifloater, multifloater resized to fit with docked floater and other texture lost their proportions.
2010-12-10 13:01:01 +02:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
00bccf24a8
Allow textures to be saved in TGA or PNG format. Original patch contributed by Alexie Birman. Fixes FIRE-1167
...
Preview texture floater layout optimization. Fixes FIRE-814
2011-07-08 14:57:41 +02:00
10e88f3891
Merge with RLVa-LL2.5.2
2011-04-09 22:24:22 -07:00
becbca6ca7
Fix hang when saving textures to local disk. From SH-761, fixes FIRE-352.
2011-01-24 20:49:00 -06:00
966d00d5e3
FIRE-139, memleak in preview, thanks Nicky Dasmijn
2010-11-24 00:44:45 -05:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07: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
Tank_Master