Lynx Linden
b3f8cec38c
DEV-43977: Changed pre-login help browser behavior.
...
The special pre_login_help topic is now only displayed when the user
clicks on the "Need help logging in?" link on the login screen, or
selects the top-level Help > Second Life Help (F1) menu.
2009-12-10 22:38:29 +00:00
Lynx Linden
d575af6a65
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-10 19:05:41 +00:00
Lynx Linden
d06ef88783
DEV-43679: Display god level warning in Search window.
...
If you change your god level from when you performed a search, the
search results may be inappropriate for your god level (we pass the
current god status to the search web pages). When this is the case, we
now display a warning at the bottom of the search floater to let the
user know that they should redo their search.
2009-12-10 19:02:33 +00:00
Steve Bennetts
f6a1858884
Merge with product-engine
2009-12-10 10:14:17 -08:00
Igor Borovkov
3e13bc913f
merge
...
--HG--
branch : product-engine
2009-12-10 19:02:32 +02:00
Igor Borovkov
f11c604456
fixed EXT-3247 (There is no title in Ad-hoc IM window, and only "To" is shown if user accepts Ad-hoc conference)
...
sometimes a session name received from a server is empty,
added generating a correct session name in such a case
--HG--
branch : product-engine
2009-12-10 18:45:36 +02:00
Alexei Arabadji
6a59342963
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-10 18:39:22 +02:00
Alexei Arabadji
5c1cea1e76
implemented EXT-3341 “URLs should be clickable in the IM toasts”,
...
replaced mouseDown callback with handleMouseDown method to provide possibility
to separate mouse down event on panel and in panel children;
--HG--
branch : product-engine
2009-12-10 18:39:06 +02:00
Paul Guslisty
9e8bbf098a
Fixed low bug EXT - 3255 (Call button is enabled in the People & Profile panels while voice is disabled)
...
--HG--
branch : product-engine
2009-12-10 18:18:11 +02:00
Paul Guslisty
86d8d35341
Fixed linux build
...
--HG--
branch : product-engine
2009-12-10 18:08:07 +02:00
Lynx Linden
1ab022df43
EXT-3122: Added support for URLs without an explicit protocol.
...
You can now enter URLs like "www.google.com", "secondlife.com", or
"www.google.com/search?q=second%20life" and these will be hyperlinked.
2009-12-10 15:33:05 +00:00
Alexei Arabadji
a7e9fcc132
fixed EXT-3300 “Wrong notification count in notifications well”,
...
avoided creation of LLNotificationWellWindow before creation of notification
well chiclet;
--HG--
branch : product-engine
2009-12-10 17:20:33 +02:00
Alexei Arabadji
f48af95f54
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-10 16:35:27 +02:00
Alexei Arabadji
34da3ef716
implmented EXT-2830 “"Object auto-return" notification should contain reference to returned object”,
...
removed 'Inspect' button from ServerObjectMessage notification;
--HG--
branch : product-engine
2009-12-10 16:32:49 +02:00
Vadim Savchuk
8b28dac555
merge
...
--HG--
branch : product-engine
2009-12-10 16:07:23 +02:00
Vadim Savchuk
6f5b47a4e7
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-10 16:06:01 +02:00
Lynx Linden
9b4d09471c
DEV-41317 DEV-42311: Improved auto-call implementation.
...
Improved the implementation for auto-connecting an adhoc call. This
involved having the controller (LLIMMgr) set a flag in the model
(LLIMModel) to autoconnect on initialize. Now all of the view code
(LLPanelChatControlPanel) and the signal/callback infrastructure that
I added earlier can be removed as it violated MVP separation. Ah!
Much nicer. Thanks to PE folk for the suggestion.
2009-12-10 14:05:17 +00:00
Igor Borovkov
0bd034c56a
fixed EXT-3250 There should be no "Group info" button for Ad-hoc conference
...
caused by misdetection of IM type
--HG--
branch : product-engine
2009-12-10 15:42:54 +02:00
Andrew Polunin
d24fec9b90
fixed normal bug EXT-3284 \"Share\" ability is disabled in context menu in \"Nearby\", \"Friends\" and \"Recent\" tabs
...
--HG--
branch : product-engine
2009-12-10 15:28:51 +02:00
Andrew Dyukov
4df594defc
Set temporal icon for "Scripting disabled" in navbar (EXT-3339).
...
Finding appropriate icon is left to Erica.
--HG--
branch : product-engine
2009-12-10 14:22:25 +02:00
Andrew Polunin
9d5c05074d
implemented normal task EXT-2767 IM chiclet needs hard-coded reference to icn_voice-localchat.tga changed to Unread_IM
...
--HG--
branch : product-engine
2009-12-10 13:39:26 +02:00
Alexei Arabadji
e8a713f820
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-10 12:37:02 +02:00
Alexei Arabadji
e9afce6786
mplemented EXT-2801 “Record "object return" notification into IM history, not
...
chat history”,
added logging to IM for ServerObjectMessage notification;
--HG--
branch : product-engine
2009-12-10 12:36:28 +02:00
Mike Antipov
02498f1963
Work on major task EXT-2808 (Add speakers moderation (both voice and text) to the Voice Control Panel (Active Speakers List))
...
-- Added menu items, disabling them not in the group call
-- Also refactored Mute Text functionality to be used in Block/Unblock menu item (For EXT-2863)
--HG--
branch : product-engine
2009-12-10 12:22:55 +02:00
Lynx Linden
3497f64b12
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-10 09:20:33 +00:00
Steve Bennetts
562d343c47
EXT-3298 world map does not load simulator textures
...
Forgot to add LLCurl update call to non threaded LLTextureFetch update.
2009-12-09 18:18:01 -08:00
Mark Palange (Mani)
d8d6a6d1b7
merge
2009-12-09 16:39:10 -08:00
Mark Palange (Mani)
9f68163179
EXT-2896 Fixed poor handling of login error.
...
Added more cleanup to the reset_login call.
Added new settings to control UseCircuitCode message timeouts to allow testing of this failure.
Reviewed by Richard
2009-12-09 16:38:37 -08:00
Tofu Linden
9abe779c8a
last blind fixup for llmediaplugintest.
2009-12-09 14:55:45 -08:00
Tofu Linden
9b0825be5c
get llmediaplugintest compiling on win32, dumbly.
2009-12-09 14:48:36 -08:00
James Cook
ca2566a1ac
Merge
2009-12-09 14:36:52 -08:00
Tofu Linden
05e0d9d24a
Re-disable a very spewy debug spew in the webkit plugin. Mea culpa.
2009-12-09 14:36:45 -08:00
Erica
6dd56fddd7
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-09 14:34:45 -08:00
Erica
2a1e3b48f9
Crash fix due to bad duplicated attributes in xui
2009-12-09 14:34:26 -08:00
Tofu Linden
204ae550d8
blindly fix-up llmediaplugintest.cpp with respect to the recent API change.
2009-12-09 13:59:51 -08:00
Tofu Linden
2554a88ec1
merge!
2009-12-09 13:46:05 -08:00
James Cook
7466aa198a
Merge
2009-12-09 13:42:07 -08:00
Lis Pardi
1c0b5d4435
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
2009-12-09 16:35:15 -05:00
Lis Pardi
3b36b1fd2a
ext-2976 change "alerts" to read "notifications"
2009-12-09 16:35:05 -05:00
James Cook
6260ce6a92
Merge
2009-12-09 13:24:21 -08:00
Tofu Linden
2af183c51d
remove LL_PATH_BROWSER_PROFILE
...
it really has no point now - it's not used by the viewer, and the webkit plugin's private space should be opaque to the viewer.
2009-12-09 13:20:25 -08:00
James Cook
7193e97b98
Fix line endings.
2009-12-09 13:14:04 -08:00
James Cook
627bdb5bd4
Merge
2009-12-09 13:11:20 -08:00
Leyla Farazha
0c1d9da1c1
merge
2010-12-08 11:58:16 -08:00
Leyla Farazha
52dd4daada
adding notes about visible / enable callback registries being merged
2010-12-08 11:56:44 -08:00
Leyla Farazha
f4fd622686
EXT-2807 Update mini-inspector to include Group Voice Chat moderator controls
...
reviewed by Richard
2010-12-08 11:51:43 -08:00
Leyla Farazha
3b355848af
merge
2010-12-07 13:41:38 -08:00
Leyla Farazha
27d6f0e49c
EXT-3265 Gear menu on_visible params are broken - not setting visibility of menu items
...
EXT-2923 [BSI] My own inspector lists "Stand Up" as an option in gear menu, while I'm standing
2010-12-07 13:39:56 -08:00
James Cook
3476116de8
EXT-2827 and fix for delete key not deleting objects while building.
...
Object inventory was grabbing edit menu handling during refresh.
Put back Angela's code so that Right-click > Remove > Delete
is now disabled if you have a single face selected. Fixed
LLSelectMgr::contains() for SELECT_ALL_TES case.
Reviewed with Richard.
2009-12-09 13:06:07 -08:00
James Cook
e9bca5d52a
EXT-2980 Remove indentation on back button history list.
...
Design reviewed with Lis
2009-12-09 13:02:51 -08:00