17520c17b1
EXT-6571 WIP - adding ability to handle late-arriving assets
2010-06-11 08:26:18 -04:00
52194cac67
automated merge
2010-06-07 17:08:48 -04:00
e9fdbadea5
EXT-7628 FIXED Don't cache lower res baked textures
...
Fixed an error in logic - low res textures should be identified by uploadNeeded versus uploadPending.
Also added a llinfos debugging line.
2010-06-07 17:07:28 -04:00
085b2c24f9
Merge from viewer-public
2010-06-07 11:27:42 -07:00
ea5d8a1634
merge backout
2010-06-07 17:31:59 +01:00
3057651b1a
EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.
...
Backed out changeset e6feef9704cf to re-introduce Bao's fix
2010-06-07 17:31:22 +01:00
b1e9c9bab0
automated merge
2010-06-07 10:31:50 -04:00
aaf296c2ce
EXT-7145: PARTIAL make viewer to handle "URL redirect" for http texture.
...
Upgrade Darwin libcurl to 7.20.1 and ares to 1.7.1
2010-06-07 14:59:01 +01:00
eec00a712f
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-06-04 22:38:22 -06:00
4c0624b04e
EXT-7500: PARTIAL FIXED: Texture Jamming problems with http texture off
2010-06-04 22:26:39 -06:00
747435b342
merge
2010-06-04 16:14:43 -07:00
e133f8b7d5
EXT-7492 FIX Invalid previews are loaded for body parts in the Appearance SP
...
reviewed by Nyx
2010-06-04 16:14:30 -07:00
3dfcde7e24
EXT-7452: FIXED: gray squares on the world map (nothing to do with map server)
2010-06-04 17:13:04 -06:00
92b104f416
VWR-19699 Correct "wear" and "add" behavior
...
added "add" menu item to clothing right-click menus and corrected
"wear" to mean "replace top wearable of this type"
reviewed by Richard
2010-06-04 18:43:13 -04:00
fa5ad6665b
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-06-04 17:36:18 -04:00
244321e70c
AVP-44 VWR-19699 FIX Multi-wearables and wearable replacement logic
...
Cleaned up a few things upon code review.
Code reviewed by vir for this checkin as well as following previous commits:
a801af3728ee
af42810b946c
2010-06-04 17:34:46 -04:00
58f008dd14
Fix for EXT-7571 (Camera is left in object view mode after leaving "edit appearance" mode)
...
Call gAgentCamera.resetView() when exiting appearance/outfit editing mode.
2010-06-04 14:30:54 -07:00
9dd68124d1
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-06-04 14:26:14 -07:00
1be76eccdf
merge
2010-06-04 14:26:08 -07:00
46e1253ee1
DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the viewer
...
reviewed by Mani
2010-06-04 14:25:51 -07:00
ceb6647ac1
Merge
2010-06-04 14:00:44 -07:00
591e309897
EXT-7545 FIX remove untranslatable strings; add translate="false" to en xui
2010-06-04 14:00:15 -07:00
82f8be5ca3
EXT-7626 FIXED INFRASTRUCTURE LLTexLayer code cleanup
...
Cleaned up readBackAndUpload and added better comments.
2010-06-04 16:32:18 -04:00
b1b4e56bce
Merge
2010-06-04 13:23:12 -07:00
c393383f44
EXT-7502 Save as option while modifiying a body part doesn't prompt for name, and just saves changes.
...
reviewed by Nyx
2010-06-04 13:22:00 -07:00
05d7addde7
made LLStringUtil::null const
2010-06-04 12:24:40 -07:00
207e250159
automated merge
2010-06-04 14:56:42 -04:00
36a10312a5
EXT-7526 WIP Add baked texture information to texture view
...
More informative logic added in to track when an upload is actually happening.
Did some minor reformatting.
2010-06-04 14:56:24 -04:00
6d840687a5
Fix for the last part of EXT-7366 (Need to change camera view of avatar previews on 'Front view' while editing shapes).
...
Reviewed by Richard.
2010-06-04 11:56:08 -07:00
cfc98d7e37
EXT-7526 WIP Add baked texture information to texture view
...
Minor logic fix for status display.
2010-06-04 14:17:13 -04:00
f457eaf67d
EXT-7526 WIP Add baked texture information to texture view
...
Added color, emphasis, and more information to texture view.
2010-06-04 14:14:36 -04:00
4ec55cdb5b
EXT-7504 WIP Force decloud after timeout using lower res textures
...
Trivial change to texture debug readout.
2010-06-04 13:14:41 -04:00
e8a8492795
EXT-7533: FIX for 7800 in gpu table. and added nvidia ion. No code changed
2010-06-04 10:12:58 -07:00
6a3ff07783
EXT-7504 WIP Force decloud after timeout using lower res textures
...
Added fix for logic behind resetting upload timer.
2010-06-04 12:56:17 -04:00
4db92e5155
EXT-7342 FIXED Updated the link to the Voice Morphing marketing page.
...
This link will be broken until the official page goes live.
2010-06-04 17:40:18 +01:00
c53afe4f38
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-06-04 09:17:12 -07:00
37392b4b77
removed duplicate winmm entry for debug builds
2010-06-04 09:15:44 -07:00
b570ee5fbc
Merged from viewer-public
2010-06-04 09:03:00 -07:00
44ac5dc937
Merged from viewer-public
2010-06-04 08:55:51 -07:00
c26eeb6f7a
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-06-04 11:10:15 -04:00
a77d273e3a
automated merge
2010-06-04 10:27:46 -04:00
882d8952da
EXT-7504 WIP Force decloud after timeout using lower res textures
...
Added hack for testing lower texture discard level performance.
Enabled LowResTextures timeout.
2010-06-04 10:25:40 -04:00
0309a18d1a
EXT-7628 FIXED Don't cache lower res baked textures
...
Changed hash mangling algorithm slightly.
2010-06-04 10:23:11 -04:00
15b855409a
Fix a long-suffering logging unit test failure, re-enable the test.
...
This makes logs look less scary on Linux, in-line with other platforms.
2010-06-04 13:58:19 +01:00
be7554c3b6
merge from PE's viewer-trunk
2010-06-04 09:52:48 +01:00
47beb6dc9c
AVP-44 WIP Multi-wearables architecture
...
One step closer to full support of multi-wearables architecture
code will be reviewed before pushing.
2010-06-03 21:09:49 -04:00
6286b1cbd4
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-06-03 20:06:34 -04:00
2caa710a46
VWR-19699 WIP Correct operations for wear and replace on wearables
...
Resident-submitted patch, cleaned up so it matches style and compiles/builds
well. Appears to work for stated goals but will need some more UI work to
ensure consistency.
WIP checkin, will be code reviewed before pushing.
2010-06-03 20:06:25 -04:00
a916467668
Code cleanup in LLPanelEditWearable, from Nyx.
...
Removed the misnamed LLPanelEditWearable::initializePanel() (which was actually being called multiple times for each object), and moved its functionality to postBuild() and showWearable().
2010-06-03 16:40:44 -07:00
f968b6078b
merge
2010-06-03 15:00:59 -07:00
Brad Payne (Vir Linden)