Eric M. Tulla (BigPapi)
96841c60b7
pull and merge of viewer2 changes.
2009-10-29 13:11:50 -04:00
James Cook
00af1cca00
EXT-384 Fix warning about "GrapicsCardTextureMemory" when opening preferences.
...
Trivial misspelling, not reviewed.
2009-10-29 10:02:54 -07:00
Eric M. Tulla (BigPapi)
fb4e95f7ea
Merge after pull from viewer 2.0 changes
2009-10-29 12:49:06 -04:00
Yuri Chebotarev
7d64c6a226
merge
...
--HG--
branch : product-engine
2009-10-29 18:10:25 +02:00
Yuri Chebotarev
19e99af208
fix normal bug EXT-1712 Nearby Chat: change context menu for objects
...
--HG--
branch : product-engine
2009-10-29 18:09:38 +02:00
Andrew Dyukov
191547dcb2
merge
...
--HG--
branch : product-engine
2009-10-29 17:50:31 +02:00
Mike Antipov
8210fba25a
Fixed Low bug EXT-1079 (Buttons disappear on movement controls if switch movement mode while clashing about land)
...
- added validation if fly mode was exactly set to avatar before processing buttons visibility
--HG--
branch : product-engine
2009-10-29 17:48:12 +02:00
Andrew Dyukov
8298a1de68
Fixed normal bug EXT-1556(When the Navbar and Favbar are switched off, floaters still cannot be moved into the space they previously occupied)
...
--HG--
branch : product-engine
2009-10-29 17:47:09 +02:00
Brad Payne (Vir Linden)
ac4a6e2078
merge
2009-10-29 11:22:12 -04:00
Brad Payne (Vir Linden)
cc1c8bb9bc
EXT-1804: Operations on the current look do not enforce one wearable per type
...
DEV-39346: OUTFITS (Operations) : Restrict one shape per look, and some # of multiwearables per look
DEV-38436: OUTFITS : Guarantee every outfit has fully populated links to (one each of) all body parts.
Consolidated all paths for replacing or appending to COF, with common enforcement mechanism for counts of body parts, clothing, etc.
Several functions are no longer needed after these changes, will clean up in a later pass.
2009-10-29 11:19:45 -04:00
Igor Borovkov
ea0abdac1d
IM: cleaned up includes of old im floater stuff llimpanel.h
...
--HG--
branch : product-engine
2009-10-29 16:49:06 +02:00
Igor Borovkov
3a87aa6164
converted workaround to a fix for normal bug EXT-1918 (Region Messages crash the sender and anyone set busy).
...
--HG--
branch : product-engine
2009-10-29 16:33:10 +02:00
Justin C. Rounds (Chuck)
069ac005a9
Fixed 9-slice scaling on FileMenu_BarSelect for http://jira.secondlife.com/browse/EXT-1951
2009-10-29 10:33:06 -04:00
Andrew Dyukov
8c9819f946
Removed unnecessary string which occasionaly appeared after merge
...
--HG--
branch : product-engine
2009-10-29 16:22:56 +02:00
Vadim Savchuk
f04c96c540
Re-enabling an accidentally disabled test
...
--HG--
branch : product-engine
2009-10-29 15:15:17 +02:00
Vadim Savchuk
3f909445e1
merge
...
--HG--
branch : product-engine
2009-10-29 14:49:47 +02:00
Vadim Savchuk
138a9aeb88
Merge from default branch
...
--HG--
branch : product-engine
2009-10-29 14:40:13 +02:00
Denis Serdjuk
97a0108125
fixed bug EXT-1768 Unable to store landmark attached to notecard into Landmarks
...
--HG--
branch : product-engine
2009-10-29 14:09:31 +02:00
angela
9a07f0bac9
merge
2009-10-29 18:08:12 +08:00
angela
53d48741b8
merge
2009-10-29 18:07:46 +08:00
Lynx Linden
1f0896c72a
EXT-332 DEV-40744: Updated the notification wording on successful L$
...
purchase to make it more clear what happens if the transaction takes
longer than 20 mins.
Reviewed the proper intent of the message with H.
2009-10-29 09:22:40 +00:00
angela
07749af387
EXT-1954 Implement Inspector Info i rollover icon
2009-10-29 16:28:04 +08:00
Rick Pasetto
64c2cb6ba1
Completion of rename of llpanelmediahud to llpanelprimmediacontrols
2009-10-28 19:20:30 -07:00
Rick Pasetto
67879996ca
rename llpanelmediahud to llpanelprimmediacontrols
2009-10-28 18:53:43 -07:00
Leyla Farazha
ba5377025b
merge
2009-10-28 18:13:00 -07:00
Leyla Farazha
6a9de7c8ee
merge fix
2009-10-28 18:00:39 -07:00
Erica Firment
62bd0f36f8
Update art assets for Movement and Camera controls in the bottom bar - EXT-969
2009-10-28 17:53:37 -07:00
Rick Pasetto
61a02bfedb
Yet another merge from remote repo
2009-10-28 17:36:16 -07:00
Monroe Linden
8ae2f388b6
Fixes for DEV-41791 and DEV-41920.
...
Reworked some of the autoplay logic in LLViewerMediaImpl to try and make it more consistent when media is unloaded and reloaded by the performance manager.
LLViewerMediaImpl will now keep track of the media state and current time of media that it unloads for performance reasons, and attempt to restore playing or paused media to the same playhead time and state (playing or paused) when it reloads.
Added "done" status that time-based media plugins can use to indicate that they've reached the end of the media and stopped.
Added logging of priority transitions, for use in debugging issues with the peformance manager.
2009-10-28 17:34:03 -07:00
Rick Pasetto
d6a2c5965e
merge from remote repo
2009-10-28 17:33:29 -07:00
Rick Pasetto
5db497e398
FIX DEV-41794: Fix LLLineEditor to obey LLViewDrawContext's alpha
2009-10-28 17:27:38 -07:00
Rick Pasetto
2812d0f19c
DEV-40210 : restructure media controls UI
...
This change completely restructures the media controls XUI
so that it is now more flexible so as to implement mini vs.
standard controls. It also now allows for changes based
on artwork and design still as unyet delivered from 80/20,
as well as any feedback from Brian's user testing.
This is also step 1 of renaming the media "hud" to media "controls"
2009-10-28 17:25:39 -07:00
Leyla Farazha
4374490445
tab container fixes..
2009-10-28 17:12:47 -07:00
Leyla Farazha
9426de7e10
merging...
2009-10-28 17:09:13 -07:00
Steve Bennetts
d993ce14d8
merge
2009-10-28 16:21:14 -07:00
Palmer
9cfcb53d19
Accidently used pull and update instead of fetch. No code changed.
2009-10-28 15:56:43 -07:00
Palmer
0be3878182
EXT-1930 - Crash after failed region crossing then teleport. Null pointer accessed.
...
Reviewed by Nyx
2009-10-28 15:53:29 -07:00
richard
480a1db354
merge
2009-10-28 15:21:44 -07:00
richard
da58b59217
ext-1483 - Scrollable lists in side panel can sometimes get stuck
...
apparent XUI error
Also fixed terminating newlines in text editors not flowing to next line
reviewed by Leyla
2009-10-28 15:21:23 -07:00
Steve Bennetts
7d87e55c54
Merge PE revisions 3765-3786 from https://hg.aws.productengine.com/secondlife/viewer-2-0/
2009-10-28 15:19:32 -07:00
Vadim Savchuk
10aa210e04
Partial implementation of normal priority task EXT-1096 (Implement recent time in recent people list).
...
- Implemented display of last interaction time (e.g. 5m, 3d, 10w).
- Removed dead code for displaying avatar away/busy status.
TODO: i18n, visual fixes.
--HG--
branch : product-engine
2009-10-28 23:59:51 +02:00
Erica Firment
74e70f2f23
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-28 14:57:35 -07:00
Leyla Farazha
a0e766da94
EXT-1697 tab label type not to spec
...
EXT-1870 Remove default tooltips from tab_container widget
EXT-1699 right and left tab edges don't align with edges of tab content area
EXT-1869 tabs flash when your cursor passes over data fields
reviewed by richard
2009-10-28 14:56:31 -07:00
Erica Firment
8e93f2bdf7
EXT-1559 [BSI] Report Abuse floater contains overlapping and truncated text
2009-10-28 14:56:18 -07:00
Steve Bennetts
59407cdb9c
merge
2009-10-28 14:42:46 -07:00
Erica Firment
a81e911382
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-28 14:10:50 -07:00
Erica Firment
42571ea16c
Added new hover art for 3D inspector tooltip
2009-10-28 14:10:34 -07:00
Sergei Litovchuk
07c04df983
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-10-28 22:58:27 +02:00
Sergei Litovchuk
cdefaf5efa
Implemented EXT-1832 'Landmark title - Coordinates should be in second line'.
...
--HG--
branch : product-engine
2009-10-28 22:57:50 +02:00
richard
6e8c5d206e
fix for layout updates of chat history
...
update document rect twice
increased right padding of inline widgets
2009-10-28 12:33:25 -07:00