Dmitry Zaporozhan
f8add4c7fd
Update for major task EXT-2095 - Consolidate Picks and Classifieds into a single tab in the user profile panel.
...
Implemented feature "all accordion headers should be visible in the panel at all times".
--HG--
branch : product-engine
2009-11-26 13:06:35 +02:00
Yuri Chebotarev
6912ada083
merge
...
--HG--
branch : product-engine
2009-11-26 12:59:19 +02:00
Yuri Chebotarev
b884eede51
EXT-2831 Timestamps are missing in nearby chat toasts
...
--HG--
branch : product-engine
2009-11-26 12:58:14 +02:00
Tofu Linden
1942e607f8
merge.
2009-11-26 09:47:00 +00:00
Tofu Linden
0a8e19d498
merge.
2009-11-26 09:43:57 +00:00
Tofu Linden
9b0236990b
sketch what I think it wrong here.
2009-11-26 09:41:18 +00:00
Mike Antipov
e2f4ad93ed
No ticket. Place "script_floater" in alphabetical order.
...
--HG--
branch : product-engine
2009-11-26 11:41:04 +02:00
Mike Antipov
e0717c6aac
Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater) started by Lynx (LLVoiceControlPanel))
...
-- made Voice Control Panel dockable to speak panel
-- move button toggle state processing from the code to xml
--HG--
branch : product-engine
2009-11-26 11:39:59 +02:00
Tofu Linden
35e5a5005e
merge.
2009-11-26 09:38:21 +00:00
Yuri Chebotarev
4c81e7a85c
merge
...
--HG--
branch : product-engine
2009-11-26 09:31:55 +02:00
James Cook
928b7cba3e
Linker optimization, use extern template for LLView::getChild<>
2009-11-25 22:00:15 -08:00
richard
9d52d15db8
fix for ellipses on a single line
2009-11-25 20:11:04 -08:00
richard
4885ddab8d
EXT-1944 - Implement ellipsis in message well
...
EXT-699 - Toasts should display maximum 6 lines of text before ellipses are applied
EXT-2453 - TextBox displays an extra line of text
2009-11-25 19:55:24 -08:00
richard
edcd835feb
fixed line numbering in script editors
2009-11-25 19:14:55 -08:00
richard
617ca79ed0
forgot to apply resize fix for when text is selected
...
EXT-1995 - [BSI] Get rid of the *blop* sound when a textbox contains more text than displayable
2009-11-25 18:55:15 -08:00
richard
cdb2232284
created container for LLFloaterView for future z-swapping with sidetray
...
floaters can now overlap sidetray
fixed text selection background color to be inverse of text fg color
EXT-2713 Script editor automatically scrolls to the top of script text when text is longer than the window.
reviewed by James
2009-11-25 18:24:39 -08:00
James Cook
52a387e00f
Fix up nav bar buy icon spacing.
...
Trivial, not reviewed.
2009-11-25 17:45:07 -08:00
CG Linden
82575515e0
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-25 16:59:48 -08:00
CG Linden
dd6cfa8f98
Uncomment the run_build_test.py args to debug problem with coverity builds
2009-11-25 16:59:11 -08:00
Rick Pasetto
6824800fa0
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
2009-11-25 15:50:58 -08:00
Rick Pasetto
a7fde5f530
DEV-43402: Don't change the zoom level on the media controls if you click away
...
Review #46
This also adds a feature where llpanelprimmediacontrols remembers
the object/face that you've zoomed in on, and only switches the
zoom/unzoom icon to "unzoom" if the object/face you are hovering over
is actually the object/face you are zoomed in on
2009-11-25 15:50:31 -08:00
Ramzi Linden
96725e157b
merge
2009-11-25 15:29:25 -08:00
Ramzi Linden
5cbf58958d
DEV-40008 retract (some of) the broken formatting in the foreign languages:
...
- use the new [LOCALAMOUNT] variable for floater_buy_currency.xml
- fix the French floater_world_map.xml, floater_animation_preview.xml
2009-11-25 15:26:34 -08:00
Erica
6b6c1d9bcd
merge
2009-11-25 15:25:22 -08:00
Ramzi Linden
543a2e6f9b
EXT-2855 Strings.xml has entries which are not actually user-visible
2009-11-25 15:20:11 -08:00
Mark Palange (Mani)
187e7af46b
merge
2009-11-25 15:11:12 -08:00
callum
a4f8fb48fc
Revert debugging code introduced in last check-in
2009-11-25 14:57:28 -08:00
callum
5e41f8615f
Merge to Tip again (someone else checking in same time as me)
2009-11-25 14:54:34 -08:00
callum
f42dbc3cae
Merge to Tip
2009-11-25 14:53:46 -08:00
callum
cf8b851061
Fix for DEV-42324 (Default exception handler still called sometimes for SLPlugin)
...
Added some code from an online article to patch the CRT and disable all default
exception handling.
2009-11-25 14:52:22 -08:00
Rick Pasetto
3efbd20980
Implement fade-out for llprogressbar, fix problem where setTopCtrl was being called
...
Review #47
2009-11-25 14:39:05 -08:00
Mark Palange (Mani)
61dfff44d4
Change to ensure the start location combo box is being read and stored properly.
2009-11-25 14:38:17 -08:00
Erica
9f84a348ca
EXT-2779 World map - clean up layout and simplify
2009-11-25 14:30:16 -08:00
richard
b2a5a270af
merge
2009-11-25 14:00:48 -08:00
richard
a6877b5200
removed debug spam the proper war
2009-11-25 14:00:03 -08:00
richard
0a1934f8d2
Merge
2009-11-25 13:58:23 -08:00
richard
318ae1419d
Backed out changeset: c94fdea670e5
2009-11-25 13:57:46 -08:00
Rick Pasetto
751a904982
DEV-43046: Move media controls to the bottom of media
...
- Tweaked the algorithm to shift controls down when zoomed in.
- Adjusted some numbers in the XUI file
- Moved some hard-coded constants into the XUI file so they can be data-driven
2009-11-25 13:22:18 -08:00
James Cook
957055396d
merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp
2009-11-25 12:31:24 -08:00
James Cook
59eb8a43a4
Switched line endings to Unix.
2009-11-25 12:17:38 -08:00
James Cook
ef46d4077c
Hook up nav bar For Sale icon to buy land functionality.
2009-11-25 11:51:49 -08:00
richard
422f7fa093
merge
2009-11-25 11:10:31 -08:00
richard
2c775c5429
commented out spam that was slowing side tray opening
2009-11-25 11:09:55 -08:00
Nyx (Neal Orman)
43d52671c8
EXT-2769 hair alpha not applied immediately
...
Apparently none of the texture pickers were invalidating the baked textures
causing selected textures to not appear on the avatar until you actually saved
the wearable. This patch forces the composites to update when you change any
texture or color (or invisibility flag).
Code reviewed by Seraph
--HG--
branch : avatar-pipeline
2009-11-25 13:59:23 -05:00
Sergey Borushevsky
b19b63ad8c
Fixed minor bug EXT-2744 (IM window: Add Friend is disabled after removing friendship with a friends)
...
--HG--
branch : product-engine
2009-11-25 20:46:53 +02:00
Brad Payne (Vir Linden)
2be386826f
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0
...
--HG--
branch : avatar-pipeline
2009-11-25 13:40:48 -05:00
Rick Pasetto
45e9a060b4
DEV-41422 Show Home button and make Stop button remain enabled in time-based media controls
2009-11-25 10:40:26 -08:00
Brad Payne (Vir Linden)
c60165a93c
For EXT-2584: Select and rename new folder when creating new outfit
...
--HG--
branch : avatar-pipeline
2009-11-25 13:39:45 -05:00
Rick Pasetto
05ae52a37f
merge
2009-11-25 09:54:19 -08:00
Rick Pasetto
46b36d4fde
merge
2009-11-25 09:53:24 -08:00