Mark Palange (Mani)
9317e46a87
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
2009-11-06 12:54:33 -08:00
Justin C. Rounds (Chuck)
3f81727078
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-06 15:45:56 -05:00
Justin C. Rounds (Chuck)
c9b03c56af
Updated default_profile_picture to match style. Added Blank graphic to use as overlay icon (in order to produce tool-tip). Created panel_profile_user.xml which is a profile panel specifically for the current user, and modified panel_me_profile to call it accordingly.
...
http://jira.secondlife.com/browse/EXT-2245
2009-11-06 15:44:43 -05:00
Rick Pasetto
113c7edf60
FIX DEV-41587: Update current URL in draw()
...
The current URL is now re-fetched from the current selection.
Also did some minor refactoring
2009-11-06 12:21:21 -08:00
Steve Bennetts
0db73b1ac5
merge
2009-11-06 12:20:52 -08:00
Steve Bennetts
afe6350160
merge from texture-pipeline
2009-11-06 12:15:41 -08:00
James Cook
5b5df47697
Make test text floaters so Erica can make a call on final font sizes.
2009-11-06 12:15:36 -08:00
Sergei Litovchuk
9c55ff9390
Fixed normal bug EXT-1509 "Going into mouselook while in a private call
...
ruins the call floater.":
- Made callfloater a single instance floater.
- Updated floater IM panel visibility change logic.
- Added NULL checks for voice client pointers in LLFloaterIMPanel.
--HG--
branch : product-engine
2009-11-06 22:13:59 +02:00
Denis Serdjuk
4dbd169537
fixed bug EXT-2239 Preferences > Graphics has 2 entry fields for UI Size
...
--HG--
branch : product-engine
2009-11-06 21:38:16 +02:00
Vadim Savchuk
591d9d5c2b
hg merge
...
--HG--
branch : product-engine
2009-11-06 21:30:10 +02:00
Vadim Savchuk
64b476133f
merge
...
--HG--
branch : product-engine
2009-11-06 21:28:48 +02:00
James Cook
07c63d8906
merge
2009-11-06 11:17:43 -08:00
Denis Serdjuk
cd9c07258d
fixed bug EXT-2111 Unable to edit the Notes & Privacy content
...
--HG--
branch : product-engine
2009-11-06 21:17:08 +02:00
James Cook
d8864522a4
Changed default help URL for board demo per email discussion on viewer2009@lists.
2009-11-06 11:09:09 -08:00
James Cook
30467bda7c
Show glow around interactive objects on hover. Glow shows through objects/avatars - this is expected.
...
Effect from DaveP long ago, hover code by me long ago, just changing the default setting.
2009-11-06 11:06:20 -08:00
Vadim Savchuk
22a1f909b4
merge
...
--HG--
branch : product-engine
2009-11-06 21:04:36 +02:00
Vadim Savchuk
f716bb1e3a
Backed out changeset c3b8509f465a (EXT-989) as causing numerous conflicts.
...
Will reapply the changes later.
--HG--
branch : product-engine
2009-11-06 21:04:04 +02:00
Mark Palange (Mani)
05baf9940b
merge
2009-11-06 10:53:51 -08:00
Sergey Borushevsky
a9653b37ec
No ticket, added comments to split-by-date code.
...
--HG--
branch : product-engine
2009-11-06 20:46:50 +02:00
Tofu Linden
f0bfea3438
merge.
2009-11-06 18:45:26 +00:00
Tofu Linden
b99ebeed9c
Backed out changeset ad70c07b05b6
...
(ad70c07b05b6 was 'Reduced "Medium" font size, which is a temporary fix until menu font can be defined specifically. http://jira.secondlife.com/browse/EXT-1315 ')
This change was too all-around impactful just for the sake of the menu font - it made medium and small font sizes indistinguishable, leading to lots of invisible mismatches as long as this hack persisted...
2009-11-06 18:44:48 +00:00
Nyx (Neal Orman)
258eb3d7dd
EXT-1823 avatar shape corrupted with huge legs/feet
...
As suspected a morph mask issue. Apparently we were setting success to false
if the user specifies a pant or shrit texture without an alpha channel.
Result: bad morph masks.
Patch begins to clean up the isMorphMaskValid issue, as well as fixing this
error.
Code reviewed by Vir
2009-11-06 13:10:38 -05:00
Vadim Savchuk
d60962324a
Merge from default branch
...
--HG--
branch : product-engine
2009-11-06 20:03:52 +02:00
Dmitry Oleshko
dae2e04f19
partial implementation for the major task (EXT-989) IM chiclets should expand to show active voice indicator
...
--HG--
branch : product-engine
2009-11-06 20:03:03 +02:00
Tofu Linden
dbd749d533
DEV-42322 webkit plugin fails to start on linux in mercurial repo
2009-11-06 17:57:15 +00:00
Alexei Arabadji
8f679595d5
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-11-06 19:31:45 +02:00
Alexei Arabadji
8a4e36a9bd
fixed EXT-2295 "'Group Chat' btn makes chicklet appear only"
...
--HG--
branch : product-engine
2009-11-06 19:31:27 +02:00
Tofu Linden
c01a2b2a93
merge.
2009-11-06 17:02:16 +00:00
Tofu Linden
44673e5b40
merge.
2009-11-06 16:42:49 +00:00
Tofu Linden
956ce3af65
M_PI -> F_PI - who knew that M_PI was dropped from C99 onwards?!
...
Oh well, this should still be better.
2009-11-06 16:41:56 +00:00
Denis Serdjuk
01c83aa21e
partial fix for minor bug EXT-1607 Trash and Gear buttons are enabled when nothing is selected. Now gear button will disabled when nothing is selected.
...
--HG--
branch : product-engine
2009-11-06 18:39:00 +02:00
Lynx Linden
3f3c0053ee
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-06 16:36:41 +00:00
Lynx Linden
2ea6893b15
EXT-2231: Let users view release notes for a server change.
...
I've added a hyperlink to the "You just entered a region using a
different server version" notification. Users can click over this link
to view the release notes for that server version.
This notification recently started turning up in the local chat log,
so the above solution works in that case as well as if it remained as
a popup notification panel.
2009-11-06 16:35:30 +00:00
Tofu Linden
dfa9e7faaf
merge.
2009-11-06 16:00:21 +00:00
Igor Borovkov
0d10e916ec
merge
...
--HG--
branch : product-engine
2009-11-06 17:26:25 +02:00
Igor Borovkov
f6aa7f8c80
implemented normal subtask EXT-2263 IM P2P: avatar name under avatar icon should follow avatar icon and should not overlap it when being resized
...
--HG--
branch : product-engine
2009-11-06 17:25:50 +02:00
Tofu Linden
66171216b0
SNOW-329 Handling of error case in llimage.cpp incorrect
...
This is the same fix as DEV-32269, trivially ported to viewer2.
reviewed by merov, james, moss!
2009-11-06 15:19:30 +00:00
Igor Borovkov
a3830dee59
implement normal subtask EXT-2265 IM unread messages counter should not be increased for system messages (comming from 'Second Life', zero uuid)
...
--HG--
branch : product-engine
2009-11-06 17:03:48 +02:00
Andrew Polunin
30fe1aa197
fixed normal bug EXT-2193 Group Profile, Group Chat bttns and Profile chevron are enabled for None Group
...
--HG--
branch : product-engine
2009-11-06 17:00:26 +02:00
Tofu Linden
6552c1a973
merge.
2009-11-06 14:58:27 +00:00
Eugene Mutavchi
4b80490222
Fixed low bug EXT-2109 (Add moderator label if user is a moderator of a group chat(See old communication floater))
...
--HG--
branch : product-engine
2009-11-06 16:01:11 +02:00
Igor Borovkov
ddb42652e3
IM: minor refac., moved floater registation of llviewerfloaterreg
...
--HG--
branch : product-engine
2009-11-06 15:49:56 +02:00
Eugene Kondrashev
0c95cc78e5
No ticket fixed dropped functionaliti by prev commit
...
--HG--
branch : product-engine
2009-11-06 15:48:27 +02:00
Denis Serdjuk
e4fdc0ba55
no ticket. major crash in Panel Landmark has been fixed. It was founded while investigating EXT-1607.
...
--HG--
branch : product-engine
2009-11-06 15:41:05 +02:00
Tofu Linden
904f6124b2
magic number removal rampage: 3.14159 -> M_PI or F_PI
...
--HG--
branch : texture-pipeline
2009-11-06 13:27:28 +00:00
Eugene Kondrashev
bc3377c1f6
Partial implementation of EXT-1906 All speakers handling functional in old IM Floaters (Communicate) should be present in new IM Floaters/IM control panels, EXCLUDING voice related mute/moderation stuff
...
--HG--
branch : product-engine
2009-11-06 14:49:35 +02:00
Lynx Linden
c189943583
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-06 12:12:47 +00:00
Lynx Linden
1c591c06b7
EXT-2232: Arghhh! Code Duplication == Bugs.
...
Apparently, pre-login notifications use LLAlertDialog, but post-login
notifications use LLToastAlertPanel. The latter is basically a copy
and paste of the former, with some local modifications. However, the
person who copy/pasted the code did not initialize the URLLoader
callback, so all notifications that tried to open a web page on a
button click after login were failing.
I've added comments that this code should be refactored, preferably as
a subclass of LLAlertDialog. In the meantime, I've tried to clean it
up a bit by not duplicating the nested URLLoader class (which would've
required further duplication to reimplement the exact same loader class
that LLAlertDialog uses). This let me then initialize the URLLoader
callback for LLToastAlertPanel, to fix this specific bug.
Again... arghhh!!
2009-11-06 12:08:15 +00:00
Tofu Linden
56281befc1
fix the Ext-2191 linux compile failure
...
min->llmin, max->llmax
2009-11-06 12:06:35 +00:00
Xiaohong Bao
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00