Commit Graph

10171 Commits (4bbca7c086724da1af4f8cb6b22e6de8320a0b1b)

Author SHA1 Message Date
brad kittenbrink 4bbca7c086 Fix for false positive in error checking symbol file generation on windows (MissingModuleError). 2010-06-08 11:01:44 -07:00
Lynx Linden 185cd5d261 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-06-07 12:14:13 +01:00
Xiaohong Bao eec00a712f Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-06-04 22:38:22 -06:00
Xiaohong Bao 4c0624b04e EXT-7500: PARTIAL FIXED: Texture Jamming problems with http texture off 2010-06-04 22:26:39 -06:00
Richard Nelson 747435b342 merge 2010-06-04 16:14:43 -07:00
Richard Nelson 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
Xiaohong Bao 3dfcde7e24 EXT-7452: FIXED: gray squares on the world map (nothing to do with map server) 2010-06-04 17:13:04 -06:00
Nyx (Neal Orman) 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
Nyx (Neal Orman) fa5ad6665b Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-06-04 17:36:18 -04:00
Nyx (Neal Orman) 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
Monroe Linden 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
Richard Nelson 9dd68124d1 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-06-04 14:26:14 -07:00
Richard Nelson 1be76eccdf merge 2010-06-04 14:26:08 -07:00
Richard Nelson 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
brad kittenbrink edd224dc7b Yet more error checking for linux symbol file generation. 2010-06-04 14:13:33 -07:00
Eli Linden ceb6647ac1 Merge 2010-06-04 14:00:44 -07:00
Eli Linden 591e309897 EXT-7545 FIX remove untranslatable strings; add translate="false" to en xui 2010-06-04 14:00:15 -07:00
Leyla Farazha b1b4e56bce Merge 2010-06-04 13:23:12 -07:00
Leyla Farazha 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
Richard Nelson 05d7addde7 made LLStringUtil::null const 2010-06-04 12:24:40 -07:00
Monroe Linden 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
Loren Shih 207e250159 automated merge 2010-06-04 14:56:42 -04:00
Loren Shih 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
Loren Shih 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
Loren Shih 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
Loren Shih 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
Palmer Truelson e8a8492795 EXT-7533: FIX for 7800 in gpu table. and added nvidia ion. No code changed 2010-06-04 10:12:58 -07:00
Loren Shih 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
Richard Nelson c53afe4f38 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-06-04 09:17:12 -07:00
Richard Nelson 37392b4b77 removed duplicate winmm entry for debug builds 2010-06-04 09:15:44 -07:00
Nyx (Neal Orman) c26eeb6f7a Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-06-04 11:10:15 -04:00
Loren Shih a77d273e3a automated merge 2010-06-04 10:27:46 -04:00
Loren Shih 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
Loren Shih 0309a18d1a EXT-7628 FIXED Don't cache lower res baked textures
Changed hash mangling algorithm slightly.
2010-06-04 10:23:11 -04:00
Tofu Linden 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
Tofu Linden be7554c3b6 merge from PE's viewer-trunk 2010-06-04 09:52:48 +01:00
brad kittenbrink 602feee681 Merge 2010-06-03 18:21:27 -07:00
brad kittenbrink 94a2a1a98b Backed out renaming of log files (changeset 7357f4ef70df)
executed: 'hg backout -r 7357f4ef70df --merge'
2010-06-03 18:21:06 -07:00
Nyx (Neal Orman) 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
Nyx (Neal Orman) 6286b1cbd4 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-06-03 20:06:34 -04:00
Nyx (Neal Orman) 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
Monroe Linden 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
Andrew A. de Laix 6b9442a88d Automated merge with ssh://hg.lindenlab.com/brad/viewer-public 2010-06-03 14:57:04 -07:00
Eli Linden fbee0d8ef1 Merge 2010-06-03 14:33:36 -07:00
Eli Linden 2d93672587 CT-575 WIP DA linguistic new files 2010-06-03 14:32:15 -07:00
Eli Linden 0312ff71d3 CT-575 WIP DA linguistic 2010-06-03 14:32:04 -07:00
brad kittenbrink 792b9d38cb Added extra error checking to generate_breakpad_symbols.py
so the failure in copy_l_viewer_manifest (fixed in changeset 4ae8723c7d33) won't be so silent in the future.
2010-06-03 13:55:03 -07:00
brad kittenbrink 5d68254c58 FIX VPLAT-248 fixed mising do-not-directly-run-secondlife-bin in linux symbol file.
improper dependencies for the copy_l_viewer_manifest target were causing it to silently fail.
2010-06-03 13:53:32 -07:00
brad kittenbrink 865887b122 Finised a TODO left from recent viewer_manifest.py changes for the copy_l_viewer_manifest target. 2010-06-03 13:51:02 -07:00
Andrew A. de Laix 671092bcbc Strip invalid characters from log files before adding into crash log llsd. 2010-06-03 13:22:50 -07:00