richard
34003b22d7
merge
2010-02-05 14:20:51 -08:00
richard
e75a4ffb6a
EXT-5026 - Crash when exiting from login screen
...
reviewed by Mani
2010-02-05 14:20:27 -08:00
Nyx (Neal Orman)
a4b833f365
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-05 16:43:47 -05:00
Nyx (Neal Orman)
bd9b56272e
EXT-5034 assert triggered for new avatars in LLVOAvatar::restoreMeshData()
...
We had commented out the word "virtual" in front of the function definition
for some reason.
one-liner, reviewed by Bigpapi.
2010-02-05 16:43:38 -05:00
Brad Payne (Vir Linden)
d8f0bc021f
For EXT-4919: Initial gesture setup is wrong for new users. Checkpointing work in progress.
2010-02-05 16:37:23 -05:00
Rick Pasetto
f0c724f933
FIX EXT-4927: use internal browser when requested
...
Review #97
This hopefully fixes the incorrect behavior of using the external browser when the target is specified.
2010-02-05 13:28:42 -08:00
richard
7735ef557d
line ending conversion
2010-02-05 13:24:05 -08:00
richard
124d8e63f7
newlines fixed
2010-02-05 13:22:46 -08:00
richard
b4f4af60ce
merge
2010-02-05 13:20:26 -08:00
Mark Palange (Mani)
02511c4171
merge
2010-02-05 13:20:16 -08:00
richard
9c1198d57d
merge
2010-02-05 13:20:13 -08:00
Mark Palange (Mani)
90be737898
EXT-4232 Keeping gSpashScreen up until the viewer window appears.
...
Move the call to LLSpashScreen::hide() to the point where we show the main window.
Reviewed by Richard
2010-02-05 13:19:42 -08:00
Eli Linden
4c4925e8af
Merge
2010-02-05 13:19:16 -08:00
Eli Linden
dcf82b742a
DEV-43688 cycle3 for JA fixing 3 strings
2010-02-05 13:16:56 -08:00
Eric M. Tulla (BigPapi)
977de17dda
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-05 16:16:33 -05:00
Eric M. Tulla (BigPapi)
443993bc19
EXT-4739 - Crash on teleport after viewer minimize. Making sure we don't accidentally set av self to null & added a few more null checks.
...
-Reviewed by nyx
2010-02-05 16:15:43 -05:00
Rick Pasetto
a8b6083f47
merge
2010-02-05 12:42:33 -08:00
Rick Pasetto
b8a46c81ee
Media classes + A step toward restructuring Nearby Media floater
...
Several changes here:
- Implemented support for "media classification": see http://docs.google.com/a/lindenlab.com/View?id=ddznhrqn_29vhnr2pg8
- Added settings for auto-playing of said classifications
Nearby Media Floater:
- On/Off buttons are now explicit...no more power buttons
- Parcel Media and Parcel Audio are "lighter weight", with no more on/off
- List now sorts with playing items at top, non-playing below
- There is now a "Show" drop-down that filters the list by classification
- Added checkboxes to the bottom to control auto-play settings
More work is needed, so consider this a checkpoint
2010-02-05 12:06:57 -08:00
richard
df3da77fa9
merge
2010-02-05 11:34:49 -08:00
richard
ddfc6efbee
EXT-5025 - Tooltips block mouse clicks
...
EXT-4547 [BSI] it is possible to highlight multiple layers of chat
EXT-3844 Mouse wheel camera zoom is not reflected on View popup slider
EXT-3103 Add an option to restrict entering non-ascii symbols in text editor.
reviewed by Leyla
2010-02-05 11:32:33 -08:00
Loren Shih
41ab785353
automated merge viewer2.0->viewer2.0
2010-02-05 13:39:26 -05:00
Loren Shih
663aa82831
EXT-4618 : Pasting an item into the COF folder creates a copy of the item, not a link
...
EXT-5018 : Automatically reject leading separators from right click menu
Trivial fix to remove "paste" as an option from the COF.
Also contains a partial fix for EXT-5018.
2010-02-05 13:38:52 -05:00
Tofu Linden
3856dcbbf3
trivial comment fixes.
2010-02-05 18:29:20 +00:00
Tofu Linden
9806116fe8
merge.
2010-02-05 18:25:10 +00:00
Mark Palange (Mani)
752a03ee9b
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-05 10:10:43 -08:00
Mark Palange (Mani)
3c9daac7af
merge
2010-02-05 10:10:27 -08:00
Mark Palange (Mani)
e00082c644
EXT-4237 Fixed ShowStartLocation behavior.
...
Now the show don't show behavior is always dependent on the ShowStartLocation pref.
ShowStartLocation defaults to off, but is automatically turned on after first successful login.
Reviewed by Richard.
2010-02-05 10:09:51 -08:00
Tofu Linden
47a01826b1
PE merge.
2010-02-05 18:09:36 +00:00
Dave Parks
43ca4e104b
EXT-4209 Fix for sculptie prims not updating geometry when texture is loaded.
2010-02-05 11:19:14 -06:00
Sergei Litovchuk
95147c4529
Implemented critical task (EXT-4703) Add maturity icons to the Viewer 2 toolbar.
...
- Added maturity icons to location bar.
- Added getting font used in LLLineEditor.
--HG--
branch : product-engine
2010-02-05 19:15:12 +02:00
Andrew Dyukov
a46a029a70
Fixed normal bug EXT-4397 (Call isn't ended after disabling voice).
...
- Added customizing string with notification about ending call depending on voice availability.
- Added closing of open VCP if voice is disabled.
--HG--
branch : product-engine
2010-02-05 19:06:57 +02:00
Aimee Linden
fc9099a0fa
merge
2010-02-05 16:23:13 +00:00
Ychebotarev ProductEngine
166ac89de9
merge
...
--HG--
branch : product-engine
2010-02-05 17:50:26 +02:00
Ychebotarev ProductEngine
ac8753a7ea
fix for major EXT-4833 [NUX] Verify the default size/positon of certain floaters.
...
I don't really like floater_world_map changes.
as for me now it looks much worse...
--HG--
branch : product-engine
2010-02-05 17:48:49 +02:00
Ychebotarev ProductEngine
87cf2ff1ba
fix for major EXT-4833 [NUX] Verify the default size/positon of certain floaters.
...
exept floater_world_map
--HG--
branch : product-engine
2010-02-05 17:46:54 +02:00
Paul Guslisty
77b5a39cc1
Fixed normal bug EXT - 3232 (Make button image overlay placement adjustable via xml)
...
--HG--
branch : product-engine
2010-02-05 17:34:50 +02:00
Ychebotarev ProductEngine
173cb43314
fix typo
...
--HG--
branch : product-engine
2010-02-05 17:34:34 +02:00
Eugene Mutavchi
3ee065838a
Fixed normal bug EXT-1622 ([BSI] When Chat Bubbles are enabled chat by users still shows in nearby chat toasts.)
...
--HG--
branch : product-engine
2010-02-05 17:09:22 +02:00
Eugene Mutavchi
113ae58ef1
Fixed low bug EXT-4217( Favorites overflow list closes after making copy/paste/delete)
...
--HG--
branch : product-engine
2010-02-05 17:09:22 +02:00
Eugene Mutavchi
782cb6ee87
Fixed normal bug EXT-4702 (Elements of type context_menu cannot have font set in XUI xml)
...
--HG--
branch : product-engine
2010-02-05 17:09:22 +02:00
Denis Serdjuk
fd06fb8be5
fixed bug EXT-4135 Region agent limit should be an integer
...
--HG--
branch : product-engine
2010-02-05 16:53:39 +02:00
Paul Guslisty
1002980a70
Fixed critical bug EXT - 4906 (Viewer crashes after group message was sent if close IM chat from message sender previously)
...
--HG--
branch : product-engine
2010-02-05 16:36:19 +02:00
Denis Serdjuk
5138d54b89
fixed bug EXT-4757 URL-name of object is shown as clickable HTTP URL in toasts
...
Cause:
ServerObjectMessage notification uses hardcoded message from simulator. There is no possible to escape object name separately.
Solution:
Whole server message has been escaped using <nolink> tag.
--HG--
branch : product-engine
2010-02-05 16:15:07 +02:00
Aimee Linden
da44a78e6a
EXT-5008 Update Vivox SDK to 3.1.0001.7930
...
Vivox release notes since 3.1.0001.7852:
* SDKIII-2063: Having too many audio devices on a platform (more than 15) will crash the SDK
* SDKIII-2047: P2P: vx_req_session_set_participant_volume_for_me was previously unsupported (EXT-3429)
* SDKIII-2024: moderator mute-all works as expected
* SDKIII-2025: voice fonts would not always parse correctly to provide expected transform
2010-02-05 13:17:10 +00:00
Vadim Savchuk
c2ca361e73
merge
...
--HG--
branch : product-engine
2010-02-05 15:15:05 +02:00
Vadim Savchuk
312f5553ae
Merge from default branch
...
--HG--
branch : product-engine
2010-02-05 15:12:54 +02:00
Andrew Dyukov
bde31b0068
Fixed normal bug EXT-4649 (VCP stays in "leaving call" state if end call in a location where nearby voice chat is disabled)
...
- Added manual setting of title and avatar list for nearby VCP in regions with disabled voice.
--HG--
branch : product-engine
2010-02-05 14:59:28 +02:00
Alexei Arabadji
8bcc52babe
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-02-05 14:41:35 +02:00
Alexei Arabadji
91543fd6ca
fixed EXT-4908 “Report Abuse: Popup prevents interaction with Media Browser”,
...
made HelpReportAbuseEmailLL alert non-modal;
--HG--
branch : product-engine
2010-02-05 14:41:05 +02:00
Dmitry Zaporozhan
790d72e781
Updated normal bug EXT-4772 - No new IM notification when in tabbed IM mode.
...
--HG--
branch : product-engine
2010-02-05 14:35:43 +02:00