Commit Graph

3187 Commits (62233f22469cdc66042fc7bbbbd367dbb7212fde)

Author SHA1 Message Date
Dave Parks 62233f2246 Fix for copying of tetrahedrons in place of mesh LODs.
Fix for bad tetrahedron bounding box.
Bad fix for simultaneous loading of multiple LODs.
2009-11-24 07:38:04 -06:00
Dave Parks 5f44d4398a merge 2009-11-18 18:11:14 -06:00
Dave Parks 81bfdcbfae Tetrahedron displays in place of unloaded mesh. Still has some LOD issues. 2009-11-18 18:10:48 -06:00
Jonathan@Chomp.lindenlab.com 1f71cd20e8 Fixed variable price upload path. 2009-11-18 11:38:31 -08:00
Palmer a056423e62 Merge of latest viewer 2 changes 2009-11-17 13:42:19 -08:00
Palmer 53495d74ee Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0 2009-11-17 13:40:11 -08:00
Ramzi Linden 2365dbcd45 merge 2009-11-18 03:15:30 +08:00
Ramzi Linden d6bbc652de L10N: fix a typo in a localized label 2009-11-18 02:53:44 +08:00
Ramzi Linden 7edbb53b91 L10N: use consistent wording in strings.xml for Away/NotAway and Busy/NotBusy 2009-11-18 02:33:08 +08:00
Ramzi Linden 66979d26bb L10N: linguistic improvements to some tooltips in floater_tools.xml 2009-11-18 02:15:38 +08:00
James Cook 6253e2611d merge 2009-11-17 10:03:49 -08:00
James Cook a2041387b1 Fix broken URL highlighting in local chat, broken in 5068 : ce08ac445035. Typo, not reviewed. 2009-11-17 10:02:01 -08:00
James Cook ddee62b833 Nudge parabuild 2009-11-17 09:28:23 -08:00
Tofu Linden ac325092cd Rebuild linux llqtwebkit/qt with -fno-stack-protector for better runtime compatibility.
I hope.
2009-11-17 16:46:52 +00:00
Tofu Linden 65efbae9af magickal newline to unbreak linux. 2009-11-17 16:23:59 +00:00
angela 2217a67710 Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-17 16:34:06 +08:00
angela 0098bf40ea undo the changes for LLStyle params; add sizeFromFont in LLFontGL ; use font.style, font.name and font.size params for font creating 2009-11-17 16:33:49 +08:00
James Cook 028a8af519 Allow UI tooltips and "ambient inspector" tips to have different text colors 2009-11-16 23:33:12 -08:00
James Cook f15862eee0 merge 2009-11-16 22:40:04 -08:00
James Cook ccc72757ef Fix comment-in-comment that was breaking Mac build. 2009-11-16 22:25:40 -08:00
James Cook 2852fce2de Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-16 21:49:46 -08:00
James Cook a97941369d EXT-1546 Don't show inspector (i) icon in empty groups list.
Apparently some name lists have placeholder items at the top, so don't show
the inspector icon unless there is a valid UUID.
2009-11-16 21:39:23 -08:00
James Cook 975be13dc5 Automated merge with ssh://hg.lindenlab.com/james/gooey/ 2009-11-16 21:01:39 -08:00
James Cook ed0516e0a9 Change tooltip text to DkGray2, more readable. 2009-11-16 21:00:59 -08:00
Erica 6820f18ec5 EXT-2537 Update IM message well arrows with actual art, style chiclets to spec, EXT-2536 Remove old art from scrollbar headers, clean up layout 2009-11-16 20:23:01 -08:00
callum 18980efe16 Fix up line endings issues. 2009-11-16 19:49:45 -08:00
callum f693e70c24 Restore a minor change to the media test mule that was checked in by mistake 2009-11-16 19:47:35 -08:00
Erica cab4c5c604 Chat Item layout 2009-11-16 19:45:39 -08:00
callum 0ae9284adb Merge with Tip 2009-11-16 19:23:28 -08:00
callum ac9963ade2 Fix for - DEV-42713 (Playing MP3s crash the QuickTime plugin)
Note: This was fixed earlier in checkTitle() bosy and checked in by mistake.
This checkin re-enables the title grabbing code.
2009-11-16 19:22:45 -08:00
richard ce3b90566a merge 2009-11-16 19:15:31 -08:00
richard 76d7ecf6ba fix for llfasttimer not appearing with tall windows
reviewed by Palmer
2009-11-16 19:14:59 -08:00
callum 221461f002 Merge with tip 2009-11-16 18:44:27 -08:00
callum 18eab4a026 Merge with tip 2009-11-16 18:42:35 -08:00
callum 16fa3a40e3 Fix for usual signed/unsigned int error from Mac developed changes.. 2009-11-16 18:41:53 -08:00
Mark Palange (Mani) d3b03c7f53 Merge with viewer-2-0 changes 2009-11-16 18:19:43 -08:00
angela 28aa749db5 Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-17 10:04:41 +08:00
Erica e0eee4324e Chat Item layout 2009-11-16 17:53:48 -08:00
Monroe Linden 27a555e443 Hopefully the final fix for DEV-42800 (white flash at login).
Reinstated the hide_loading parameter to LLMediaCtrl, and made it cause LLMediaCtrl::draw() to early-exit between creating the LLViewerMediaImpl and receiving the initial MEDIA_EVENT_NAVIGATE_COMPLETE.
2009-11-16 17:53:18 -08:00
Erica 6b71a9f651 Chat Header layout 2009-11-16 17:40:16 -08:00
Erica a33a53cacd IM Control layout 2009-11-16 17:33:30 -08:00
Erica 9849abc213 EXT-2537 Update IM message well arrows with actual art, style chiclets to spec 2009-11-16 17:25:28 -08:00
Monroe Linden d504efe301 Made nearby media list sort on distance from avatar instead of priority.
When the MediaPerformanceManagerDebug debug setting is enabled, the list will sort by priority the way it used to.
2009-11-16 16:52:43 -08:00
brad kittenbrink 6e7d131e58 Fix for EXT-2529,Windows error: "application configuration is incorrect."
Fixed by implementing DEV-41250 and integrating merov's DEV-31329 "curl crashers"
work into viewer-2-0.
2009-11-16 19:06:44 -05:00
Xiaohong Bao 39efc3de51 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-16 15:39:25 -08:00
Xiaohong Bao b62a8c14ed fix for DEV-2530: crash after teleporting to refion. 2009-11-16 15:37:52 -08:00
Monroe Linden e4453f9cc8 Added MediaPerformanceManagerDebug debug setting. 2009-11-16 15:34:33 -08:00
Mark Palange (Mani) c0b10c2949 EXT-2529 Fixed viewer_manifest.py to check secondlife-bin.exe for bad manifest linking. Reviewed by Palmer. 2009-11-16 15:19:42 -08:00
Lis Pardi c419d1ea5f Automated merge with ssh://lis@hg.lindenlab.com/james/gooey 2009-11-16 18:11:00 -05:00
Lis Pardi f11f2a1ea2 ext-1639 Removed Use Fullscreen check box from Preferences > Graphics 2009-11-16 18:07:28 -05:00